Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-14 32169b0b5af53ae87ccde57c31c1d6ad6e44a055

 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java

@@ -12,6 +12,12 @@
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;
@@ -37,6 +43,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;

@Service
@@ -47,7 +54,8 @@
    private RedPaperRuleMapper redPaperRuleMapper;
    @Autowired
    private UserHeadRelateMapper userHeadRelateMapper;

    @Autowired
    private UserHeadDetailsMapper userHeadDetailsMapper;
    @Autowired
    private AccountMapper accountMapper;
    @Autowired
@@ -145,6 +153,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();