diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index dd77934bc..e925a859f 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -115,7 +115,8 @@ class UserLogic extends BaseLogic $data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid'); $number=UserSign::where('uid',$uid)->where('status',0)->sum('number'); $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'); $data['number'] =bcadd($number,0,2); $data['GetNumber'] =bcadd($GetNumber,0,2); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 86ea0a28e..5a27e10e2 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -654,6 +654,11 @@ class PayNotifyLogic extends BaseLogic } bcscale(2); // $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']; @@ -663,11 +668,7 @@ class PayNotifyLogic extends BaseLogic if($order['other_uid']>0){ $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('store_merchant_' . $order['store_id'], $order['store_id'], ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]);