提交2。0代码

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);
 
     /**
      * 汇联通充值校验

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());

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);