商品导入和门店商品导入取消园区库存校验

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2033,11 +2033,12 @@ public class OrderServiceImpl implements OrderService {
                     }
                 }
 
-                if (sellVolume > 0) {
-                    resultObj.put("errno", 400);
-                    resultObj.put("errmsg", "订单提交失败：条形码：" + prodBarcode + "，电商门店库存不足");
-                    return resultObj;
-                }
+                // 园区库存是有问题的, 这里去掉校验极端情况下可能会导致园区库存为负数
+//                if (sellVolume > 0) {
+//                    resultObj.put("errno", 400);
+//                    resultObj.put("errmsg", "订单提交失败：条形码：" + prodBarcode + "，电商门店库存不足");
+//                    return resultObj;
+//                }
 
                 Iterator<GoodsEntity> goodsIterator = numberMap.keySet().iterator();
                 // 循环购买的商品map，重新计算数量跟价格

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -175,8 +175,8 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         if(!goodsEntity.getMerchSn().equalsIgnoreCase(productStoreRela.getMerchSn())) {
             throw new RRException("该商品所属商户不属于该门店所属商户！");
         }
-        //校验总库存
-        checkStockNum(productStoreRela, goodsEntity, isStockShare);
+        // 校验总库存 取消园区库存校验
+        // checkStockNum(productStoreRela, goodsEntity, isStockShare);
 
         String storeId = String.valueOf(productStoreRela.getStoreId());
         String goodsId = String.valueOf(goodsEntity.getId());
@@ -325,8 +325,8 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         if(!goodsEntity.getMerchSn().equalsIgnoreCase(productStoreRela.getMerchSn())) {
             throw new RRException("该商品所属商户不属于该门店所属商户！");
         }
-        //校验总库存
-        checkStockNum(productStoreRela, goodsEntity, isStockShare);
+        // 校验总库存 取消园区库存校验
+        // checkStockNum(productStoreRela, goodsEntity, isStockShare);
 
         String storeId = String.valueOf(productStoreRela.getStoreId());
         String goodsId = String.valueOf(goodsEntity.getId());