From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/task/ActivityTask.java | 81 ++++++++++------------------------------
1 files changed, 20 insertions(+), 61 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/task/ActivityTask.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/task/ActivityTask.java
index dcfab1b..bd148a8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/task/ActivityTask.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/task/ActivityTask.java
@@ -1,15 +1,11 @@
package com.xiaopeng.operation.utils.task;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xiaopeng.api.dto.account.UcUserInfo;
-import com.xiaopeng.api.feignClient.account.UserResourcesClient;
-import com.xiaopeng.api.feignClient.account.XpAppUserCouponClient;
-import com.xiaopeng.api.feignClient.order.XpOrderClient;
-import com.xiaopeng.api.model.account.XpAppUserCoupon;
-import com.xiaopeng.api.model.operation.*;
-import com.xiaopeng.operation.service.*;
+import com.xiaopeng.api.model.operation.XpActicityStrategy;
+import com.xiaopeng.api.model.operation.XpActivity;
+import com.xiaopeng.operation.service.IXpActicityService;
+import com.xiaopeng.operation.service.IXpActicityStrategyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -17,10 +13,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
@Slf4j
@Component
@@ -32,42 +25,11 @@
@Resource
private IXpActicityService xpActicityService;
- @Resource
- private IXpActicityUserService xpActicityUserService;
-
- @Resource
- private IXpWhitelistService xpWhitelistService;
-
- @Resource
- private IXpActicityCouponService xpActicityCouponService;
-
- @Resource
- private IXpCouponService xpCouponService;
-
- @Resource
- private XpAppUserCouponClient xpAppUserCouponClient;
-
- @Resource
- private XpOrderClient xpOrderClient;
-
- @Resource
- private UserResourcesClient userResourcesClient;
-
@Scheduled(cron = "0 0/1 * * * *")
- public void taskOrder1() {
- xpActicityService.updateStatus();
- }
-
-
-
-
-
- /**
- * 凌晨执行的定时任务
- */
- @Scheduled(cron = "0 0 0 * * *")
public void taskOrder() {
+ xpActicityService.updateStatus();
+ //循环发放的活动
pusCoupon();
}
@@ -75,27 +37,24 @@
/**
* 每日发放券的活动
*/
- public void pusCoupon(){
+ public void pusCoupon() {
List<XpActivity> activities = xpActicityService.list(new QueryWrapper<XpActivity>().eq("status", 2)
.eq("is_deleted", 0).last(" and now() between start_time and end_time"));
- if(activities.isEmpty()){
+ if (activities.isEmpty()) {
return;
}
- List<Long> activityIds = activities.stream().map(XpActivity::getId).collect(Collectors.toList());
- //获取发放人
- List<XpActicityUser> xpActicityUsers = xpActicityUserService.list(new QueryWrapper<XpActicityUser>().eq("is_deleted", 0)
- .in("actitcity_id", activityIds));
- List<XpActicityStrategy> list = xpActicityStrategyService.list(new QueryWrapper<XpActicityStrategy>()
- .eq("distribution_rules", 1)
- .eq("is_deleted", 0)
- .in("actitcity_id", activityIds));
- for (XpActicityStrategy xpActicityStrategy : list) {
- //发放人
- List<XpActicityUser> collect = xpActicityUsers.stream().filter(s -> s.getActitcityStrategeId().equals(xpActicityStrategy.getId())).collect(Collectors.toList());
-
-
-
-
+ for (XpActivity activity : activities) {
+ List<XpActicityStrategy> list = xpActicityStrategyService.list(new QueryWrapper<XpActicityStrategy>()
+ .eq("distribution_rules", 1)
+ .eq("is_deleted", 0)
+ .eq("actitcity_id", activity.getId()));
+ for (XpActicityStrategy xpActicityStrategy : list) {
+ String distributionTime = xpActicityStrategy.getDistributionTime();
+ String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm"));
+ if (distributionTime.equals(format)) {
+ xpActicityService.pushCoupon(activity, xpActicityStrategy);
+ }
+ }
}
}
}
--
Gitblit v1.7.1