包裹排序

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

@@ -206,6 +206,11 @@ public class GicOrderController {
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
         OrderDetailVO detail = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
                 ret.getResult().getOrderItemList(), storeId);
+        if (CollectionUtils.isNotEmpty(ret.getResult().getOrderWrapList())) {
+            List<String> idList = ret.getResult().getOrderWrapList().stream().map(o -> o.getMallOrderLogisticsId())
+                    .collect(Collectors.toList());
+            detail.setOrderLogisticsIdList(idList);
+        }
         detail.setCreateTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.PLACE_AN_ORDER,
                 ret.getResult().getOrderNodeList()));
         detail.setPayTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.PAY_ORDER,
@@ -248,16 +253,17 @@ public class GicOrderController {
             qdto.setEnterpriseId(enterpriseId);
             qdto.setWriteOffCode(writeOffCode);
             ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
-            OrderDetailDTO detail = ret.getResult() ;
+            OrderDetailDTO detail = ret.getResult();
             logger.info("订单信息={}", JSON.toJSONString(ret, true));
             if (ret.isSuccess()) {
                 // 已核销,且不是好办核销的
-                if(null != detail.getOrderInfo().getDeliveryOptType() && detail.getOrderInfo().getDeliveryOptType()!=1) {
-                    logger.info("已核销,且不是好办核销的={}",writeOffCode);
-                    return RestResponse.failure("9999", "此自提点无法核销"); 
+                if (null != detail.getOrderInfo().getDeliveryOptType()
+                        && detail.getOrderInfo().getDeliveryOptType() != 1) {
+                    logger.info("已核销,且不是好办核销的={}", writeOffCode);
+                    return RestResponse.failure("9999", "此自提点无法核销");
                 }
-                if(!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
-                    return RestResponse.failure("9999", "此自提点无法核销"); 
+                if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
+                    return RestResponse.failure("9999", "此自提点无法核销");
                 }
                 OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
                         ret.getResult().getOrderItemList(), storeId);
@@ -334,10 +340,12 @@ public class GicOrderController {
         qdto.setOrderItemShipment(list);
         ServiceResponse<Boolean> resp = webOrderManageApiService.orderShipment(qdto);
         if (!resp.isSuccess()) {
-            /*String code = resp.getCode();
-            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
-                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
-            }*/
+            /*
+             * String code = resp.getCode(); if (Arrays.asList("900001",
+             * "300105", "200001").contains(code)) { return
+             * RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "",
+             * "请刷新页面"); }
+             */
             return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
         }
         return RestResponse.successResult(resp.getResult());
@@ -560,8 +568,8 @@ public class GicOrderController {
         }
         member.setAddressPhone(orderInfo.getBuyerPhone());
         member.setAddressName(orderInfo.getBuyerName());
-        member.setAddressDetail(orderInfo.getFullName()+orderInfo.getAddressInfo());
-        orderDetailVO.setAddressInfo(orderInfo.getFullName()+orderInfo.getAddressInfo());
+        member.setAddressDetail(orderInfo.getFullName() + orderInfo.getAddressInfo());
+        orderDetailVO.setAddressInfo(orderInfo.getFullName() + orderInfo.getAddressInfo());
         orderDetailVO.setMember(member);
         // 判断能否发货
         // 导购发货，一笔订单仅允许单门店发货

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

@@ -127,7 +127,17 @@ public class OrderDetailVO implements Serializable {
     // 能否标识 
     private boolean canDeliverFlag = true  ;
     
+    // 物流包裹列表
+    private List<String> orderLogisticsIdList ;
     
+    public List<String> getOrderLogisticsIdList() {
+        return orderLogisticsIdList;
+    }
+
+    public void setOrderLogisticsIdList(List<String> orderLogisticsIdList) {
+        this.orderLogisticsIdList = orderLogisticsIdList;
+    }
+
     public String getPickUpCode() {
         return pickUpCode;
     }