diff --git a/src/main/java/com/sczx/order/convert/OrderConvert.java b/src/main/java/com/sczx/order/convert/OrderConvert.java index 96b591f..3b1fe07 100644 --- a/src/main/java/com/sczx/order/convert/OrderConvert.java +++ b/src/main/java/com/sczx/order/convert/OrderConvert.java @@ -69,6 +69,8 @@ public interface OrderConvert { @Mapping(source = "orderMainPO.renewalTimes", target = "renewalTimes"), @Mapping(source = "orderMainPO.chargeTimes", target = "chargeTimes"), @Mapping(source = "orderMainPO.orderAmount", target = "orderAmount"), + @Mapping(source = "orderMainPO.isDepositFree", target = "isDepositFree"), + @Mapping(source = "orderMainPO.isAutoDeduct", target = "isAutoDeduct"), @Mapping(source = "companyStoreDTO.name", target = "storeName"), @Mapping(source = "companyStoreDTO.detailedAddress", target = "detailedAddress"), @Mapping(source = "companyStoreDTO.latitude", target = "latitude"), diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java index cb6410f..02324d0 100644 --- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java +++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java @@ -140,6 +140,12 @@ public class OrderDetailDTO { @ApiModelProperty("订单总金额") private BigDecimal orderAmount; + @ApiModelProperty("是否开通免押") + private Boolean isDepositFree; + + @ApiModelProperty("是否开通代扣") + private Boolean isAutoDeduct; + @ApiModelProperty("预计到期间隔天数") private Integer expectedDays; diff --git a/src/main/java/com/sczx/order/task/OrderOverdueTask.java b/src/main/java/com/sczx/order/task/OrderOverdueTask.java index 9e234dd..42e03d2 100644 --- a/src/main/java/com/sczx/order/task/OrderOverdueTask.java +++ b/src/main/java/com/sczx/order/task/OrderOverdueTask.java @@ -31,7 +31,7 @@ public class OrderOverdueTask { * lockAtMostFor:锁最多持有时间,防止节点宕机导致锁无法释放 * lockAtLeastFor:锁最少持有时间,防止任务执行过快导致频繁执行 */ - @Scheduled(cron = "0 */1 * * * ?") + @Scheduled(cron = "0 */30 * * * ?") @SchedulerLock(name = "checkOverdueOrders", lockAtMostFor = "9m", lockAtLeastFor = "1m") public void checkOverdueOrders() { log.info("开始执行逾期订单检查任务");