CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/community-center' into preview

master
yang 2025-02-22 13:13:32 +08:00
parent e39f863f6c 34962cae82
commit 2bcef6635e
5 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mcwl-common/src/main/java/com/mcwl/common/constant/Constants.java
View File

@ -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"
};
/**
* 定时任务违规的字符

2
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/EmptyPointsRemindConsumer.java
View File

@ -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());

2
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/MemberBillingConsumer.java
View File

@ -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);

9
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/task/UserMemberTask.java
View File

@ -29,7 +29,7 @@ public class UserMemberTask {
/**
* 积分清零提醒 月底前五天
* 积分清零提醒 月底前五天 0 0 9 L-5 * ?
*/
public void emptyPointsRemindTask() {
List<Member> 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<Member> 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) {

45
mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java 100644
View File

@ -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<OrderTrade> orderTradeList = orderTradeService.lambdaQuery()
.le(OrderTrade::getCreateTime, date)
.and(wrapper -> wrapper
.eq(OrderTrade::getOrderStatus, 4)
.or()
.eq(OrderTrade::getPayStatus, 1)
)
.list();
orderTradeService.removeBatchByIds(orderTradeList);
}
}