From 73204530b7c20b4b90f7277d34c7eb17c53021aa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 15:05:49 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
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 42cad59..6c58db4 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
@@ -12,22 +12,27 @@
import com.xzx.gc.entity.SysMessage;
import com.xzx.gc.entity.UserHeadRelate;
import com.xzx.gc.entity.UserShareInfo;
+import com.xzx.gc.user.dto.HeadProfitLitDto;
+import com.xzx.gc.user.dto.HeadTeamDto;
+import com.xzx.gc.user.mapper.*;
+import com.xzx.gc.user.vo.HeadInfoVo;
+import com.xzx.gc.user.vo.HeadProfitListVo;
+import com.xzx.gc.user.vo.HeadTeamVo;
import com.xzx.gc.user.dto.AdddistribDto;
+import com.xzx.gc.user.dto.DistribInfoListDto;
import com.xzx.gc.user.dto.DistribListDto;
import com.xzx.gc.user.mapper.AccountMapper;
import com.xzx.gc.user.mapper.SysMessageMapper;
import com.xzx.gc.user.mapper.UserHeadRelateMapper;
import com.xzx.gc.user.mapper.UserShareInfoMapper;
-import com.xzx.gc.user.vo.DistribListVo;
-import com.xzx.gc.user.vo.HeadInfoVo;
+import com.xzx.gc.user.vo.*;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.xzx.gc.entity.RedPaperRule;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.UpdateSettingDto;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
-import com.xzx.gc.user.vo.JhyInfoListVo;
-import com.xzx.gc.user.vo.ViewSettingVo;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -39,8 +44,10 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import java.util.Map;
+@Slf4j
@Service
@Transactional
public class DistribService {
@@ -49,7 +56,8 @@
private RedPaperRuleMapper redPaperRuleMapper;
@Autowired
private UserHeadRelateMapper userHeadRelateMapper;
-
+ @Autowired
+ private UserHeadDetailsMapper userHeadDetailsMapper;
@Autowired
private AccountMapper accountMapper;
@Autowired
@@ -98,6 +106,7 @@
public void join(String headId, String userId) {
+ log.info("#加入团队:{}, {}#", headId, userId);
AccountInfo headInfo = accountMapper.selectOneByUserId(headId);
if (AccountInfo.IS_HEAD_N.equals(headInfo.getIsHead())) {
throw new RestException(-3, "不是团长");
@@ -122,14 +131,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);
@@ -145,6 +157,16 @@
headInfoVo.setIsHead(accountInfo.getIsHead());
return headInfoVo;
+ }
+
+ public List<HeadProfitListVo> findHeadProfitListInPage(HeadProfitLitDto profitLitDto) {
+ PageHelper.startPage(profitLitDto.getPage(), profitLitDto.getLimit());
+ return userHeadDetailsMapper.selectHeadProfitListInPage(profitLitDto.getUserId());
+ }
+
+ public List<HeadTeamVo> findHeadTeamListInPage(HeadTeamDto teamDto) {
+ PageHelper.startPage(teamDto.getPage(), teamDto.getLimit());
+ return userHeadRelateMapper.selectHeadTeamListInPage(teamDto.getUserId());
}
public void addSetting(UpdateSettingDto model) {
@@ -222,4 +244,28 @@
accountInfo.setIsHead(1);
accountMapper.updateByPrimaryKey(accountInfo);
}
+
+ public Map<String, Object> distribInfoList(DistribInfoListDto distribInfoListDto) {
+ PageHelper.startPage(distribInfoListDto.getPage(), distribInfoListDto.getLimit());
+ if(StrUtil.isNotEmpty(distribInfoListDto.getName())){
+ String decode = StringUtils.encode(distribInfoListDto.getName());
+ distribInfoListDto.setName(decode);
+ }
+ List<DistribInfoListVo> distribInfoListVos = accountMapper.selectDsitribInfoListByQueryCol(distribInfoListDto);
+ if(CollUtil.isNotEmpty(distribInfoListVos)){
+ for(DistribInfoListVo distribInfoListVo : distribInfoListVos){
+ String nickname = distribInfoListVo.getNickname();
+ String decode = StringUtils.decode(nickname);
+ distribInfoListVo.setNickname(decode);
+ }
+ }
+ PageInfo<DistribInfoListVo> pageInfo = new PageInfo<>(distribInfoListVos);
+ Map<String, Object> data = new HashMap<>();
+ int count = Convert.toInt(pageInfo.getTotal());
+ data.put("data", distribInfoListVos);
+ data.put("count", count);
+ data.put("code", 0);
+ return data;
+
+ }
}
--
Gitblit v1.9.1