Merge remote-tracking branch 'origin/hph'

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProskuConMapper.java

@@ -28,9 +28,7 @@ public interface TbProskuConMapper {
 
     List<Integer> selectIdBySkuIdAndShopId(@Param("skuId") Integer skuId, @Param("shopId") Integer shopId);
 
-
+    List<TbProskuCon> selectByShopIdAndSkuIdAndProductId(@Param("skuId") Integer skuId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
-    TbProskuCon selectByShopIdAndSkuIdAndProductId(@Param("skuId") Integer skuId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
-
 
 
 

src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java

@@ -57,12 +57,12 @@ public class ConsService {
         List<TbConsInfoFlow> consInfoFlows=new ArrayList<>();
 
         for (TbOrderDetail orderDetail : orderDetails) {
-            TbProskuCon proskuCon= tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId());
+            List<TbProskuCon> proskuCons= tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId());
-            if(Objects.isNull(proskuCon)){
+            if(Objects.isNull(proskuCons)||proskuCons.size()<=0){
                 log.info("不存在的耗材信息配置:orderId:{},skuId:{},shopId:{},productId:{}",orderDetail.getOrderId(),orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId());
                 continue;
             }
-
+            for (TbProskuCon proskuCon : proskuCons) {
                 TbConsInfo tbConsInfo= tbConsInfoMapper.selectByPrimaryKey(proskuCon.getConInfoId());
                 if(Objects.nonNull(tbConsInfo)&&"1".equals(tbConsInfo.getStatus())){
                     BigDecimal amount=BigDecimal.ZERO;
@@ -87,9 +87,6 @@ public class ConsService {
                         flow.setBizName("退单返还");
                         flow.setBizType("+");
                     }
-
-
-
                     ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),amount);
                     consInfoPOS.add(consInfoPO);
 
@@ -97,13 +94,12 @@ public class ConsService {
                     flow.setUpdateTime(new Date());
                     consInfoFlows.add(flow);
 
-
+                }
+            }
             //更新耗材信息
             tbConsInfoMapper.batchStock(consInfoPOS);
             //记录更新日志
             tbConsInfoFlowMapper.insertBatch(consInfoFlows);
-
-            }
         }
     }
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -536,8 +536,6 @@ public class OrderService {
         redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(orderInfo.getShopId().toString()),object.toString());
 
 
-
-
         //修改耗材数据
         JSONObject jsonObject=new JSONObject();
         jsonObject.put("orderId",orderInfo.getId());

src/main/resources/mapper/TbProskuConMapper.xml

@@ -136,6 +136,7 @@
   </select>
 
   <select id="selectByShopIdAndSkuIdAndProductId" resultMap="BaseResultMap">
+
     select * from tb_prosku_con where product_sku_id=#{skuId} and shop_id=#{shopId} and product_id=#{productId} and status=1
     </select>
 </mapper>