Browse Source

拆单+打印

gorden 6 months ago
parent
commit
4bbec5188c

+ 2 - 2
app/admin/controller/order/GoodsController.php

@@ -980,7 +980,7 @@ class GoodsController extends Curd
                     }
                 }
                 // 释放下单时选的优惠券
-                $order->order_discount_json = $this->releaseCoupon($discountJson);
+//                $order->order_discount_json = $this->releaseCoupon($discountJson);
             }
             if (empty($discountJson) && !empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);
@@ -1508,7 +1508,7 @@ class GoodsController extends Curd
                     }
                 }
                 // 释放下单时选的优惠券
-                $order->order_discount_json = $this->releaseCoupon($discountJson);
+//                $order->order_discount_json = $this->releaseCoupon($discountJson);
             }
             if (empty($discountJson) && !empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);

+ 2 - 2
app/admin/controller/order/PackagesController.php

@@ -1118,7 +1118,7 @@ class PackagesController extends Curd
                     }
                 }
                 // 释放下单时选的优惠券
-                $order->order_discount_json = $this->releaseCoupon($discountJson);
+//                $order->order_discount_json = $this->releaseCoupon($discountJson);
             }
             if (empty($discountJson) && !empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);
@@ -1641,7 +1641,7 @@ class PackagesController extends Curd
                     }
                 }
                 // 释放下单时选的优惠券
-                $order->order_discount_json = $this->releaseCoupon($discountJson);
+//                $order->order_discount_json = $this->releaseCoupon($discountJson);
             }
             if (empty($discountJson) && !empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);

+ 5 - 3
app/admin/controller/order/ServicesController.php

@@ -1012,8 +1012,8 @@ class ServicesController extends Curd
                         throw new BusinessException("计算优惠后,实付金额错误!");
                     }
                 }
-                // 释放下单时选的优惠券
-                $order->order_discount_json = $this->releaseCoupon($discountJson);
+//                // 释放下单时选的优惠券
+//                $order->order_discount_json = $this->releaseCoupon($discountJson);
             }
             if (empty($discountJson) && !empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);
@@ -1025,10 +1025,12 @@ class ServicesController extends Curd
                     $couponUseJson = $couponResult['use_coupon_json'];
                 }
             }
+            dump($discountJson);
             // 存储优惠信息
             if (empty($discountJson)) {
                 $order->order_discount_json = json_encode($this->discountRecord($couponUseJson, $params));
             }
+            dump($order->order_discount_json);
             // 组合支付时,付款码应收金额
             $qrcodePayAmount = 0;
             if ($params['pay_category'] == 'OFFLINE' || $params['pay_category'] == 'MONEY') {
@@ -1536,7 +1538,7 @@ class ServicesController extends Curd
                     }
                 }
                 // 释放下单时选的优惠券
-                $order->order_discount_json = $this->releaseCoupon($discountJson);
+//                $order->order_discount_json = $this->releaseCoupon($discountJson);
             }
             if (empty($discountJson) && !empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);