fix

Helius

2022-06-18 fee6de501aae099ea05573a43e508fbd410e02ba

fix

 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java

@@ -53,9 +53,9 @@
    /**
     * 感恩奖
     */
    @Scheduled(cron = "0 0 2 * * ?")
    @Scheduled(cron = "0 30 3 * * ?")
    public void thankfulJob() {
        memberProfitService.thankfulProfit();
        memberProfitService.thankfulProfit(null);
    }


@@ -64,7 +64,7 @@
     */
    @Scheduled(cron = "0 30 2 * * ?")
    public void staticProfitJob() {
        memberProfitService.staticProfit();
        memberProfitService.staticProfit(null);
    }

    /**

 src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java

@@ -11,7 +11,7 @@
    /**
     * 静态分红
     */
    void staticProfit();
    void staticProfit(Date date);

    /**
     * 动态分红
@@ -33,7 +33,7 @@
    /**
     * 感恩奖
     */
    void thankfulProfit();
    void thankfulProfit(Date profitDate);

    /**
     * 店补/董事

 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java

@@ -49,14 +49,16 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void staticProfit() {
    public void staticProfit(Date profitDate) {
        log.info("#####静态分红开始运行:{}#####", new Date());
        List<MallMember> members = mallMemberMapper.selectList(null);
        if (CollUtil.isEmpty(members)) {
            return;
        }

        Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
        if (profitDate == null) {
            profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
        }
        // 套餐业绩
//        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2);
        // 普通商品业绩
@@ -318,6 +320,7 @@
        Page<MallMember> page = new Page<>(1, 5);
        MallMember query = new MallMember();
        query.setQuery("2");

        Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
        query.setCreatedTime(profitDate);
        IPage<MallMember> rankListInPage = mallMemberMapper.selectRankListInPage(page, query);
@@ -331,7 +334,7 @@
//        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 2);
        // 普通商品业绩
//        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 1);
        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("M", profitDate);

        List<DataDictionaryCustom> rankAward = dataDictionaryCustomMapper.selectDicByType("RANK_AWARD");
        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANK_BONUS.getType(), DataDictionaryEnum.RANK_BONUS.getCode());
@@ -361,18 +364,20 @@
     * 拿推荐人的收益（代理，直推，排名）的10%加权平分给下面直推
     */
    @Override
    public void thankfulProfit() {
    public void thankfulProfit(Date date) {
        log.info("######==感恩奖==start==####");
        List<MallMember> mallMembers = mallMemberMapper.selectMemberListHasChild();
        if (CollUtil.isEmpty(mallMembers)) {
            return;
        }
        if (date == null) {
            date = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
        }

        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.THANKFUL_BONUS.getType(), DataDictionaryEnum.THANKFUL_BONUS.getCode());
        // 感恩奖比例
        BigDecimal prop = new BigDecimal(dic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);

        Date date = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
        for (MallMember mallMember : mallMembers) {
            BigDecimal income = mallMoneyFlowMapper.selectThankfulCommission(date, mallMember.getId());
            List<MallMember> children = mallMemberMapper.selectMemberDirectForHasLevel(mallMember.getInviteId());

 src/test/java/cc/mrbird/febs/ProfitTest.java

@@ -39,18 +39,18 @@
    }
    @Test
    public void agentProfit() {
        memberProfitService.agentProfit(null);
        memberProfitService.agentProfit(new Date());
    }


    @Test
    public void staticProfit() {
        memberProfitService.staticProfit();
        memberProfitService.staticProfit(new Date());
    }

    @Test
    public void thankfulProfit() {
        memberProfitService.thankfulProfit();
        memberProfitService.thankfulProfit(new Date());
    }

    @Test
@@ -63,7 +63,7 @@

    @Test
    public void directorProfitTest() {
        memberProfitService.storeAndDirectorProfit(null);
        memberProfitService.storeAndDirectorProfit(new Date());
    }

    @Autowired