From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法,支持分页和搜索 - 在 AdminActivityController 中添加 list 接口,返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板,根据活动状态控制按钮显示

---
 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java |   71 +++++++++++++++++++----------------
 1 files changed, 39 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 aa97eb0..068ef23 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
@@ -17,6 +17,7 @@
 import cn.hutool.core.util.StrUtil;
 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;
@@ -32,41 +33,47 @@
  **/
 @Slf4j
 @Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
 public class ProfitJob {
 
     @Autowired
     private IMemberProfitService memberProfitService;
 
-    /**
-     * 代理分红
-     */
-    @Scheduled(cron = "0 0 1 * * ?")
-    public void profitJob() {
-        memberProfitService.agentProfit(null);
-    }
-
-    /**
-     * 感恩奖
-     */
-    @Scheduled(cron = "0 0 2 * * ?")
-    public void thankfulJob() {
-        memberProfitService.thankfulProfit();
-    }
-
-
-    /**
-     * 静态分红
-     */
-    @Scheduled(cron = "0 30 2 * * ?")
-    public void staticProfitJob() {
-        memberProfitService.staticProfit();
-    }
-
-    /**
-     * 排名奖 每月1号
-     */
-    @Scheduled(cron = "0 0 3 1 * ?")
-    public void rankJob() {
-        memberProfitService.rankProfit();
-    }
+//    /**
+//     * 代理分红
+//     */
+//    @Scheduled(cron = "0 30 0 * * ?")
+//    public void profitJob() {
+//        memberProfitService.agentProfit(null);
+//    }
+//
+//    @Scheduled(cron = "0 30 1 * * ?")
+//    public void storeAndDirectorJob() {
+//        memberProfitService.storeAndDirectorProfit(null);
+//    }
+//
+//    /**
+//     * 感恩奖
+//     */
+//    @Scheduled(cron = "0 0 1 * * ?")
+//    public void thankfulJob() {
+//        memberProfitService.thankfulProfit(null);
+//    }
+//
+//
+//    /**
+//     * 静态分红
+//     */
+//    @Scheduled(cron = "0 0 0 * * ?")
+//    public void staticProfitJob() {
+//        memberProfitService.staticProfit(null);
+//    }
+//
+//    /**
+//     * 排名奖 每月1号
+//     */
+//    @Scheduled(cron = "0 30 0 1 * ?")
+//    public void rankJob() {
+//        memberProfitService.rankProfit();
+//    }
 }

--
Gitblit v1.9.1