From 0a0ddc2087fa31cafb0589cf5c826f7caef1914e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 08 May 2023 11:36:23 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java |   68 +++++++++++-----------------------
 1 files changed, 22 insertions(+), 46 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 87984f8..0499500 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.quartz;
 
+import cc.mrbird.febs.common.enumerates.AccountLevelEnums;
 import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
 import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
 import cc.mrbird.febs.common.utils.MallUtils;
@@ -9,6 +10,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,54 +36,28 @@
 public class ProfitJob {
 
     @Autowired
-    private MallMoneyFlowMapper moneyFlowMapper;
+    private IMemberProfitService memberProfitService;
 
-    @Autowired
-    private MallMemberMapper memberMapper;
+    /**
+     * 代理分红
+     */
+    @Scheduled(cron = "0 30 0 * * ?")
+    public void agentProfitJob() {
+        log.info("运行代理分红程序");
+        memberProfitService.agentProfit(AccountLevelEnums.VVIP.getLevel());
+    }
 
-    @Autowired
-    private IApiMallMemberWalletService memberWalletService;
+    @Scheduled(cron = "5 30 0 * * ?")
+    public void partnerProfitJob() {
+        log.info("运行股东分红程序");
+        memberProfitService.agentProfit(AccountLevelEnums.VVVIP.getLevel());
+    }
 
-    @Autowired
-    private IApiMallMemberService memberService;
-
-    @Scheduled(cron = "0 1 0 * * ?")
-    @Transactional(rollbackFor = Exception.class)
-    public void profitJob() {
-        log.info("推荐人返利执行");
-//        DateTime yesterday = DateUtil.yesterday();
-//        List<MallMoneyFlow> flows = moneyFlowMapper.selectMoneyFlowProfitByDate(yesterday);
-//
-//        if (CollUtil.isEmpty(flows)) {
-//            return;
-//        }
-//
-//        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());
-//        }
+    /**
+     * 全网分红
+     */
+    @Scheduled(cron = "0 10 0 * * ?")
+    public void allInternetProfitJob() {
+        memberProfitService.allInternetProfit();
     }
 }

--
Gitblit v1.9.1