From 89384e54b9a4e5f7fc22a24c5d2ca2650549c297 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 08 Jan 2025 14:50:37 +0800 Subject: [PATCH] feat(mall): 添加活动过期自动下架功能 --- src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java | 90 ++++++++++++++------------------------------- 1 files changed, 28 insertions(+), 62 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 87984f8..d4829f1 100644 --- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java +++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java @@ -1,28 +1,18 @@ package cc.mrbird.febs.mall.quartz; -import cc.mrbird.febs.common.enumerates.AgentLevelEnum; -import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; -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.mapper.MallMemberMapper; -import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper; -import cc.mrbird.febs.mall.service.IApiMallMemberService; -import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; -import cc.mrbird.febs.mall.service.impl.CommonService; +import cc.mrbird.febs.common.enumerates.YesOrNoOrIngEnum; +import cc.mrbird.febs.mall.entity.MallActivity; +import cc.mrbird.febs.mall.mapper.MallActivityMapper; import cn.hutool.core.collection.CollUtil; 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 java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Date; import java.util.List; /** @@ -31,57 +21,33 @@ **/ @Slf4j @Component +@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true") public class ProfitJob { @Autowired - private MallMoneyFlowMapper moneyFlowMapper; + private MallActivityMapper mallActivityMapper; - @Autowired - private MallMemberMapper memberMapper; + /** + * 一分钟运行一次 + * 结束活动 + */ + @Scheduled(cron = "0 0/1 * * * ? ") + public void overtimeActivity() { + DateTime date = DateUtil.date(); + List<MallActivity> mallActivities = + mallActivityMapper.selectList( + new LambdaQueryWrapper<MallActivity>() + .eq(MallActivity::getState, YesOrNoOrIngEnum.YES.getValue()) + .ge(MallActivity::getEndTime, date) + ); + if(CollUtil.isEmpty(mallActivities)){ + return; + } - @Autowired - private IApiMallMemberWalletService memberWalletService; - - @Autowired - private IApiMallMemberService memberService; - - @Scheduled(cron = "0 1 0 * * ?") - @Transactional(rollbackFor = Exception.class) - public void profitJob() { - log.info("推荐人返利执行"); -// DateTime yesterday = DateUtil.yesterday(); -// List<MallMoneyFlow> flows = moneyFlowMapper.selectMoneyFlowProfitByDate(yesterday); -// -// if (CollUtil.isEmpty(flows)) { -// return; -// } -// -// for (MallMoneyFlow flow : flows) { -// MallMember member = memberMapper.selectById(flow.getMemberId()); -// -// List<MallMember> child = memberMapper.selectByIdAndNoLevel(member.getInviteId(), AgentLevelEnum.ZERO_LEVEL.name()); -// if (CollUtil.isEmpty(child)) { -// continue; -// } -// int size = child.size(); -// BigDecimal needReturn = flow.getAmount().multiply(BigDecimal.valueOf(0.1)); -// -// String orderNo = MallUtils.getOrderNum("R"); -// String remarkFormat = "{}, 用户:{}, 利润分红: {}"; -// -// BigDecimal returnMoney = needReturn.divide(BigDecimal.valueOf(size), 2, RoundingMode.DOWN); -// for (MallMember mallMember : child) { -// memberWalletService.addBalance(returnMoney, mallMember.getId()); -// -// String remark = StrUtil.format(remarkFormat, DateUtil.format(yesterday, "yyyy-MM-dd"), member.getName(), returnMoney); -// memberService.addMoneyFlow(mallMember.getId(), returnMoney, MoneyFlowTypeEnum.PARENT_BONUS.getValue(), orderNo, null, remark, member.getId(), null); -// } -// -// String remark = StrUtil.format(remarkFormat, DateUtil.format(yesterday, "yyyy-MM-dd"), member.getName(), needReturn); -// memberService.addMoneyFlow(member.getId(), needReturn.negate(), MoneyFlowTypeEnum.PARENT_BONUS.getValue(), orderNo, null, remark, null, null); -// memberWalletService.reduceBalance(needReturn, member.getId()); -// -// moneyFlowMapper.updateIsReturnByMemberId(MallMoneyFlow.IS_RETURN_Y, flow.getMemberId()); -// } + mallActivities.forEach(mallActivity -> { + mallActivity.setState(YesOrNoOrIngEnum.NO.getValue()); + mallActivityMapper.updateById(mallActivity); + }); } + } -- Gitblit v1.9.1