好办返回

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

@@ -109,7 +109,6 @@ public class GicOrderController {
     @RequestMapping("list-order")
     public RestResponse<Object> orderList(String enterpriseId, String storeId, String clerkId, String search,
             @RequestParam(defaultValue = "0") int status, BasePageInfo pageInfo) {
-
         String strStatus = "" + status;
         if (status == 0) {
             strStatus = "2,3,7";
@@ -121,13 +120,16 @@ public class GicOrderController {
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setOrderStep(strStatus);
+        // 微商城
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        // 配送方式 -1：所有 2：门店自提 1：快递发货
+        qdto.setDeliveryType(1);
+        // 库存 - 门店库存2
+        // qdto.setDeliveryMode(2);
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderParam(search);
         }
         qdto.setBelongStoreId(storeId);
-        // 配送方式 -1：所有 2：门店自提 1：快递发货
-        qdto.setDeliveryType(1);
         logger.info("发货订单查询,qdto={}", JSON.toJSONString(qdto));
         return this.orderListSelect(qdto, pageInfo, false);
     }
@@ -153,7 +155,6 @@ public class GicOrderController {
                     noDeliver = noDeliver + item.getTotal();
                 }
             }
-            ;
             vo.setDeliverCount((int) deliver);
             vo.setNoDeliverCount((int) noDeliver);
             vo.setTotal((int) (deliver + noDeliver));
@@ -524,11 +525,10 @@ public class GicOrderController {
         boolean canDeliverFlag = false;
         // 发货操作类型(0后台/1好办门店):用于判断好办操作发货还是后台，防止双边发货
         Integer deliveryOptType = orderInfo.getDeliveryOptType();
-        String deliverStoreId = orderInfo.getDeliverStoreId();
-        logger.info("发货类型={},发货门店={},orderId={}", deliveryOptType, deliverStoreId, orderInfo.getOrderId());
+        logger.info("发货类型1好办={},orderId={}", deliveryOptType, orderInfo.getOrderId());
         if (null == deliveryOptType) {
             canDeliverFlag = true;
-        } else if (deliveryOptType == 1 && storeId.equals(deliverStoreId)) {
+        } else if (deliveryOptType == 1) {
             canDeliverFlag = true;
         }
         orderDetailVO.setCanDeliverFlag(canDeliverFlag);

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

@@ -17,7 +17,6 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.dict.api.dto.LogisticsCompanyDTO;
 import com.gic.dict.api.service.ManagerDictService;
 import com.gic.haoban.manage.web.qo.order.QueryLogisticsQO;
-import com.gic.thirdparty.api.dto.LogisticsDTO;
 
 /**
  * 物流