发货数量

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

@@ -30,6 +30,7 @@ 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.ordermanage.OrderStatusDTO;
 import com.gic.business.order.dto.setting.MallOrderSettingDTO;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
@@ -113,6 +114,9 @@ public class GicOrderController {
         if (status == 0) {
             strStatus = "2,3,7";
         }
+        if (status == 2) {
+            strStatus = "2,7";
+        }
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
@@ -128,6 +132,35 @@ public class GicOrderController {
         return this.orderListSelect(qdto, pageInfo, false);
     }
 
+    // 数量查询(待发货+待收货)
+    // orderType:2待发货 3待收货
+    @RequestMapping("order-deliver-count")
+    public RestResponse<Object> orderCount(String enterpriseId, String storeId) {
+        OrderCountVO vo = new OrderCountVO();
+        CountOrderStatusQDTO qdto = new CountOrderStatusQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        qdto.setStoreId(storeId);
+        ServiceResponse<List<OrderStatusDTO>> resp = this.webOrderManageApiService.countOrderStatus(qdto);
+        List<OrderStatusDTO> list = resp.getResult();
+        if (CollectionUtils.isNotEmpty(list)) {
+            long noDeliver = 0, deliver = 0;
+            for (OrderStatusDTO item : list) {
+                if (item.getOrderStep() == 3) {
+                    deliver = item.getTotal();
+                }
+                if (item.getOrderStep() == 2 || item.getOrderStep() == 7) {
+                    noDeliver = noDeliver + item.getTotal();
+                }
+            }
+            ;
+            vo.setDeliverCount((int) deliver);
+            vo.setNoDeliverCount((int) noDeliver);
+            vo.setTotal((int) (deliver + noDeliver));
+        }
+        return RestResponse.successResult(vo);
+    }
+
     // 核销订单查询
     // status 0全部 1待核销 2已核销
     @RequestMapping("list-verification-order")
@@ -144,20 +177,6 @@ public class GicOrderController {
         return this.orderListSelect(qdto, pageInfo, false);
     }
 
-    // 数量查询(待发货+待收货)
-    // orderType:2待发货 3待收货
-    @RequestMapping("order-deliver-count")
-    public RestResponse<Object> orderCount(String enterpriseId, String storeId, String clerkId,
-            @RequestParam(defaultValue = "1") int status) {
-        OrderCountVO vo = new OrderCountVO();
-        CountOrderStatusQDTO countOrderStatusQDTO = new CountOrderStatusQDTO();
-        countOrderStatusQDTO.setEnterpriseId(enterpriseId);
-        countOrderStatusQDTO.setBusinessType(1);
-        countOrderStatusQDTO.setStoreId(storeId);
-        this.webOrderManageApiService.countOrderStatus(countOrderStatusQDTO);
-        return RestResponse.successResult(vo);
-    }
-
     // 订单详情 (客户信息+收货地址+商品详情+订单信息 + 订单状态)
     @RequestMapping("order-detail")
     public RestResponse<Object> orderDetail(String enterpriseId, String clerkId, String searchParams,