merge

app/admin/controller/notify/RechargeController.php

@@ -110,7 +110,7 @@ class RechargeController
         }
         try {
             $updateUserId = JwtToken::getCurrentId();
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $updateUserId = 1001;
         }
 
@@ -147,7 +147,7 @@ class RechargeController
             $memberAccount->member_account_update_user_id = $updateUserId ?? 1001;
             $memberAccount->member_account_updatetimes = time();
             $memberAccount->save();
-            if (!empty($goodsAttributeJson)){
+            if (!empty($goodsAttributeJson)) {
                 // 根据最新的数据，更新用户等级
                 RechargeService::disposeRole($payDetail->join_pay_member_id, $payDetail->pay_amount);
 
@@ -167,6 +167,7 @@ class RechargeController
                     // 入收支明细表
                     $params['orderId'] = $payObjectJson['order_id'];
                     $params['inout_category'] = '会员充值';
+                    $params['pay_id'] = $payId;
                     Event::dispatch('statistics.inout.in', $params);
                 }
             }

app/event/statistics/InOutEvent.php

@@ -46,11 +46,17 @@ class InOutEvent
             ])->where('join_sheet_order_id', $params['orderId'])
                 ->get()
                 ->toArray();
-            $payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
-                ->whereJsonContains('join_pay_object_json->order_id', $params['orderId'])
-                ->where('pay_status', 'SUCCESS')
-                ->get()
-                ->toArray();
+            if (!empty($params['pay_id'])) {
+                $payDetails = PayDetail::where('pay_id', $params['pay_id'])
+                    ->get()
+                    ->toArray();
+            } else {
+                $payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
+                    ->whereJsonContains('join_pay_object_json->order_id', $params['orderId'])
+                    ->where('pay_status', 'SUCCESS')
+                    ->get()
+                    ->toArray();
+            }
 
             $data = [
                 'dept_id' => 0,