From 34962cae8233f69215460097909a35d8aa7bf9ee Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Sat, 22 Feb 2025 13:13:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(task):=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mcwl/common/constant/Constants.java | 6 ++- .../consumer/EmptyPointsRemindConsumer.java | 2 +- .../consumer/MemberBillingConsumer.java | 2 +- .../memberCenter/task/UserMemberTask.java | 9 ++-- .../main/java/com/mcwl/pay/task/PayTask.java | 45 +++++++++++++++++++ 5 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java diff --git a/mcwl-common/src/main/java/com/mcwl/common/constant/Constants.java b/mcwl-common/src/main/java/com/mcwl/common/constant/Constants.java index 61cecef..b7a3442 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/constant/Constants.java +++ b/mcwl-common/src/main/java/com/mcwl/common/constant/Constants.java @@ -163,7 +163,11 @@ public class Constants /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.mcwl.quartz.task" }; + public static final String[] JOB_WHITELIST_STR = { + "com.mcwl.quartz.task", + "com.mcwl.memberCenter.task", + "com.mcwl.pay.task" + }; /** * 定时任务违规的字符 diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/EmptyPointsRemindConsumer.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/EmptyPointsRemindConsumer.java index b298cc0..99cc3be 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/EmptyPointsRemindConsumer.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/EmptyPointsRemindConsumer.java @@ -39,7 +39,7 @@ public class EmptyPointsRemindConsumer { SysAdvice sysAdvice = new SysAdvice(); sysAdvice.setSenderId(sysUser.getUserId()); sysAdvice.setReceiverId(member.getUserId()); - sysAdvice.setType(AdviceEnum.NEW_MESSAGE_REMIND); + sysAdvice.setType(AdviceEnum.SYSTEM_NOTICE); sysAdvice.setTitle("积分清零提醒"); sysAdvice.setContent("您的积分即将清零，请及时消费"); sysAdvice.setCreateBy(sysUser.getUserName()); diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/MemberBillingConsumer.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/MemberBillingConsumer.java index d9ecb64..a388d84 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/MemberBillingConsumer.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/MemberBillingConsumer.java @@ -39,7 +39,7 @@ public class MemberBillingConsumer { SysAdvice sysAdvice = new SysAdvice(); sysAdvice.setSenderId(sysUser.getUserId()); sysAdvice.setReceiverId(member.getUserId()); - sysAdvice.setType(AdviceEnum.NEW_MESSAGE_REMIND); + sysAdvice.setType(AdviceEnum.SYSTEM_NOTICE); sysAdvice.setTitle("会员账单"); sysAdvice.setContent("您的会员即将到期，请及时支付"); sysAdviceService.save(sysAdvice); diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/task/UserMemberTask.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/task/UserMemberTask.java index a02bc2d..be7a5f2 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/task/UserMemberTask.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/task/UserMemberTask.java @@ -29,7 +29,7 @@ public class UserMemberTask { /** - * 积分清零提醒 月底前五天 + * 积分清零提醒 月底前五天 0 0 9 L-5 * ? */ public void emptyPointsRemindTask() { List memberList = memberService.getUseUserMember(); @@ -45,7 +45,7 @@ public class UserMemberTask { /** - * 清空积分 每月月底前两天 + * 清空积分 每月月底前两天 0 0 9 L-2 * ? */ @Transactional public void emptyPointsTsk() { @@ -57,7 +57,6 @@ public class UserMemberTask { } for (Member member : memberList) { member.setPoints(0.0); - member.setUpdateTime(new Date()); userIdList.add(member.getUserId()); } sysUserList = sysUserService.listByIds(userIdList); @@ -69,7 +68,7 @@ public class UserMemberTask { } /** - * 更新会员状态 间隔1h检查 + * 更新会员状态 间隔1h检查 0 0 0/1 * * ? */ public void updateSubscriptionStatusTask() { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); @@ -82,8 +81,6 @@ public class UserMemberTask { return; } - System.out.println("userMemberList = " + memberList); - for (Member member : memberList) { MemberEnum subscriptionStatus = member.getSubscriptionStatus(); if (subscriptionStatus == MemberEnum.MEMBER_CENTER_ACTIVE) { diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java b/mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java new file mode 100644 index 0000000..76a321d --- /dev/null +++ b/mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java @@ -0,0 +1,45 @@ +package com.mcwl.pay.task; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.mcwl.common.constant.QueueConstants; +import com.mcwl.memberCenter.domain.Member; +import com.mcwl.pay.domain.OrderTrade; +import com.mcwl.pay.service.AliPayService; +import com.mcwl.pay.service.OrderTradeService; +import lombok.RequiredArgsConstructor; +import org.joda.time.LocalDateTime; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.List; +import java.util.function.Consumer; + +@Component("payTask") +@RequiredArgsConstructor +public class PayTask { + + private final OrderTradeService orderTradeService; + + + /** + * 删除失效订单 间隔1h检查 0 0 0/1 * * ? + */ + public void deleteInvalidOrderTask() { + + Date date = LocalDateTime.now().plusMinutes(-15).toDate(); + + List orderTradeList = orderTradeService.lambdaQuery() + .le(OrderTrade::getCreateTime, date) + .and(wrapper -> wrapper + .eq(OrderTrade::getOrderStatus, 4) + .or() + .eq(OrderTrade::getPayStatus, 1) + ) + .list(); + + orderTradeService.removeBatchByIds(orderTradeList); + + } + + +}