From a8560eb20f89c32e9c2cdb3e137ece2fa3c10ec4 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 14 Jul 2021 16:32:15 +0800 Subject: [PATCH] fix --- gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 62 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 1 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 9eca3ab..ae2af57 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 @@ -1,16 +1,30 @@ package com.xzx.gc.user.service; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.xzx.gc.common.exception.RestException; +import com.xzx.gc.common.utils.StringUtils; import com.xzx.gc.entity.AccountInfo; 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.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 cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -18,6 +32,7 @@ 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,10 +40,13 @@ import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.math.BigDecimal; import java.util.Date; +import java.util.List; +import java.util.Map; @Service @Transactional @@ -38,7 +56,8 @@ private RedPaperRuleMapper redPaperRuleMapper; @Autowired private UserHeadRelateMapper userHeadRelateMapper; - + @Autowired + private UserHeadDetailsMapper userHeadDetailsMapper; @Autowired private AccountMapper accountMapper; @Autowired @@ -136,6 +155,16 @@ 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) { RedPaperRule redPaperRule = new RedPaperRule(); StringBuffer stringBuffer = new StringBuffer(); @@ -180,4 +209,35 @@ redPaperRuleMapper.updateByPrimaryKey(redPaperRule); } } + + public Map<String, Object> distribList(DistribListDto distribListDto) { + PageHelper.startPage(distribListDto.getPage(), distribListDto.getLimit()); + if(StrUtil.isNotEmpty(distribListDto.getQueryCol())){ + String decode = StringUtils.encode(distribListDto.getQueryCol()); + distribListDto.setName(decode); + distribListDto.setPhone(distribListDto.getQueryCol()); + } + List<DistribListVo> distribListVos = accountMapper.selectDsitribListByQueryCol(distribListDto); + if(CollUtil.isNotEmpty(distribListVos)){ + for(DistribListVo distribListVo : distribListVos){ + String nickname = distribListVo.getNickname(); + String decode = StringUtils.decode(nickname); + distribListVo.setNickname(decode); + } + } + PageInfo<DistribListVo> pageInfo = new PageInfo<>(distribListVos); + Map<String, Object> data = new HashMap<>(); + int count = Convert.toInt(pageInfo.getTotal()); + data.put("data", distribListVos); + data.put("count", count); + data.put("code", 0); + return data; + } + + public void adddistrib(AdddistribDto model) { + String id = model.getId(); + AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id); + accountInfo.setIsHead(1); + accountMapper.updateByPrimaryKey(accountInfo); + } } -- Gitblit v1.9.1