合并

app/admin/controller/order/WholeController.php

@@ -793,11 +793,13 @@ class WholeController extends Curd
                     throw new BusinessException("计算优惠后，实付金额错误！");
                 }
                 // 组装优惠券使用数据，存主表优惠里
-                $couponUseJson = $couponResult['use_coupon_json'];
-                if (!empty($order->order_discount_json)) {
-                    $orderDiscountJson = json_decode($order->order_discount_json, true);
-                    if (!empty($orderDiscountJson)) {
-                        $couponUseJson = json_encode(array_merge($orderDiscountJson, json_decode($couponUseJson, true)));
+                if (!empty($couponResult['use_coupon_json'])){
+                    $couponUseJson = $couponResult['use_coupon_json'];
+                    if (!empty($order->order_discount_json)) {
+                        $orderDiscountJson = json_decode($order->order_discount_json, true);
+                        if (!empty($orderDiscountJson)) {
+                            $couponUseJson = json_encode(array_merge($orderDiscountJson, json_decode($couponUseJson, true)));
+                        }
                     }
                 }
             }