From 82da0c87a5e2dcf1b86e1b56ad345555d7a869bb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 15:35:20 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 8 ++++++++
gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java | 2 +-
2 files changed, 9 insertions(+), 1 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 05e17a7..20d2dc5 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
@@ -56,6 +56,7 @@
Integer count = userHeadDetailsMapper.selectDetailsCount(userId);
UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ AccountInfo accountInfo = accountMapper.selectAccountInfoByUserId(userId);
List<String> remark = new ArrayList<>();
BigDecimal totalReturnScore = BigDecimal.ZERO;
BigDecimal totalReturnCoin = BigDecimal.ZERO;
@@ -124,6 +125,13 @@
userHeadRelate.setScore(userHeadDetails.getScore().add(totalReturnScore));
userHeadRelateMapper.updateByPrimaryKey(userHeadRelate);
+ AccountInfo update = new AccountInfo();
+ update.setAccountId(accountInfo.getAccountId());
+ update.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;
+ update.setCollectScore(collectScore.add(totalReturnScore).setScale(2, BigDecimal.ROUND_DOWN).toString());
+ accountMapper.updateByPrimaryKey(update);
+
SysMessage sysMessage = new SysMessage();
sysMessage.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
sysMessage.setCreateUserId(userHeadRelate.getHeadUserId());
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java
index 26dcc51..25e1a5f 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java
@@ -36,7 +36,7 @@
@ApiOperation("加入团队")
@PostMapping(value = "/distrib/join")
- public JsonResult<String> join(DistribJoinDto distribJoinDto, HttpServletRequest request) {
+ public JsonResult<String> join(@RequestBody DistribJoinDto distribJoinDto, HttpServletRequest request) {
distribService.join(distribJoinDto.getHeadId(), getUserId(request));
return JsonResult.success();
}
--
Gitblit v1.9.1