fix

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -242,10 +242,10 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         List<OmsOrder> omsOrders = orderMapper.selectByExample(orderExample);
         // 订单号
         List<String> orderSnList = omsOrders.stream().map(OmsOrder::getOrderSn).collect(Collectors.toList());
-        HttpResponseResult httpResponseResult = webFeignService.updateShippedStatus(orderSnList);
-        if (httpResponseResult.getCode() != 200 && !httpResponseResult.getStatus()) {
-            throw new BizException("发货通知失败");
-        }
+//        HttpResponseResult httpResponseResult = webFeignService.updateShippedStatus(orderSnList);
+//        if (httpResponseResult.getCode() != 200 && !httpResponseResult.getStatus()) {
+//            throw new BizException("发货通知失败");
+//        }
 
         // 调用三方库存更新接口
         syncSkuStock(new ArrayList<>(skuIdMap.keySet()));

mec-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/mapper/PmsProductSkuStockRecordMapper.java

@@ -29,7 +29,7 @@ public interface PmsProductSkuStockRecordMapper {
 
     int updateByPrimaryKey(PmsProductSkuStockRecord record);
 
-    void lockStock(@Param("stockRecordIds") List<Long> stockRecordIds);
+    int lockStock(@Param("stockRecordIds") List<Long> stockRecordIds);
 
     int updateByIdAndStockSelective( PmsProductSkuStockRecord pmsProductSkuStockRecord);
 }

mec-mall/mall-mbg/src/main/resources/config/mybatis/PmsProductSkuStockRecordMapper.xml

@@ -314,9 +314,9 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <select id="lockStock" >
+  <select id="lockStock" resultType="java.lang.Integer">
     <!--@mbg.generated-->
-      select * from pms_product_sku_stock_record where
+      select count(1) from pms_product_sku_stock_record where
       id in
       <foreach collection="stockRecordIds" item="item" separator="," open="(" close=")">
         #{item}