修改填报状态

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

@@ -213,7 +213,7 @@ public class Api05Controller extends BladeController {
 		if(0 == payRequest.getPayType()){//等于0时进行打款操作
 			List<Consign> consigns = consignService.listByIds(payRequest.getConsignId());
 			for (Consign consign : consigns) {
-				if(consign.getConsignState() == 2){
+				if(consign.getConsignState() == 2 && consign.getConsignFor() == 2){
 					UserApp userApp = userAppMapper.selectOne(Wrappers.lambdaQuery(UserApp.class).eq(UserApp::getUserId,consign.getConsignUserId()));
 					iTradeService.transfer(userApp, consign.getConsignPrice().toString(), consign.getConsignConfigId(),consign);
 				}
@@ -235,6 +235,7 @@ public class Api05Controller extends BladeController {
 		query.eq(Consign::getConsignConfigId,consignConfigId);
 		query.eq(Consign::getConsignState, 2);
 		query.eq(Consign::getNowStock, 0);
+		query.eq(Consign::getConsignFor, 2);
 		query.orderByDesc(Consign::getEndTime);
 		List<Consign> list = consignService.list(query);
 		//获取用户id

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

@@ -73,7 +73,7 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 				//0/5 * * * * ?
 				//0 0 1 * * ?
 				//定时时间间隔 分钟
-				String cron = ParamCache.getValue(CommonConstant.TASK_SCHEDULING_TIME);
+				String cron = "0 0/1 * * * ?";
 				if(StringUtil.isEmpty(cron)){
 					cron = "0 10 00 * * ?";
 				}

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

@@ -10,6 +10,8 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.api.service.ITradeService;
 import org.springblade.modules.finance.entity.OrderGrant;
 import org.springblade.modules.finance.service.IOrderGrantService;
+import org.springblade.modules.shopping.entity.Consign;
+import org.springblade.modules.shopping.service.IConsignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;
@@ -24,6 +26,9 @@ import java.util.List;
 
 import static org.springblade.modules.api.task.ConsignSchedulingTask.isStartTask;
 
+/**
+ * 预授权退款
+ */
 @Component
 public class GrantSchedulingTask implements SchedulingConfigurer {
 
@@ -38,6 +43,9 @@ public class GrantSchedulingTask implements SchedulingConfigurer {
 	@Autowired
 	private ITradeService tradeService;
 
+	@Autowired
+	private IConsignService consignService;
+
 	@Override
 	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 		if(!isStartTask){
@@ -62,7 +70,8 @@ public class GrantSchedulingTask implements SchedulingConfigurer {
 				//0/5 * * * * ?
 				//0 0 1 * * ?
 				//String cron = "0 0/5 * * * ?";
-				int taskTime = Integer.parseInt(ParamCache.getValue(CommonConstant.TASK_GRANT_TIME));//分钟
+//				int taskTime = Integer.parseInt(ParamCache.getValue(CommonConstant.TASK_GRANT_TIME));//分钟
+				int taskTime = 1;//分钟
 				if(StringUtil.isEmpty(taskTime)){
 					taskTime = 10;
 				}
@@ -87,5 +96,20 @@ 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()));
 	}
 }