充值升级

app/admin/service/notify/RechargeService.php

@@ -72,8 +72,10 @@ class RechargeService
         $recharge = PayDetail::where('join_pay_member_id',$memberId)
             ->where('pay_category','RECHARGE')
             ->where('pay_status','SUCCESS')
-            ->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
-            ->orWhere('pay_prepayid', 'like', '%CASH%')
+            ->where(function($query){
+                $query->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
+                    ->orWhere('pay_prepayid', 'like', '%CASH%');
+            })
             ->sum('pay_amount');
         $expend = PayDetail::where('join_pay_member_id',$memberId)
             ->whereIn('pay_category',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','MEALS'])
@@ -81,7 +83,6 @@ class RechargeService
             ->whereIn('pay_prepayid', ['ALIPAY', 'WXPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
             ->sum('pay_amount');
         $money = max($recharge, $expend);
-        dump($recharge, $expend,$money);
 
         $memberRoles = MemberRole::where('member_role_status', 'ACTIVED')->get()->toArray();
         foreach ($memberRoles as $role) {