From f9e40800aa15abd4cfd2799f334b015e6f13629c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 16 Mar 2026 11:21:38 +0800
Subject: [PATCH] feat(yinhe): 新增智能体系统功能并调整配置
---
src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java | 85 ++++++++++++++++++++----------------------
1 files changed, 40 insertions(+), 45 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 1f32cc1..15d728d 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,7 +16,9 @@
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;
@@ -22,58 +26,49 @@
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 activityEnd() {
+// happyActivityService.activityEnd();
+// }
+//
+// /**
+// * 活动时间开始更新
+// * 一分钟运行一次
+// */
+// @Scheduled(cron = "0 0/1 * * * ? ")
+// public void activityStart() {
+//
+// happyActivityService.activityStart();
+//
+// }
+//
+//
+//
+// /**
+// * 订单失效
+// * 五分钟运行一次
+// */
+// @Scheduled(cron = "0 0/5 * * * ? ")
+// public void overtimeJob() {
+// happyActivityService.overtimeJob();
+// }
- /**
- * 代理分红
- */
- @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