From 61cc9037a887812963ea0f99b020e296a6268184 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 27 Apr 2025 13:41:11 +0800
Subject: [PATCH] feat(mall): 增加活动热度排序功能并更新相关配置

---
 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java |   49 +++++++++++++++++++------------------------------
 1 files changed, 19 insertions(+), 30 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 aa97eb0..755df81 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
@@ -7,6 +7,7 @@
 import cc.mrbird.febs.mall.entity.MallMoneyFlow;
 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;
@@ -15,58 +16,46 @@
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 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 0/1 * * * ? ")
+    public void activityEnd() {
+        happyActivityService.activityEnd();
     }
 
     /**
-     * 感恩奖
+     * 活动时间开始更新
+     *          一分钟运行一次
      */
-    @Scheduled(cron = "0 0 2 * * ?")
-    public void thankfulJob() {
-        memberProfitService.thankfulProfit();
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    public void activityStart() {
+
+        happyActivityService.activityStart();
+
     }
 
-
-    /**
-     * 静态分红
-     */
-    @Scheduled(cron = "0 30 2 * * ?")
-    public void staticProfitJob() {
-        memberProfitService.staticProfit();
-    }
-
-    /**
-     * 排名奖 每月1号
-     */
-    @Scheduled(cron = "0 0 3 1 * ?")
-    public void rankJob() {
-        memberProfitService.rankProfit();
-    }
 }

--
Gitblit v1.9.1