1
0
Pārlūkot izejas kodu

fix:多个积分变动记录详情,日志优化

lhm 3 gadi atpakaļ
vecāks
revīzija
943bd34e41

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

@@ -2793,7 +2793,7 @@ public class OrderServiceImpl implements OrderService {
             LOGGER.info("----------------------------------------------------------------------------");
             return resultObj;
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error("下单出现异常:" + e);
             resultObj.put("errno", 400);
             resultObj.put("errmsg", "订单异常------" + e.getMessage());
             throw new RuntimeException(e);
@@ -3350,26 +3350,28 @@ public class OrderServiceImpl implements OrderService {
             haiKongMemberScoreChangeRecordEntity.setResendStatus(HaiKongMemberOrderResendStatusEnum.NON_RESEND.getStatus());
             haiKongMemberScoreChangeRecordService.save(haiKongMemberScoreChangeRecordEntity);
         }
-        LOGGER.info("保存会员系统积分变动详情记录中......");
-        List<HaiKongMemberScoreChangeDetailRecordEntity> recordEntityList = goodsList.stream().distinct().map(goodsEntity -> {
-            HaiKongMemberScoreChangeDetailRecordEntity entity = new HaiKongMemberScoreChangeDetailRecordEntity();
-            String sku = goodsEntity.getSku();
-            OrderGiftScoreRulesVo orderGiftScoreRulesVo = giftGoodsScoreDetailMap.get(sku);
-            if (Objects.nonNull(orderGiftScoreRulesVo)) {
-                entity.setGenerateRatio(orderGiftScoreRulesVo.getGenerateRatio());
-                entity.setGenerateRules(orderGiftScoreRulesVo.getGenerateType());
-                entity.setGiftScore(orderGiftScoreRulesVo.getGiftScore());
-            }
-            entity.setOrderSn(order.getOrder_sn());
-            entity.setRetailPrice(goodsEntity.getRetailPrice());
-            entity.setActualPrice(goodsEntity.getTotalPrice());
-            entity.setProductBarcode(goodsEntity.getProdBarcode());
-            entity.setSellVolume(goodsEntity.getSellVolume());
-            entity.setSku(sku);
-            entity.setDeductionScore(goodsEntity.getDeductionScore());
-            return entity;
-        }).collect(Collectors.toList());
-        haiKongMemberScoreChangeDetailRecordService.saveBatch(recordEntityList);
+        if (changeEvent.equals(HaiKongMemberScoreChangeEventEnum.ADD.getEvent())) {
+            LOGGER.info("保存会员系统积分变动详情记录中......");
+            List<HaiKongMemberScoreChangeDetailRecordEntity> recordEntityList = goodsList.stream().distinct().map(goodsEntity -> {
+                HaiKongMemberScoreChangeDetailRecordEntity entity = new HaiKongMemberScoreChangeDetailRecordEntity();
+                String sku = goodsEntity.getSku();
+                OrderGiftScoreRulesVo orderGiftScoreRulesVo = giftGoodsScoreDetailMap.get(sku);
+                if (Objects.nonNull(orderGiftScoreRulesVo)) {
+                    entity.setGenerateRatio(orderGiftScoreRulesVo.getGenerateRatio());
+                    entity.setGenerateRules(orderGiftScoreRulesVo.getGenerateType());
+                    entity.setGiftScore(orderGiftScoreRulesVo.getGiftScore());
+                }
+                entity.setOrderSn(order.getOrder_sn());
+                entity.setRetailPrice(goodsEntity.getRetailPrice());
+                entity.setActualPrice(goodsEntity.getTotalPrice());
+                entity.setProductBarcode(goodsEntity.getProdBarcode());
+                entity.setSellVolume(goodsEntity.getSellVolume());
+                entity.setSku(sku);
+                entity.setDeductionScore(goodsEntity.getDeductionScore());
+                return entity;
+            }).collect(Collectors.toList());
+            haiKongMemberScoreChangeDetailRecordService.saveBatch(recordEntityList);
+        }
     }
 
     private boolean orderQuery(OrderVo order, OrderProcessRecordEntity processRecordEntity) {