Merge branch 'master' into dev

app/admin/controller/order/WholeController.php

@@ -461,10 +461,10 @@ class WholeController extends Curd
                 $item['member_info']['member_info_headimg'] = MemberService::getAvatarUrl(!empty($item['member_info']) && !empty($item['member_info']['member_info_headimg']) ? $item['member_info']['member_info_headimg'] : '');
             }
             $order->sheet_amount = number_format($sheetAmount, 2);
-
             $payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
-                ->whereJsonContains('join_pay_object_json->order_id', $orderId)
-                ->where('pay_category', '<>', 'REFUND')
+                ->where(function ($query) use ($orderId) {
+                    $query->whereJsonContains('join_pay_object_json->order_id', $orderId)->orWhere('join_pay_object_json', '')->orWhereNull('join_pay_object_json');
+                })->where('pay_category', '<>', 'REFUND')
                 ->where('pay_status', 'SUCCESS')
                 ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
                 ->get();
@@ -4521,8 +4521,9 @@ class WholeController extends Curd
             }
 
             $payDetails = PayDetail::where('join_pay_order_id', $item['order_groupby'])
-                ->whereJsonContains('join_pay_object_json->order_id', $item['order_id'])
-                ->where('pay_status', 'SUCCESS')
+                ->where(function ($query) use ($item) {
+                    $query->whereJsonContains('join_pay_object_json->order_id', $item['order_id'])->orWhere('join_pay_object_json', '')->orWhereNull('join_pay_object_json');
+                })->where('pay_status', 'SUCCESS')
                 ->where('pay_category', '<>', 'REFUND')
                 ->get()
                 ->toArray();

app/admin/service/order/PayDetailService.php

@@ -74,8 +74,11 @@ class PayDetailService
     public static function getPayWay($groupId, $orderId)
     {
         $payDetails = PayDetail::where('join_pay_order_id', $groupId)
-            ->whereJsonContains('join_pay_object_json->order_id', $orderId)
-            ->where('pay_category', '<>', 'REFUND')
+            ->where(function ($query) use ($orderId) {
+                $query->whereJsonContains('join_pay_object_json->order_id', $orderId)
+                    ->orWhere('join_pay_object_json', '')
+                    ->orWhereNull('join_pay_object_json');
+            })->where('pay_category', '<>', 'REFUND')
             ->where('pay_status', 'SUCCESS')
             ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
             ->get()
@@ -130,9 +133,9 @@ class PayDetailService
         if (in_array($prepayId, ['WXPAY', 'ALIPAY', 'OFFLINE_WXPAY', 'OFFLINE_ALIPAY', 'MONEY', 'OFFLINE'])) {
             $payWay = $prepayId;
         } else {
-            $prepayId = explode('-', $prepayId);
-            if (!empty($prepayid[1]) && in_array($prepayid[1], ['CASH', 'WELFARE', 'QRCODE', 'NONE'])) {
-                $payWay = $prepayid[1];
+            $prepayIdArr = explode('-', $prepayId);
+            if (!empty($prepayIdArr[1]) && in_array($prepayIdArr[1], ['CASH', 'WELFARE', 'QRCODE', 'NONE'])) {
+                $payWay = $prepayIdArr[1];
             }
         }