订单

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

@@ -292,6 +292,34 @@ public class GicOrderController {
         return RestResponse.successResult(response.getResult());
     }
 
+    // 我的客户-会员订单列表
+    // deliveryChannel 0全部 1快递 2自提
+    // 1待付款 2待发货 7部分发货4 已完成0 已取消 5售后中
+    @RequestMapping("list-member-order")
+    public RestResponse<Object> orderList(String enterpriseId, String memberId, String search,
+            @RequestParam(defaultValue = "-1") int status, @RequestParam(defaultValue = "0") int deliveryChannel,
+            BasePageInfo pageInfo) {
+        if (StringUtils.isEmpty(memberId)) {
+            return RestResponse.failure("9999", "memberId为空");
+        }
+        String strStatus = "" + status;
+        if (status == -1) {
+            strStatus = null;
+        }
+        // 查询门店
+        ListOrderManageQDTO qdto = new ListOrderManageQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setOrderStep(strStatus);
+        qdto.setMemberId(memberId);
+        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        if (StringUtils.isNotEmpty(search)) {
+            qdto.setSearchOrderParam(search);
+        }
+        // 配送方式 -1：所有 0：门店自提 1：快递发货
+        qdto.setDeliveryType(1);
+        return this.orderListSelect(qdto, pageInfo);
+    }
+
     // 修改物流
     @RequestMapping("modify-order-logistics")
     public RestResponse<Object> modifyOrderDeliver(String enterpriseId, String orderId, String storeId,

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

@@ -58,6 +58,17 @@ public class OrderListItemVO implements Serializable {
     // 库存
     private int stortStock ;
     
+    // 物流ID
+    private String logisticsId ;
+    
+    public String getLogisticsId() {
+        return logisticsId;
+    }
+
+    public void setLogisticsId(String logisticsId) {
+        this.logisticsId = logisticsId;
+    }
+
     public int getStortStock() {
         return stortStock;
     }