Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-quartz/src/main/java/com/qs/mp/quartz/task/ChannelOrderTask.java

@@ -40,7 +40,7 @@ public class ChannelOrderTask {
   /**
    * x天前的待收货订单自动确认收货任务
    */
-  public void confirm(int day) {
+  public void confirm(Integer day) {
     LogUtil.info(logger, "...渠道商订单自动确认收货任务开始...");
     LocalDateTime now = LocalDateTimeUtil.now();
     LocalDateTime deliveryTime = LocalDateTimeUtil.offset(now, -day, ChronoUnit.DAYS);

mp-quartz/src/main/java/com/qs/mp/quartz/task/UserDeliverOrderTask.java

@@ -38,7 +38,7 @@ public class UserDeliverOrderTask {
     /**
      * x天前的待收货订单自动确认收货任务
      */
-    public void confirm(int day) {
+    public void confirm(Integer day) {
         LogUtil.info(logger, "...用户提货订单自动确认收货任务开始...");
         LocalDateTime now = LocalDateTimeUtil.now();
         LocalDateTime deliveryTime = LocalDateTimeUtil.offset(now, -day, ChronoUnit.DAYS);