添加 寄售用户手机号 字段

src/main/java/org/springblade/modules/api/controller/Api05Controller.java

@@ -76,10 +76,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -240,6 +237,9 @@ public class Api05Controller extends BladeController {
 		List<Consign> list = consignService.list(query);
 		//获取用户id
 		List<Long> collect = list.stream().map(Consign::getConsignUserId).collect(Collectors.toList());
+		if(ObjectUtil.isEmpty(list)){
+			return R.data(list);
+		}
 		List<User> users = userService.listByIds(collect);
 		for (Consign consign : list) {
 			List<User> first = users.stream().filter(s -> s.getId().equals(consign.getConsignUserId())).collect(Collectors.toList());
@@ -264,7 +264,7 @@ public class Api05Controller extends BladeController {
 		query.eq(PlatformAuthorization::getState, 1);
 		List<PlatformAuthorization> platformAuthorizations = paMapper.selectList(query);
 		LambdaQueryWrapper<Consign> consignLambdaQueryWrapper = Wrappers.lambdaQuery(Consign.class);
-		consignLambdaQueryWrapper.eq(Consign::getNowStock, 0).eq(Consign::getConsignState, 2).orderByDesc(Consign::getEndTime);
+		consignLambdaQueryWrapper.eq(Consign::getNowStock, 0).eq(Consign::getConsignState, 2).eq(Consign::getConsignFor, 2).orderByDesc(Consign::getEndTime);
 		List<Consign> list = consignService.list(consignLambdaQueryWrapper);
 		ConsignListVO consignListVO = null;
 		List<ConsignListVO> consignListVOS = new ArrayList<>();
@@ -280,6 +280,7 @@ public class Api05Controller extends BladeController {
 				consignListVOS.add(consignListVO);
 			}
 		}
+		consignListVOS.sort(Comparator.comparing(ConsignListVO::getEndTime).reversed());
 		return R.data(consignListVOS);
 	}
 

src/main/java/org/springblade/modules/api/task/ConsignSchedulingTask.java

@@ -2,6 +2,7 @@ package org.springblade.modules.api.task;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,11 +74,14 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 				//0/5 * * * * ?
 				//0 0 1 * * ?
 				//定时时间间隔 分钟
-				String cron = "0 0/1 * * * ?";
-				if(StringUtil.isEmpty(cron)){
-					cron = "0 10 00 * * ?";
+//				Integer taskTime  = Integer.parseInt(ParamCache.getValue(CommonConstant.TASK_SCHEDULING_TIME));//分钟
+				Integer taskTime  = 10;//分钟
+				if(ObjectUtil.isEmpty(taskTime)){
+					taskTime = 10;
 				}
-				log.info(TASK_NAME + "定时时间间隔: " + cron);
+				String cron = "0 0/" + taskTime + " * * * ?";
+				log.info(TASK_NAME + "定时时间间隔: " + taskTime);
+
 				//String cron = "0 0/" + taskTime + " * * * ?";
 				//23:20:00执行
 				//String cron = "0 20 23 * * ?";
@@ -182,6 +186,7 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 			consignService.update(platform, Wrappers.<Consign>lambdaQuery()
 				.eq(Consign::getConsignConfigId, configId)
 				.eq(Consign::getConsignState, 1) //寄售中才变动
+				.lt(Consign::getEndTime, new Date())
 				.eq(Consign::getConsignPrice, consign.getConsignPrice()));
 		}
 		List<Consign> batchList = new ArrayList<>();

src/main/java/org/springblade/modules/api/task/GrantSchedulingTask.java

@@ -71,7 +71,7 @@ public class GrantSchedulingTask implements SchedulingConfigurer {
 				//0 0 1 * * ?
 				//String cron = "0 0/5 * * * ?";
 //				int taskTime = Integer.parseInt(ParamCache.getValue(CommonConstant.TASK_GRANT_TIME));//分钟
-				int taskTime = 1;//分钟
+				int taskTime = 10;//分钟
 				if(StringUtil.isEmpty(taskTime)){
 					taskTime = 10;
 				}
@@ -96,20 +96,5 @@ public class GrantSchedulingTask implements SchedulingConfigurer {
 		if (list.size() > 0){
 			tradeService.orderGrant(list);
 		}
-
-		/**
-		 * 查询寄售数据中平台需要兜底的数据，
-		 * 	1、目的把寄售状态改为待付款
-		 * 	2、状态为1：寄售中
-		 * 	3、剩余数量为 1
-		 * 	4、寄售价台的寄售价相等的数据
-		 */
-		Consign platform = new Consign();
-		platform.setConsignState(2);//待付款
-		platform.setNowStock(0);//被平台抢
-		consignService.update(platform, Wrappers.<Consign>lambdaQuery()
-			.eq(Consign::getConsignState, 1) //寄售中才变动
-			.eq(Consign::getConsignFor,2)
-			.lt(Consign::getEndTime, new Date()));
 	}
 }