mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-26 15:28:19 +08:00
commit cdfd35b936
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/user/UserController.php
View File

@ -232,11 +232,13 @@ class UserController extends BaseApiController
$res = UserLogic::dealDetails($params,$this->userId); $res = UserLogic::dealDetails($params,$this->userId);
$integral = User::where('id',$this->userId)->value('integral'); $integral = User::where('id',$this->userId)->value('integral');
$number = UserSign::where('id',$this->userId)->where('status',0)->sum('number'); $number = UserSign::where('id',$this->userId)->where('status',0)->sum('number');
$GetNumber = UserSign::where('id',$this->userId)->where('status',1)->sum('number');
$res['page_no'] = $params['page_no']; $res['page_no'] = $params['page_no'];
$res['page_size'] = $params['page_size']; $res['page_size'] = $params['page_size'];
$res['extend'] = [ $res['extend'] = [
'integral'=>$integral, 'integral'=>$integral,
'number'=>$number 'number'=>$number,
'get_number'=>$GetNumber
]; ];
return $this->success('ok', $res); return $this->success('ok', $res);

3
app/api/logic/order/OrderLogic.php
View File

@ -436,7 +436,8 @@ class OrderLogic extends BaseLogic
$order=StoreOrder::where('id',$data['id'])->find(); $order=StoreOrder::where('id',$data['id'])->find();
PayNotifyLogic::afterPay($order); PayNotifyLogic::afterPay($order);
PayNotifyLogic::descStock($order['id']); PayNotifyLogic::descStock($order['id']);
if($order['uid']){
if($order['uid'] && $order['total_price'] > 500){
$user_number = bcmul($order['pay_price'], '0.10', 2); $user_number = bcmul($order['pay_price'], '0.10', 2);
User::where('id', $order['uid'])->inc('integral', $user_number)->update(); User::where('id', $order['uid'])->inc('integral', $user_number)->update();
UserSign::where(['uid' => $order['uid'],'order_id' => $order['order_id']])->update(['status'=>1]); UserSign::where(['uid' => $order['uid'],'order_id' => $order['order_id']])->update(['status'=>1]);