修改定时任务等

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

@@ -256,7 +256,7 @@ public class AliPay01Controller {
 			.eq(OrderGrant::getUserId, userId)
 			.eq(OrderGrant::getStatus,1)
 		);
-		if (Objects.isNull(orderGrant)){
+		if (!Objects.isNull(orderGrant)){
 			return R.fail("您已发起预授权，无需再次发起！");
 		}
 		JSONObject data = new JSONObject();

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

@@ -15,7 +15,6 @@ import org.springblade.modules.shopping.entity.Consign;
 import org.springblade.modules.shopping.entity.ConsignConfig;
 import org.springblade.modules.shopping.service.IConsignConfigService;
 import org.springblade.modules.shopping.service.IConsignService;
-import org.springblade.modules.shopping.vo.ConsignVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;
@@ -39,7 +38,7 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 	private static final String PATTERN_DATETIME = org.springblade.core.tool.utils.DateUtil.PATTERN_DATETIME;
 
 	private static final String TASK_NAME = "【定时修改进货订单数据】";
-	public static boolean isStartTask =false;
+	public static boolean isStartTask = true;
 	@Autowired
 	private IConsignService consignService;
 
@@ -117,11 +116,13 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 			config.setTitle(consignConfig.getTitle());
 			config.setIsEnabled(consignConfig.getIsEnabled());
 			//更新当前场次变为停用
-			consignConfig.setIsEnabled(1);
+			consignConfig.setIsEnabled(1);//停用
+			consignConfig.setIsNow(1);//旧
 			consignConfigService.updateById(consignConfig);
 			//新增场次
 			String configNo = CommonUtil.genTimeID();
 			config.setConfigNo(configNo);
+			config.setIsNow(2);//新
 			consignConfigService.save(config);
 			//更新进货表数据
 			consign(start, end, consignConfig.getId(), configNo);

src/main/java/org/springblade/modules/shopping/controller/ConsignConfigController.java

@@ -84,6 +84,7 @@ public class ConsignConfigController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入consignConfig")
 	public R<List<ConsignConfig>> selectList(ConsignConfig consignConfig) {
+		consignConfig.setIsNow(2);
 		return R.data(consignConfigService.list(Condition.getQueryWrapper(consignConfig)));
 	}
 

src/main/java/org/springblade/modules/shopping/controller/ConsignController.java

@@ -80,7 +80,7 @@ public class ConsignController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入consign")
 	public R<IPage<ConsignVO>> list(Consign consign, Query query) {
 		IPage<Consign> pages = consignService.page(Condition.getPage(query),
-			Condition.getQueryWrapper(consign).orderByAsc("start_time"));
+			Condition.getQueryWrapper(consign).orderByDesc("create_time"));
 		return R.data(ConsignWrapper.build().pageVO(pages));
 	}
 

src/main/java/org/springblade/modules/shopping/entity/ConsignConfig.java

@@ -79,6 +79,9 @@ public class ConsignConfig implements Serializable {
 	@ApiModelProperty(value = "是否启用")
 	private Integer isEnabled;
 
+	@ApiModelProperty(value = "是否最新")
+	private Integer isNow;
+
 	@TableLogic
 	@ApiModelProperty(value = "逻辑删除")
 	private Integer isDeleted;

src/main/java/org/springblade/modules/shopping/vo/ConsignConfigVO.java

@@ -44,4 +44,7 @@ public class ConsignConfigVO extends ConsignConfig {
 	@ApiModelProperty(value = "是否启用")
 	private String isEnabledDisplayName;
 
+	@ApiModelProperty(value = "是否启用")
+	private String isNowDisplayName;
+
 }

src/main/java/org/springblade/modules/shopping/wrapper/ConsignConfigWrapper.java

@@ -42,6 +42,7 @@ public class ConsignConfigWrapper extends BaseEntityWrapper<ConsignConfig, Consi
 	public ConsignConfigVO entityVO(ConsignConfig entity) {
 		ConsignConfigVO vo = Objects.requireNonNull(BeanUtil.copy(entity, ConsignConfigVO.class));
 		vo.setIsEnabledDisplayName(DictCache.getValue(DictEnum.YES_NO, entity.getIsEnabled()));
+		vo.setIsNowDisplayName(DictCache.getValue(DictEnum.YES_NO, entity.getIsNow()));
 		return vo;
 	}