提交2。0代码

hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java

@@ -390,7 +390,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
      * @Return void
      */
     private void eCouponPackageHandle(HighOrder order , HighChildOrder highChildOrder) throws Exception {
-        HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderNo(highChildOrder.getOrderNo());
+        HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderNo(highChildOrder.getChildOrderNo());
         if (actual != null) {
             List<HighDiscountPackageDiscountActual> discountList = discountPackageDiscountActualService.getHighDiscountPackageDiscountActualList(actual.getId());
             for (HighDiscountPackageDiscountActual discount : discountList) {

hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java

@@ -230,7 +230,7 @@ public class OrderServiceImpl implements OrderService {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_STOCK_INSUFFICIENT, "");
                 }
                 list.get(0).setUserId(order.getMemId().intValue());
-                list.get(0).setExt1(childOrder.getOrderNo());
+                list.get(0).setExt1(childOrder.getChildOrderNo());
                 list.get(0).setStatus(2);  // 状态： 1: 待分配 2:预分配（售卖）3:已分配
                 discountPackageActualService.updateHighDiscountPackageActual(list.get(0));