注释优化

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

@@ -1651,7 +1651,6 @@ public class GoodsServiceImpl implements GoodsService {
 
         /*
         * 2. 查询海仓仓库系统，判断库存是否足够
-        * TODO 测试的时候注释，海控仓库系统没有测试环境，上生产时放开注释
         * */
         sku = org.springframework.util.StringUtils.isEmpty(sku) ? goods.getSku() : sku;
         String wareStockNumberKey = storeId + sku + prodBarcode;
@@ -1663,6 +1662,7 @@ public class GoodsServiceImpl implements GoodsService {
         Integer sellVolume = Objects.isNull(goods.getSellVolume()) ? 1 : goods.getSellVolume();
         if (org.springframework.util.StringUtils.isEmpty(redisCacheWareQuantity)) {
 
+            /* -----------------↓--------------生产请打开注释-------------------↓------------ */
 //            WareQueryStockParamDTO wareQueryStockParamDTO = new WareQueryStockParamDTO();
 //            List<Criteria> criteriaList = new ArrayList<>();
 //            Criteria criteria = new Criteria();
@@ -1686,6 +1686,7 @@ public class GoodsServiceImpl implements GoodsService {
 //                throw new ServiceException("调用库存系统接口出现错误！");
 //            }
 //            WareQueryStockResponseDTO wareQueryStockResponseDTO = JacksonUtil.fromStringJson(queryWarehouseStockResponse, WareQueryStockResponseDTO.class);
+            /* -----------------↑--------------生产请打开注释------------------↑------------- */
 
             /* -----------------↓--------------测试数据，生产请注释-------------------↓------------ */
             WareQueryStockResponseDTO wareQueryStockResponseDTO = new WareQueryStockResponseDTO();

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

@@ -2173,7 +2173,7 @@ public class OrderServiceImpl implements OrderService {
         Map resultObj = Maps.newHashMap();
         // 海控需求，下单流程修改，收银端接收会员码，付款码，用户信息，订单数据
         // 1. 校验库存：保税仓库存 + 展销店库存 - 出区数 >= 购买数
-        // TODO 获取保税仓库存，测试时注释
+        /* -----------------↓--------------生产请打开注释-------------------↓------------ */
         /*WareQueryStockParamDTO wareQueryStockParamDTO = new WareQueryStockParamDTO();
         List<Criteria> criteriaList = new ArrayList<>();
         goodsList.forEach(goods -> {
@@ -2216,8 +2216,9 @@ public class OrderServiceImpl implements OrderService {
                 stockMap.put(itemCode, quantity);
             }
         });*/
+        /* -----------------↑--------------生产请打开注释------------------↑------------- */
 
-        // TODO 上生产时注释，模拟仓库系统（sku最大库存为3）返回
+        /* -----------------↓--------------测试数据，生产请注释-------------------↓------------ */
         Map<String, Integer> stockMap = new HashMap<>(16);
         goodsList.forEach(goods -> {
             String sku = (String) goods.get("goodsSn");
@@ -2228,6 +2229,7 @@ public class OrderServiceImpl implements OrderService {
                 stockMap.put(sku, 3);
             }
         });
+        /* -----------------↑--------------测试数据，生产请注释------------------↑------------- */
 
         try {
             if (user == null) {

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -2421,7 +2421,6 @@
             #{item}
         </foreach>
     </update>
-    <update id="updateBuyerPayCheck"></update>
 
     <select id="queryObjectByMerchOrderSnHkMall" parameterType="java.lang.String" resultType="java.lang.Integer">
         select count(*) from mall_order a where merch_order_sn = #{merchOrderSn}