From d807e8a6d663f8392b58d8f48b0f8771b46d7995 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 17:40:57 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 8 ++++----
1 files changed, 4 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 5a613b4..fbd3add 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,8 @@
}
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());
List<String> remark = new ArrayList<>();
BigDecimal totalReturnScore = BigDecimal.ZERO;
BigDecimal totalReturnCoin = BigDecimal.ZERO;
@@ -122,7 +122,7 @@
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());
@@ -137,7 +137,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