From f69fd42a3ae2d11713dcd284ae3db57e449ae6dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 18:00:45 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 5a613b4..ba7bf1f 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
@@ -55,8 +55,13 @@
}
Integer count = userHeadDetailsMapper.selectDetailsCount(userId);
- UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
- AccountInfo accountInfo = accountMapper.selectAccountInfoByUserId(userId);
+// UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ AccountInfo accountInfo = accountMapper.selectAccountInfoByUserId(userHeadRelate.getHeadUserId());
+
+ if (AccountInfo.IS_PROHIBIT_Y.equals(accountInfo.getIsProhibit())) {
+ return;
+ }
+
List<String> remark = new ArrayList<>();
BigDecimal totalReturnScore = BigDecimal.ZERO;
BigDecimal totalReturnCoin = BigDecimal.ZERO;
@@ -122,13 +127,13 @@
userHeadDetailsMapper.insert(userHeadDetails);
userHeadRelate.setAmount(userHeadRelate.getAmount().add(totalReturnCoin));
- userHeadRelate.setScore(userHeadDetails.getScore().add(totalReturnScore));
+ userHeadRelate.setScore(userHeadRelate.getScore().add(totalReturnScore));
userHeadRelateMapper.updateByPrimaryKey(userHeadRelate);
accountInfo.setAccountId(accountInfo.getAccountId());
accountInfo.setMoney(new BigDecimal(accountInfo.getMoney()).add(totalReturnCoin).setScale(2, BigDecimal.ROUND_DOWN).toString());
BigDecimal collectScore = StrUtil.isNotBlank(accountInfo.getCollectScore()) ? new BigDecimal(accountInfo.getCollectScore()) : BigDecimal.ZERO;
- accountInfo.setCollectScore(collectScore.add(totalReturnScore).setScale(2, BigDecimal.ROUND_DOWN).toString());
+ accountInfo.setCollectScore(collectScore.add(totalReturnScore).setScale(0, BigDecimal.ROUND_DOWN).toString());
accountMapper.updateByPrimaryKey(accountInfo);
SysMessage sysMessage = new SysMessage();
@@ -137,7 +142,7 @@
sysMessage.setUserId(userHeadRelate.getHeadUserId());
sysMessage.setMessageType("4");
sysMessage.setMessageSubTypeName("返利消息");
- sysMessage.setMessage("收到用户:" + Base64.decodeStr(userInfo.getNickName()) + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin);
+ sysMessage.setMessage("收到用户:" + accountInfo.getAccountName().replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2") + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin);
sysMessage.setFlag("2");
sysMessageMapper.insert(sysMessage);
}
--
Gitblit v1.9.1