自动收货时间

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -25,6 +25,8 @@ import com.gic.business.order.dto.ordermanage.ListOrderDTO;
 import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
 import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
 import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
+import com.gic.business.order.dto.ordermanage.OrderNodeDTO;
+import com.gic.business.order.dto.setting.MallOrderSettingDTO;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
@@ -35,8 +37,10 @@ import com.gic.business.order.qdto.ordermanage.SelfPickOffQDTO;
 import com.gic.business.order.qdto.ordermanage.UpdateOrderLogisticsQDTO;
 import com.gic.business.order.service.activity.MemberReferClerkApiService;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
+import com.gic.business.order.service.setting.OrderSettingApiService;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -86,6 +90,8 @@ public class GicOrderController {
     private OrderVerificationRecordApiService orderVerificationRecordApiService;
     @Autowired
     private ProductStockApiService productStockApiService;
+    @Autowired
+    private OrderSettingApiService orderSettingApiService;
 
     // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
@@ -185,8 +191,24 @@ public class GicOrderController {
             return RestResponse.failure(ret.getCode(), ret.getMessage());
         }
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
-        return RestResponse.successResult(
-                this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(), ret.getResult().getOrderItemList()));
+        OrderDetailVO detail = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
+                ret.getResult().getOrderItemList());
+        // 自动收货时间
+        List<OrderNodeDTO> stepList = ret.getResult().getOrderNodeList();
+        if (CollectionUtils.isNotEmpty(stepList)) {
+            stepList.forEach(item -> {
+                if (item.getOrderStep() == 3) {
+                    ServiceResponse<MallOrderSettingDTO> setResp = this.orderSettingApiService
+                            .getOrderSetting(enterpriseId);
+                    int autoDay = setResp.getResult().getAutoConfirm();
+                    if (0 != autoDay) {
+                        detail.setAutoTaskOverTime(DateUtil.addDay(item.getCreateTime(), autoDay));
+                        return;
+                    }
+                }
+            });
+        }
+        return RestResponse.successResult(detail);
     }
 
     private OrderDetailVO getOrderDetail(String enterpriseId, OrderInfoDTO orderInfo,

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderDetailVO.java

@@ -77,6 +77,30 @@ public class OrderDetailVO implements Serializable {
      */
     private String amountPayableInfo;
 
+    /**
+     * 自提截止时间
+     */
+    private Date pickUpOverTime;
+    
+    // 自动收货时间
+    private Date autoTaskOverTime ;
+
+    public Date getAutoTaskOverTime() {
+        return autoTaskOverTime;
+    }
+
+    public void setAutoTaskOverTime(Date autoTaskOverTime) {
+        this.autoTaskOverTime = autoTaskOverTime;
+    }
+
+    public Date getPickUpOverTime() {
+        return pickUpOverTime;
+    }
+
+    public void setPickUpOverTime(Date pickUpOverTime) {
+        this.pickUpOverTime = pickUpOverTime;
+    }
+
     public Date getPayTime() {
         return payTime;
     }