自动确认收货时间返回

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

@@ -1,5 +1,6 @@
 package com.qs.mp.web.controller.api.channel.mall;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.admin.domain.TicketBox;
@@ -42,6 +43,8 @@ import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -142,6 +145,18 @@ public class ChannelOrderController extends BaseApiController {
         .eq(ChannelOrder::getOrderId, order.getOrderId()).eq(ChannelOrder::getChannelId, channelId));
     ChannelOrderInfoVO channelOrderVO = mapperFacade.map(channelOrder, ChannelOrderInfoVO.class);
 
+    // 设置自动确认收货的时间;
+    if (channelOrderVO != null && Objects.nonNull(channelOrderVO.getDeliveryTime())) {
+      Date deliveryTime = channelOrderVO.getDeliveryTime();
+      LocalDateTime autoConfirmTime = LocalDateTimeUtil.of(deliveryTime).plusDays(10);
+      Duration between = LocalDateTimeUtil.between(LocalDateTime.now(), autoConfirmTime);
+      long hours = between.toHours();
+      long day = hours / 24;
+      long hour = hours % 24;
+      channelOrderVO.setAutoConfirmTime(day + "天" + hour + "小时");
+    }
+
+
     if(null != channelOrderVO && null != channelOrderVO.getDeliveryId()) {
       DeliveryCompany deliveryCompany = deliveryCompanyService.getById(channelOrderVO.getDeliveryId());
       channelOrderVO.setDeliveryCompany(deliveryCompany);

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

@@ -1,5 +1,6 @@
 package com.qs.mp.web.controller.api.user;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
@@ -37,6 +38,8 @@ import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import javax.validation.Valid;
@@ -119,6 +122,18 @@ public class UserDeliverOrderController extends BaseApiController {
     UserDeliverOrder deliverOrder = userDeliverOrderService.getOne(new LambdaQueryWrapper<UserDeliverOrder>()
         .eq(UserDeliverOrder::getOrderId, order.getOrderId()).eq(UserDeliverOrder::getUserId, userId));
     DeliverOrderVO deliverOrderVO = mapperFacade.map(deliverOrder, DeliverOrderVO.class);
+
+    // 设置自动确认收货时间
+    if (deliverOrder != null && !Objects.isNull(deliverOrder.getDeliveryTime())) {
+      Date deliveryTime = deliverOrder.getDeliveryTime();
+      LocalDateTime autoConfirmTime = LocalDateTimeUtil.of(deliveryTime).plusDays(10);
+      Duration between = LocalDateTimeUtil.between(LocalDateTime.now(), autoConfirmTime);
+      long hours = between.toHours();
+      long day = hours / 24;
+      long hour = hours % 24;
+      deliverOrderVO.setAutoConfirmTime(day + "天" + hour + "小时");
+    }
+
     deliverOrderVO.setItems(userDeliverOrderItemService.selectUserDeliverOrderItemVOList(deliverOrder.getOrderId()));
     deliverOrderVO.setDeliverList(userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
     return AjaxResult.success(deliverOrderVO);

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOrderInfoVO.java

@@ -3,6 +3,8 @@ package com.qs.mp.channel.domain.vo;
 import com.qs.mp.channel.domain.ChannelOrder;
 import com.qs.mp.common.domain.DeliveryCompany;
 import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -19,4 +21,7 @@ public class ChannelOrderInfoVO extends ChannelOrder {
   private DeliveryCompany deliveryCompany;
 	
   private List<ChannelOrderItemVO> items;
+
+  @ApiModelProperty("自动确认收货时间")
+  private String autoConfirmTime;
 }

mp-service/src/main/java/com/qs/mp/user/domain/vo/DeliverOrderVO.java

@@ -2,7 +2,12 @@ package com.qs.mp.user.domain.vo;
 
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,8 +15,15 @@ import lombok.Data;
  * @Date 2022/3/17
  */
 @Data
+@ApiModel(value = "提货订单展示VO")
 public class DeliverOrderVO extends UserDeliverOrder {
+
+  @ApiModelProperty("提货订单VO")
   List<UserDeliverOrderItemVO> items;
   // 物流信息
+  @ApiModelProperty("物流信息")
   List<OrderDeliverItemVO> deliverList;
+
+  @ApiModelProperty("自动确认收货时间")
+  private String autoConfirmTime;
 }