From 7c40e052277de0d6654b37a6542b80038a3c4858 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Dec 2021 10:57:23 +0800
Subject: [PATCH] add jhy/order/hasJhy
---
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..2b5923d 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
@@ -67,7 +67,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())) {
@@ -128,6 +128,10 @@
}
}
+ if (totalReturnCoin.intValue() == 0 && totalReturnScore.intValue() == 0) {
+ return;
+ }
+
UserHeadDetails userHeadDetails = new UserHeadDetails();
userHeadDetails.setHeadUserId(userHeadRelate.getHeadUserId());
userHeadDetails.setUserId(userId);
@@ -165,7 +169,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 +242,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