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

Merge pull request 'dev' (#25) from dev into main

Browse Source 
Reviewed-on: #25
This commit is contained in:
mkm 2024-06-27 21:29:47 +08:00
commit 3989e02b14
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/logic/user/UserLogic.php
View File

@ -115,7 +115,8 @@ class UserLogic extends BaseLogic
$data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid'); $data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid');
$number=UserSign::where('uid',$uid)->where('status',0)->sum('number'); $number=UserSign::where('uid',$uid)->where('status',0)->sum('number');
$data['integral']=bcadd($data['integral'],$number,2); $data['integral']=bcadd($data['integral'],$number,2);
$number = UserSign::where('uid',$uid)->where('status',0)->sum('number');
$number = UserSign::where('uid',$uid)->where(['status'=>0,'financial_pm'=>1])->sum('number');
$GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number'); $GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number');
$data['number'] =bcadd($number,0,2); $data['number'] =bcadd($number,0,2);
$data['GetNumber'] =bcadd($GetNumber,0,2); $data['GetNumber'] =bcadd($GetNumber,0,2);

9
app/common/logic/PayNotifyLogic.php
View File

@ -654,6 +654,11 @@ class PayNotifyLogic extends BaseLogic
} }
bcscale(2); bcscale(2);
// $user->now_money = bcadd($user->now_money, $price, 2);//v.1 // $user->now_money = bcadd($user->now_money, $price, 2);//v.1
$check = UserSign::where(['uid'=>$order->uid,'type'=>1])->count();
if(empty($check) && $user['user_ship'] == 0){
self::dealRechargeFrozen($order);
}
//更新等级 //更新等级
$user->user_ship = $order['user_ship']; $user->user_ship = $order['user_ship'];
@ -663,11 +668,7 @@ class PayNotifyLogic extends BaseLogic
if($order['other_uid']>0){ if($order['other_uid']>0){
$uid=$order['other_uid']; $uid=$order['other_uid'];
} }
$check = UserSign::where(['uid'=>$order->uid,'type'=>1])->count();
if(empty($check)){
self::dealRechargeFrozen($order);
}
PushService::push('wechat_mmp_' . $uid, $uid, ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]); PushService::push('wechat_mmp_' . $uid, $uid, ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]);
PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]);