java/Robotaxi.git

			@@ -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,27 +25,6 @@
			@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 taskOrder() {
			@@ -62,18 +34,13 @@
			}







			/**
			* 每日发放券的活动
			*/
			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;
			}
			for (XpActivity activity : activities) {
			@@ -84,7 +51,7 @@
			for (XpActicityStrategy xpActicityStrategy : list) {
			String distributionTime = xpActicityStrategy.getDistributionTime();
			String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm"));
			if(distributionTime.equals(format)){
			if (distributionTime.equals(format)) {
			xpActicityService.pushCoupon(activity, xpActicityStrategy);
			}
			}