提交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.getDetailByChildOrderId(highChildOrder.getId());
+        HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderNo(highChildOrder.getOrderNo());
         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

@@ -82,6 +82,9 @@ public class OrderServiceImpl implements OrderService {
     @Resource
     private ThirdProductConfig thirdProductConfig;
 
+    @Resource
+    private HighDiscountPackageActualService discountPackageActualService;
+
 
     @Override
     public HighOrder insertOrderData(HighOrder order) {
@@ -220,6 +223,17 @@ public class OrderServiceImpl implements OrderService {
             } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE7.getNumber())) {
                 order.setProductType(OrderProductType.PRODUCT_TYPE7.getNumber());
                 HighChildOrder childOrder = orderCreateHandleService.couponPackage(child);
+
+                // 查询库存
+                List<HighDiscountPackageActual> list = discountPackageActualService.getListByPackageId(childOrder.getGoodsId().intValue(), 1);
+                if (list == null || list.size() == 0) {
+                    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).setStatus(2);  // 状态： 1: 待分配 2:预分配（售卖）3:已分配
+                discountPackageActualService.updateHighDiscountPackageActual(list.get(0));
+
                 childOrderList.add(childOrder);
                 order.setTitle(childOrder.getGoodsName());
 

hai-service/src/main/java/com/hai/service/HighDiscountPackageActualService.java

@@ -56,10 +56,10 @@ public interface HighDiscountPackageActualService {
 
     /**
      * 获取库存
-     * @param childOrderId
+     * @param orderNo
      * @return
      */
-    HighDiscountPackageActual getDetailByChildOrderId(Long childOrderId);
+    HighDiscountPackageActual getDetailByChildOrderNo(String orderNo);
 
     /**
      * 查询优惠券包列表

hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageActualServiceImpl.java

@@ -60,9 +60,9 @@ public class HighDiscountPackageActualServiceImpl implements HighDiscountPackage
     }
 
     @Override
-    public HighDiscountPackageActual getDetailByChildOrderId(Long childOrderId) {
+    public HighDiscountPackageActual getDetailByChildOrderNo(String orderNo) {
         HighDiscountPackageActualExample example = new HighDiscountPackageActualExample();
-        example.createCriteria().andChildOrderIdEqualTo(childOrderId);
+        example.createCriteria().andExt1EqualTo(orderNo);
         List<HighDiscountPackageActual> list = discountPackageActualMapper.selectByExample(example);
         if (list.size() > 0) {
             return list.get(0);

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -649,7 +649,7 @@ public class HighOrderServiceImpl implements HighOrderService {
             }
 */
             if (highChildOrder.getGoodsType() == 7) {
-                HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId());
+                HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderNo(highChildOrder.getOrderNo());
                 if (actual != null) {
                     List<HighDiscountPackageDiscountActual> discountList = discountPackageDiscountActualService.getHighDiscountPackageDiscountActualList(actual.getId());
                     for (HighDiscountPackageDiscountActual discount : discountList) {
@@ -1032,7 +1032,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                 }
 
                 if (highChildOrder.getGoodsType() == 7) {
-                    HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId());
+                    HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderNo(highChildOrder.getOrderNo());
                     if (actual != null) {
                         actual.setChildOrderId(null);
                         actual.setUserId(null);

hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java

@@ -416,7 +416,7 @@ public class GoodsOrderServiceImpl implements PayService {
                     }*/
 
                     if (highChildOrder.getGoodsType() == 7) {
-                        HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId());
+                        HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderNo(highChildOrder.getOrderNo());
                         if (actual != null) {
                             List<HighDiscountPackageDiscountActual> discountList = discountPackageDiscountActualService.getHighDiscountPackageDiscountActualList(actual.getId());
                             for (HighDiscountPackageDiscountActual discount : discountList) {