From dabe1f4c2fbac582923422494b84d3f91545fd27 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 6 Feb 2023 17:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A42=E3=80=820=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hai/order/service/OrderCreateHandleService.java   | 2 +-
 .../hai/order/service/impl/OrderCreateHandleServiceImpl.java   | 3 ++-
 .../main/java/com/hai/order/service/impl/OrderServiceImpl.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java b/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java
index ff8387fe..1c6b3957 100644
--- a/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java
+++ b/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java
@@ -47,7 +47,7 @@ public interface OrderCreateHandleService {
      * @param createOrderChild
      * @return
      */
-    HighChildOrder couponPackage(CreateOrderChildModel createOrderChild);
+    HighChildOrder couponPackage(HighOrder order , CreateOrderChildModel createOrderChild);
 
     /**
      * 汇联通充值校验
diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
index d399c5cd..1300f893 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
@@ -517,7 +517,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
     }
 
     @Override
-    public HighChildOrder couponPackage(CreateOrderChildModel createOrderChild) {
+    public HighChildOrder couponPackage(HighOrder order , CreateOrderChildModel createOrderChild) {
         // 查询优惠券包
         HighDiscountPackage discountPackage = discountPackageService.findDiscountPackageById(createOrderChild.getGoodsId().intValue());
         if (discountPackage == null) {
@@ -546,6 +546,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
         childOrder.setGoodsId(discountPackage.getId().longValue());
         childOrder.setGoodsName(discountPackage.getTitle());
         childOrder.setGoodsImg(discountPackage.getListImg());
+        childOrder.setOrderNo(order.getOrderNo());
         childOrder.setGoodsSpecName("默认");
         childOrder.setGoodsPrice(discountPackage.getPrice());
         childOrder.setGoodsActualPrice(discountPackage.getPrice());
diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
index f66202d7..f3c3629c 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
@@ -222,7 +222,7 @@ public class OrderServiceImpl implements OrderService {
             // 优惠券包
             } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE7.getNumber())) {
                 order.setProductType(OrderProductType.PRODUCT_TYPE7.getNumber());
-                HighChildOrder childOrder = orderCreateHandleService.couponPackage(child);
+                HighChildOrder childOrder = orderCreateHandleService.couponPackage(order , child);
 
                 // 查询库存
                 List<HighDiscountPackageActual> list = discountPackageActualService.getListByPackageId(childOrder.getGoodsId().intValue(), 1);