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

@@ -2793,10 +2793,14 @@ public class OrderServiceImpl implements OrderService {
             if (!org.springframework.util.StringUtils.isEmpty(memberCode)) {
                 // 同步会员订单消费记录
                 syncMemberConsumeRecord(memberPhone, order, deductionScore);
-                syncMemberScoreChangeRecord(openId, order, deductionScore, "下单扣减", queryGoodsVOList, giftGoodsScoreDetailMap, HaiKongMemberScoreChangeEventEnum.SUBTRACT.getEvent());
-                // 积分变动接口，下单扣减
+                if (deductionScore > 0) {
+                    // 积分变动接口，下单扣减
+                    syncMemberScoreChangeRecord(openId, order, deductionScore, "下单扣减", queryGoodsVOList, giftGoodsScoreDetailMap, HaiKongMemberScoreChangeEventEnum.SUBTRACT.getEvent());
+                }
                 Integer score = memberScore.get();
-                syncMemberScoreChangeRecord(openId, order, score, "下单赠送", queryGoodsVOList, giftGoodsScoreDetailMap, HaiKongMemberScoreChangeEventEnum.ADD.getEvent());
+                if (score > 0) {
+                    syncMemberScoreChangeRecord(openId, order, score, "下单赠送", queryGoodsVOList, giftGoodsScoreDetailMap, HaiKongMemberScoreChangeEventEnum.ADD.getEvent());
+                }
             }
 
             // 生成取票码

kmall-admin/src/main/java/com/kmall/admin/service/impl/haikong/StockChangeRecordServiceImpl.java

@@ -148,19 +148,19 @@ public class StockChangeRecordServiceImpl implements StockChangeRecordService {
             }
         });
 
-        // 出库和入库，需要修改库存
-        // 出库集合，减库存
-        List<StockChangeRecordEntity> outboundList = stringListHashMap.get(Constants.StockChangeType.item_0.getType());
-        if (!CollectionUtils.isEmpty(outboundList)) {
-            productStoreRelaService.updateStockNumberByOutbound(outboundList);
-            goodsService.updateStockNumberByOutbound(outboundList);
-        }
-        // 入库集合，加库存
-        List<StockChangeRecordEntity> storageList = stringListHashMap.get(Constants.StockChangeType.item_1.getType());
-        if (!CollectionUtils.isEmpty(storageList)) {
-            productStoreRelaService.updateStockNumberByStorage(storageList);
-            goodsService.updateStockNumberByStorage(storageList);
-        }
+//        // 出库和入库，需要修改库存
+//        // 出库集合，减库存
+//        List<StockChangeRecordEntity> outboundList = stringListHashMap.get(Constants.StockChangeType.item_0.getType());
+//        if (!CollectionUtils.isEmpty(outboundList)) {
+//            productStoreRelaService.updateStockNumberByOutbound(outboundList);
+//            goodsService.updateStockNumberByOutbound(outboundList);
+//        }
+//        // 入库集合，加库存
+//        List<StockChangeRecordEntity> storageList = stringListHashMap.get(Constants.StockChangeType.item_1.getType());
+//        if (!CollectionUtils.isEmpty(storageList)) {
+//            productStoreRelaService.updateStockNumberByStorage(storageList);
+//            goodsService.updateStockNumberByStorage(storageList);
+//        }
 
         stockChangeRecordDao.saveBatch(stockChangeRecordEntities);
     }