补字段

app/admin/controller/order/PayDetailController.php

@@ -237,9 +237,13 @@ class PayDetailController extends Curd
                     $addedAmount = sprintf('%.2f',$payExtendJson['added_amount']);
                 }
             }
+
+            $payObjectJson = [];
+            if (!empty($item->join_pay_object_json)){
+                $payObjectJson = json_decode($item->join_pay_object_json, true);
+            }
             if (in_array($item['join_pay_order_id'], ['COMBINE', 'PARTNER']) && !empty($item->join_pay_object_json)) {
                 $item->order_classify = $item['join_pay_order_id'];
-                $payObjectJson = json_decode($item->join_pay_object_json, true);
                 if (isset($payObjectJson['recharge_order_id'])) {
                     $payDetails = PayDetail::whereJsonContains('join_pay_object_json->order_id', $payObjectJson['recharge_order_id'])
                         ->where('pay_status', 'SUCCESS')
@@ -259,9 +263,9 @@ class PayDetailController extends Curd
                         $item->pay_status = 'BEING';
                     }
                 }
-                if (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0){
-                    $addedAmount = sprintf('%.2f',round($item->pay_amount * $payObjectJson['recharge_config']['nbr'],2));
-                }
+            }
+            if (!empty($payObjectJson['recharge_config']) && $payObjectJson['recharge_config']['nbr'] > 0){
+                $addedAmount = sprintf('%.2f',round($item->pay_amount * $payObjectJson['recharge_config']['nbr'],2));
             }
             $item->added_amount = $addedAmount;
             $item->to_account_amount = sprintf('%.2f',$item->pay_amount + $addedAmount);

app/event/statistics/InOutEvent.php

@@ -87,7 +87,7 @@ class InOutEvent
                 $inoutObjectJson['order'][$params['orderId']]['goods'][] = [
                     'goods_id' => $sheet['goods']['goods_id'] ?? '',
                     'goods_name' => $sheet['goods']['goods_name'] ?? '',
-                    'order_sheet_num' => $sheet['order_sheet_amount'],
+                    'order_sheet_num' => $sheet['order_sheet_num'],
                     'order_sheet_pay' => $sheet['order_sheet_pay']
                 ];
                 $inoutObjectJson['classify'][] = $sheet['goods']['goods_classify'] ?? '';