From f54f8a92c09a2cd76b3bbb796df680215b63ab8a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Feb 2022 14:16:41 +0800
Subject: [PATCH] fix 50 to 40
---
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java b/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
index 8e2fe94..b9e8a1f 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
@@ -5,6 +5,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.xzx.gc.common.constant.CommonEnum;
+import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.mapper.*;
import lombok.extern.slf4j.Slf4j;
@@ -67,7 +68,7 @@
}
Integer count = userHeadDetailsMapper.selectDetailsCount(userId);
-// UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
AccountInfo accountInfo = accountMapper.selectAccountInfoByUserId(userHeadRelate.getHeadUserId());
if (AccountInfo.IS_PROHIBIT_Y.equals(accountInfo.getIsProhibit())) {
@@ -109,7 +110,7 @@
// 根据订单总积分， 1:40比例，换算成环保币，返对应百分比
if (StrUtil.isNotBlank(coinStr) && !"0".equals(coinStr)) {
BigDecimal coinRatio = new BigDecimal(coinStr).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_DOWN);
- BigDecimal totalCoin = totalScore.divide(new BigDecimal(50), 2, BigDecimal.ROUND_DOWN);
+ BigDecimal totalCoin = totalScore.divide(new BigDecimal(Constants.PRICE_SCORE_EXCHANGE), 2, BigDecimal.ROUND_DOWN);
BigDecimal returnCoin = totalCoin.multiply(coinRatio).setScale(2, BigDecimal.ROUND_DOWN);
totalReturnCoin = totalReturnCoin.add(returnCoin);
@@ -126,6 +127,10 @@
}
}
}
+ }
+
+ if (totalReturnCoin.intValue() == 0 && totalReturnScore.intValue() == 0) {
+ return;
}
UserHeadDetails userHeadDetails = new UserHeadDetails();
@@ -165,7 +170,7 @@
sysMessage.setUserId(userHeadRelate.getHeadUserId());
sysMessage.setMessageType("4");
sysMessage.setMessageSubTypeName("返利消息");
- sysMessage.setMessage("收到用户:" + accountInfo.getAccountName().replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2") + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin);
+ sysMessage.setMessage("收到用户:" + userInfo.getMobilePhone().replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2") + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin);
sysMessage.setFlag("2");
sysMessageMapper.insert(sysMessage);
}
@@ -238,7 +243,7 @@
scoreDetails.setOriginalScore(collectScore);
scoreDetails.setChangeScore(returnScore);
scoreDetails.setCreatedTime(new Date());
- scoreDetails.setType(ScoreDetails.SCORE_TYPE_OTHER);
+ scoreDetails.setType(ScoreDetails.SCORE_TYPE_INVITE_FIRST_ORDER);
scoreDetails.setUserId(accountInfo.getUserId());
scoreDetails.setOrderNo(orderId.toString());
scoreDetailsMapper.insert(scoreDetails);
--
Gitblit v1.9.1