From a331c3be6000d3c81f88e0a564e2db63da99018b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 21 May 2025 10:33:42 +0800
Subject: [PATCH] feat(score): 初始化积分设置页面的默认值

---
 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java |   61 ++++++++++++++----------------
 1 files changed, 29 insertions(+), 32 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 958c012..0dbf31c 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
@@ -2,11 +2,13 @@
 
 import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
 import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.utils.MallUtils;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallMoneyFlow;
+import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.MallMemberMapper;
 import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
+import cc.mrbird.febs.mall.service.HappyActivityService;
 import cc.mrbird.febs.mall.service.IApiMallMemberService;
 import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
 import cc.mrbird.febs.mall.service.IMemberProfitService;
@@ -14,64 +16,59 @@
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 
-/**
- * @author wzy
- * @date 2021-09-28
- **/
 @Slf4j
 @Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
 public class ProfitJob {
 
-    @Autowired
-    private IMemberProfitService memberProfitService;
+    @Resource
+    private HappyActivityService happyActivityService;
 
     /**
-     * 代理分红
+     * 活动时间结束更新
+     *          一分钟运行一次
      */
-    @Scheduled(cron = "0 0 1 * * ?")
-    public void profitJob() {
-        memberProfitService.agentProfit(null);
-    }
-
-    @Scheduled(cron = "0 30 1 * * ?")
-    public void storeAndDirectorJob() {
-        memberProfitService.storeAndDirectorProfit(null);
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    public void activityEnd() {
+        happyActivityService.activityEnd();
     }
 
     /**
-     * 感恩奖
+     * 活动时间开始更新
+     *          一分钟运行一次
      */
-    @Scheduled(cron = "0 30 3 * * ?")
-    public void thankfulJob() {
-        memberProfitService.thankfulProfit(null);
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    public void activityStart() {
+
+        happyActivityService.activityStart();
+
     }
+
 
 
     /**
-     * 静态分红
+     * 订单失效
+     *          五分钟运行一次
      */
-    @Scheduled(cron = "0 30 2 * * ?")
-    public void staticProfitJob() {
-        memberProfitService.staticProfit(null);
+    @Scheduled(cron = "0 0/5 * * * ? ")
+    public void overtimeJob() {
+        happyActivityService.overtimeJob();
     }
 
-    /**
-     * 排名奖 每月1号
-     */
-    @Scheduled(cron = "0 0 3 1 * ?")
-    public void rankJob() {
-        memberProfitService.rankProfit();
-    }
 }

--
Gitblit v1.9.1