店主充值

app/Console/Commands/Table/OptimizeBills.php

@@ -2,6 +2,8 @@
 
 namespace App\Console\Commands\Table;
 
+use App\Model\AliAgentNotice;
+use App\Model\AliNotice;
 use App\Model\Config;
 use App\Model\Customer\CustomerBill;
 use App\Model\Customer\CustomerFreeze;
@@ -63,5 +65,10 @@ class OptimizeBills extends Command
         ->forceDelete();
         ShopFreeze::where('created_at', '<', $currentDate)
         ->forceDelete();
+        // notice
+        AliAgentNotice::where('created_at', '<', $currentDate)
+            ->forceDelete();
+        AliNotice::where('created_at', '<', $currentDate)
+            ->forceDelete();
     }
 }

app/Console/Commands/Zq/SyncCtzq.php

@@ -115,6 +115,7 @@ class SyncCtzq extends Command
             $match->jc_away_team_name = strval(Arr::get($item, 'jcAwayTeamName'));
             $match->jc_away_team_name_full = strval(Arr::get($item, 'jcAwayTeamNameFull'));
             $match->is_reverse = intval(Arr::get($item, 'isReverse'));
+            $match->no = intval(Arr::get($item, 'no'));
             $no = $item['no'];
             if ($no % 2 == 0) {
                 $match->away_result = $item['result'];

app/Jobs/HandleAgentAlipayResultNotice.php

@@ -48,7 +48,43 @@ class HandleAgentAlipayResultNotice implements ShouldQueue
 
         $aliNotice = AliAgentNotice::where('notify_id', $this->data['notify_id'])->first();
         if ($aliNotice) {
-            Log::error('HandleAgentAlipayResultNotice noticeId exist', $this->data);
+            Log::error('HandleAgentAlipayResultNotice noticeId_exist', $this->data);
+            return;
+        }
+        $rechargeSn = $this->data['out_trade_no'];
+        $rechargeObj = new CustomerRecharge();
+        $recharge = $rechargeObj->where('recharge_sn', $rechargeSn)->first();
+        if (!$recharge) {
+            Log::error('HandleAgentAlipayResultNotice not_found_recharge_sn', [
+                'data' => $this->data,
+                'rechargeSn' => $rechargeSn,
+            ]);
+            return;
+        }
+
+        $tradeStatus = Arr::get($this->data, 'trade_status', '');
+        $pay_state = PayState::ERROR;
+        if ($tradeStatus == 'TRADE_SUCCESS') {
+            $pay_state = PayState::SUCCESS;
+            if (!bc_equal(Helps::floatFormat($recharge->pay_money), Helps::floatFormat($this->data['receipt_amount']))) {
+                $pay_state = PayState::UNEQUAL;
+            }
+        }
+        $res = CustomerRecharge::query()->where('id', $recharge->id)
+            ->where('recharge_sn', $rechargeSn)
+            ->whereNotIn('pay_state', [PayState::ERROR,PayState::SUCCESS,PayState::UNEQUAL])
+            ->update([
+                'out_trade_no' => $this->data['trade_no'],
+                'received_money' => $this->data['receipt_amount'],
+                'pay_at' => $this->data['gmt_create'],
+                'pay_state' => $pay_state,
+            ]);
+        if (!$res) {
+            Log::error('HandleAgentAlipayResultNotice recharge_update_fail', [
+                'data' => $this->data,
+                'rechargeSn' => $rechargeSn,
+                'res' => $res,
+            ]);
             return;
         }
 
@@ -56,7 +92,7 @@ class HandleAgentAlipayResultNotice implements ShouldQueue
         $aliNotice->notify_id = Arr::get($this->data, 'notify_id', '');
         $aliNotice->out_trade_no = Arr::get($this->data, 'out_trade_no', '');
         $aliNotice->trade_no = Arr::get($this->data, 'trade_no', '');
-        $aliNotice->trade_status = Arr::get($this->data, 'trade_status', '');
+        $aliNotice->trade_status = $tradeStatus;
         $aliNotice->receipt_amount = Arr::get($this->data, 'receipt_amount', 0);
         $aliNotice->buyer_pay_amount = Arr::get($this->data, 'buyer_pay_amount', '');
         $aliNotice->total_amount = Arr::get($this->data, 'total_amount', 0);
@@ -68,31 +104,8 @@ class HandleAgentAlipayResultNotice implements ShouldQueue
         $aliNotice->response = $this->data;
         $aliNotice->save();
 
-        $rechargeSn = $this->data['out_trade_no'];
-        $rechargeObj = new CustomerRecharge();
-        $recharge = $rechargeObj->where('recharge_sn', $rechargeSn)->first();
-        if (!$recharge) {
-            Log::error('HandleAgentAlipayResultNotice 表中充值单号', [
-                'data' => $this->data,
-                'rechargeSn' => $rechargeSn,
-            ]);
-            return;
-        }
-
-        if ($aliNotice->trade_status == 'TRADE_SUCCESS') {
-            $recharge->pay_state = PayState::SUCCESS;
-            if (!bc_equal(Helps::floatFormat($recharge->pay_money), Helps::floatFormat($this->data['receipt_amount']))) {
-                $recharge->pay_state = PayState::UNEQUAL;
-            }
-        } else {
-            $recharge->pay_state = PayState::ERROR;
-        }
-        $recharge->out_trade_no = $this->data['trade_no'];
-        $recharge->received_money = $this->data['receipt_amount'];
-        $recharge->pay_at = $this->data['gmt_create'];
-        $recharge->save();
-
-        if ($recharge->pay_state == PayState::SUCCESS) {
+        if ($pay_state == PayState::SUCCESS) {
+            $recharge = $rechargeObj->where('recharge_sn', $rechargeSn)->first();
             CustomerWalletService::recharge($recharge);
             // 如果有订单，则处理订单支付状态
             if ($recharge->order_id > 0) {

app/Jobs/HandleAlipayResultNotice.php

@@ -51,6 +51,42 @@ class HandleAlipayResultNotice implements ShouldQueue
             return;
         }
 
+        $rechargeSn = $this->data['out_trade_no'];
+        $rechargeObj = new ShopRecharge();
+        $recharge = $rechargeObj->where('recharge_sn', $rechargeSn)->first();
+        if (!$recharge) {
+            Log::error('HandleAlipayResultNotice 表中充值单号', [
+                'data' => $this->data,
+                'rechargeSn' => $rechargeSn,
+            ]);
+            return;
+        }
+
+        $paystate = PayState::ERROR;
+        if ($aliNotice->trade_status == 'TRADE_SUCCESS') {
+            $paystate = PayState::SUCCESS;
+            if (!bc_equal($recharge->pay_money, $this->data['receipt_amount'])) {
+                $paystate = PayState::UNEQUAL;
+            }
+        }
+
+        $res =$rechargeObj->where('id',$recharge->id)
+            ->where('recharge_sn', $rechargeSn)
+            ->whereNotIn('pay_state', [PayState::ERROR,PayState::SUCCESS,PayState::UNEQUAL])
+            ->update([
+                'out_trade_no' => $this->data['trade_no'],
+                'received_money' => $this->data['receipt_amount'],
+                'pay_at' => $this->data['gmt_create'],
+                'pay_state' => $paystate,
+            ]);
+        if (!$res) {
+            Log::error('HandleAlipayResultNotice recharge_update_fail', [
+                'data' => $this->data,
+                'rechargeSn' => $rechargeSn,
+                'res' => $res,
+            ]);
+            return;
+        }
 
         $aliNotice = new AliNotice();
         $aliNotice->notify_id = Arr::get($this->data, 'notify_id', '');
@@ -68,31 +104,8 @@ class HandleAlipayResultNotice implements ShouldQueue
         $aliNotice->response = $this->data;
         $aliNotice->save();
 
-        $rechargeSn = $this->data['out_trade_no'];
-        $rechargeObj = new ShopRecharge();
-        $recharge = $rechargeObj->where('recharge_sn', $rechargeSn)->first();
-        if (!$recharge) {
-            Log::error('HandleAlipayResultNotice 表中充值单号', [
-                'data' => $this->data,
-                'rechargeSn' => $rechargeSn,
-            ]);
-            return;
-        }
-
-
-        if ($aliNotice->trade_status == 'TRADE_SUCCESS') {
-            $recharge->pay_state = PayState::SUCCESS;
-            if (!bc_equal($recharge->pay_money, $this->data['receipt_amount'])) {
-                $recharge->pay_state = PayState::UNEQUAL;
-            }
-        } else {
-            $recharge->pay_state = PayState::ERROR;
-        }
-        $recharge->out_trade_no = $this->data['trade_no'];
-        $recharge->received_money = $this->data['receipt_amount'];
-        $recharge->pay_at = $this->data['gmt_create'];
-        $recharge->save();
         if ($recharge->pay_state == PayState::SUCCESS) {
+            $recharge = $rechargeObj->where('recharge_sn', $rechargeSn)->first();
             SellerWalletService::recharge($recharge);
         }
     }