Merge branch 'dev' into 'mp-server-test'

自动确认收货时间为15天

See merge request quanshu/mp-server!498

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -159,7 +159,7 @@ public class ChannelOrderController extends BaseApiController {
     // 设置自动确认收货的时间;
     if (channelOrderVO != null && Objects.nonNull(channelOrderVO.getDeliveryTime())) {
       Date deliveryTime = channelOrderVO.getDeliveryTime();
-      LocalDateTime autoConfirmTime = LocalDateTimeUtil.of(deliveryTime).plusDays(10);
+      LocalDateTime autoConfirmTime = LocalDateTimeUtil.of(deliveryTime).plusDays(15);
       Duration between = LocalDateTimeUtil.between(LocalDateTime.now(), autoConfirmTime);
       long hours = between.toHours();
       long day = hours / 24;

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -136,7 +136,7 @@ public class UserDeliverOrderController extends BaseApiController {
     // 设置自动确认收货时间
     if (deliverOrder != null && !Objects.isNull(deliverOrder.getDeliveryTime())) {
       Date deliveryTime = deliverOrder.getDeliveryTime();
-      LocalDateTime autoConfirmTime = LocalDateTimeUtil.of(deliveryTime).plusDays(10);
+      LocalDateTime autoConfirmTime = LocalDateTimeUtil.of(deliveryTime).plusDays(15);
       Duration between = LocalDateTimeUtil.between(LocalDateTime.now(), autoConfirmTime);
       long hours = between.toHours();
       long day = hours / 24;