From e9bcfdba00460e64307f422bd08303a07b90a288 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Sat, 28 May 2022 16:18:54 +0800 Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz --- src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java | 63 ++++++++++--------------------- 1 files changed, 20 insertions(+), 43 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java index 4d7a98b..7b18035 100644 --- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java +++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java @@ -9,6 +9,7 @@ import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper; import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; +import cc.mrbird.febs.mall.service.IMemberProfitService; import cc.mrbird.febs.mall.service.impl.CommonService; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; @@ -34,53 +35,29 @@ public class ProfitJob { @Autowired - private MallMoneyFlowMapper moneyFlowMapper; + private IMemberProfitService memberProfitService; - @Autowired - private MallMemberMapper memberMapper; - - @Autowired - private IApiMallMemberWalletService memberWalletService; - - @Autowired - private IApiMallMemberService memberService; - + /** + * 代理分红 + */ @Scheduled(cron = "0 0 1 * * ?") - @Transactional(rollbackFor = Exception.class) public void profitJob() { - DateTime yesterday = DateUtil.yesterday(); - List<MallMoneyFlow> flows = moneyFlowMapper.selectMoneyFlowProfitByDate(yesterday); + memberProfitService.agentProfit(null); + } - if (CollUtil.isEmpty(flows)) { - return; - } + /** + * 感恩奖 + */ + @Scheduled(cron = "0 0 2 * * ?") + public void thankfulJob() { + memberProfitService.thankfulProfit(); + } - for (MallMoneyFlow flow : flows) { - MallMember member = memberMapper.selectById(flow.getMemberId()); - - List<MallMember> child = memberMapper.selectByIdAndNoLevel(member.getInviteId(), AgentLevelEnum.ZERO_LEVEL.name()); - if (CollUtil.isEmpty(child)) { - continue; - } - int size = child.size(); - BigDecimal needReturn = flow.getAmount().multiply(BigDecimal.valueOf(0.1)); - - String orderNo = MallUtils.getOrderNum("R"); - String remarkFormat = "{}, 用户:{}, 利润分红: {}"; - - BigDecimal returnMoney = needReturn.divide(BigDecimal.valueOf(size), 2, RoundingMode.DOWN); - for (MallMember mallMember : child) { - memberWalletService.addBalance(returnMoney, mallMember.getId()); - - String remark = StrUtil.format(remarkFormat, DateUtil.format(yesterday, "yyyy-MM-dd"), member.getName(), returnMoney); - memberService.addMoneyFlow(mallMember.getId(), returnMoney, MoneyFlowTypeEnum.PARENT_BONUS.getValue(), orderNo, null, remark, member.getId(), null); - } - - String remark = StrUtil.format(remarkFormat, DateUtil.format(yesterday, "yyyy-MM-dd"), member.getName(), needReturn); - memberService.addMoneyFlow(member.getId(), needReturn.negate(), MoneyFlowTypeEnum.PARENT_BONUS.getValue(), orderNo, null, remark, null, null); - memberWalletService.reduceBalance(needReturn, member.getId()); - - moneyFlowMapper.updateIsReturnByMemberId(MallMoneyFlow.IS_RETURN_Y, flow.getMemberId()); - } + /** + * 排名奖 每月1号 + */ + @Scheduled(cron = "0 0 3 1 * ?") + public void rankJob() { + memberProfitService.rankProfit(); } } -- Gitblit v1.9.1