From f236a24c5766fb524a4dadc44a0f7b6ae288141c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 21 Apr 2026 13:44:43 +0800
Subject: [PATCH] fix(ai): 修正产品分类和产品的排序逻辑,排序从升序改为降序

---
 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java |   55 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 34 insertions(+), 21 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 755df81..4b099cd 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
@@ -2,9 +2,10 @@
 
 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;
@@ -15,6 +16,7 @@
 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;
@@ -38,24 +40,35 @@
     @Resource
     private HappyActivityService happyActivityService;
 
-    /**
-     * 活动时间结束更新
-     *          一分钟运行一次
-     */
-    @Scheduled(cron = "0 0/1 * * * ? ")
-    public void activityEnd() {
-        happyActivityService.activityEnd();
-    }
-
-    /**
-     * 活动时间开始更新
-     *          一分钟运行一次
-     */
-    @Scheduled(cron = "0 0/1 * * * ? ")
-    public void activityStart() {
-
-        happyActivityService.activityStart();
-
-    }
+//    /**
+//     * 活动时间结束更新
+//     *          一分钟运行一次
+//     */
+//    @Scheduled(cron = "0 0/1 * * * ? ")
+//    public void activityEnd() {
+//        happyActivityService.activityEnd();
+//    }
+//
+//    /**
+//     * 活动时间开始更新
+//     *          一分钟运行一次
+//     */
+//    @Scheduled(cron = "0 0/1 * * * ? ")
+//    public void activityStart() {
+//
+//        happyActivityService.activityStart();
+//
+//    }
+//
+//
+//
+//    /**
+//     * 订单失效
+//     *          五分钟运行一次
+//     */
+//    @Scheduled(cron = "0 0/5 * * * ? ")
+//    public void overtimeJob() {
+//        happyActivityService.overtimeJob();
+//    }
 
 }

--
Gitblit v1.9.1