From 2752c9d7c029451dba7e724b9b255c817bad29f6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 15 Jul 2021 14:13:42 +0800 Subject: [PATCH] fix --- gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 5 ++++- gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 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 c5d872f..05e17a7 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 @@ -1,6 +1,8 @@ package com.xzx.gc.order.service; +import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.xzx.gc.common.constant.CommonEnum; import com.xzx.gc.entity.*; @@ -34,6 +36,12 @@ private RedPaperRuleMapper redPaperRuleMapper; @Autowired private JhyOrderItemsMapper jhyOrderItemsMapper; + @Autowired + private SysMessageMapper sysMessageMapper; + @Autowired + private AccountMapper accountMapper; + @Autowired + private UserMapper userMapper; public void distribRecord(Long orderId, String userId) { UserHeadRelate userHeadRelate = userHeadRelateMapper.selectRelateByUserId(userId); @@ -47,7 +55,7 @@ } Integer count = userHeadDetailsMapper.selectDetailsCount(userId); - + UserInfo userInfo = userMapper.selectByPrimaryKey(userId); List<String> remark = new ArrayList<>(); BigDecimal totalReturnScore = BigDecimal.ZERO; BigDecimal totalReturnCoin = BigDecimal.ZERO; @@ -116,6 +124,15 @@ userHeadRelate.setScore(userHeadDetails.getScore().add(totalReturnScore)); userHeadRelateMapper.updateByPrimaryKey(userHeadRelate); + SysMessage sysMessage = new SysMessage(); + sysMessage.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); + sysMessage.setCreateUserId(userHeadRelate.getHeadUserId()); + sysMessage.setUserId(userHeadRelate.getHeadUserId()); + sysMessage.setMessageType("4"); + sysMessage.setMessageSubTypeName("返利消息"); + sysMessage.setMessage("收到用户:" + Base64.decodeStr(userInfo.getNickName()) + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin); + sysMessage.setFlag("2"); + sysMessageMapper.insert(sysMessage); } private String getRuleValue(RedPaperRule redPaperRule, String key) { diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java index 766ea84..43323f8 100644 --- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java +++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java @@ -128,14 +128,17 @@ userHeadRelate.setHeadUserId(headId); userHeadRelate.setUserId(userId); userHeadRelate.setScore(BigDecimal.ZERO); + userHeadRelate.setCreatedTime(new Date()); userHeadRelate.setAmount(BigDecimal.ZERO); userHeadRelateMapper.insert(userHeadRelate); SysMessage sysMessage = new SysMessage(); sysMessage.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); - sysMessage.setCreateUserId(userId); + sysMessage.setCreateUserId(headId); + sysMessage.setUserId(headId); sysMessage.setMobilePhone(accountInfo.getAccountName()); sysMessage.setMessageType("4"); + sysMessage.setMessageSubTypeName("团队消息"); sysMessage.setMessage("手机号:" + accountInfo.getAccountName() + "的用户, 成功加入您的团队"); sysMessage.setFlag("2"); sysMessageMapper.insert(sysMessage); -- Gitblit v1.9.1