From 6c5c4d329a55d2908a1b1ab5619b49f31e648283 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Jun 2022 15:28:12 +0800
Subject: [PATCH] 20220528
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 820a193..6cd4738 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -59,6 +59,7 @@
private final AgentProducer agentProducer;
private final IPayService payService;
+ private final IMallAchieveService mallAchieveService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -243,20 +244,20 @@
if (CollUtil.isNotEmpty(orderItems)) {
for (MallOrderItem orderItem : orderItems) {
MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
- BigDecimal score;
+ BigDecimal score = BigDecimal.ZERO;
MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
if (mallGoods.getIsNormal() == 2) {
hasTc = true;
score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti());
-
- // 普通商品1：1 返还积分
- } else {
- score = sku.getPresentPrice();
}
- memberWalletService.add(score, member.getId(), "score");
- mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ if (score.compareTo(BigDecimal.ZERO) > 0) {
+ memberWalletService.add(score, member.getId(), "score");
+ mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ // 添加业绩
+ mallAchieveService.add(orderItem.getId());
+ }
}
}
@@ -270,7 +271,7 @@
}
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
-// agentProducer.sendAutoLevelUpMsg(member.getId());
+ agentProducer.sendAutoLevelUpMsg(member.getId());
agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "4":
--
Gitblit v1.9.1