Merge branch 'feature-game2' into 'master'

Feature game2

See merge request !1290

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

@@ -106,6 +106,7 @@ public class GicOrderController {
     // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
     public RestResponse<Object> orderList(String enterpriseId, String storeId, String clerkId, String search,
+                                          @RequestParam(required = false) Integer businessType,
             @RequestParam(defaultValue = "0") int status, BasePageInfo pageInfo) {
         String strStatus = "" + status;
         if (status == 0) {
@@ -118,12 +119,11 @@ public class GicOrderController {
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setOrderStep(strStatus);
-        // 微商城
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         // 配送方式 -1：所有 2：门店自提 1：快递发货
         qdto.setDeliveryChannel(1);
         // 库存 - 门店库存2
         qdto.setDeliveryMode(2);
+        qdto.setBusinessType(businessType);
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderType(SearchOrderTypeEnum.GOODS_NAME_OR_ORDER_NUMBER.getType());
             qdto.setSearchOrderParam(search);
@@ -136,19 +136,19 @@ public class GicOrderController {
     // 数量查询(待发货+待收货)
     // orderType:2待发货 3待收货
     @RequestMapping("order-deliver-count")
-    public RestResponse<Object> orderCount(String enterpriseId, String storeId) {
+    public RestResponse<Object> orderCount(String enterpriseId, String storeId,@RequestParam(required = false) Integer businessType) {
         OrderCountVO vo = new OrderCountVO();
         if (StringUtils.isEmpty(storeId)) {
             return RestResponse.successResult(vo);
         }
         CountOrderStatusQDTO qdto = new CountOrderStatusQDTO();
         qdto.setEnterpriseId(enterpriseId);
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         // 配送方式 -1：所有 2：门店自提 1：快递发货
         qdto.setDeliveryChannel(1);
         // 库存 - 门店库存2
         qdto.setDeliveryMode(2);
         qdto.setBelongStoreId(storeId);
+        qdto.setBusinessType(businessType);
         ServiceResponse<List<OrderStatusDTO>> resp = this.webOrderManageApiService.countOrderStatus(qdto);
         List<OrderStatusDTO> list = resp.getResult();
         if (CollectionUtils.isNotEmpty(list)) {
@@ -172,6 +172,7 @@ public class GicOrderController {
     // status 0全部 1待核销 2已核销
     @RequestMapping("list-verification-order")
     public RestResponse<Object> mallOrderList(String enterpriseId, String storeId, String clerkId,
+                                              @RequestParam(required = false) Integer businessType,
             @RequestParam(defaultValue = "0") int status, String search, BasePageInfo pageInfo) {
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
@@ -187,8 +188,8 @@ public class GicOrderController {
             qdto.setOrderStep("4");
             qdto.setDeliveryOptType(1);
         }
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
+        qdto.setBusinessType(businessType);
         return this.orderListSelect(qdto, pageInfo, false);
     }
 
@@ -301,7 +302,7 @@ public class GicOrderController {
                 stockQDTO.setGoodsId(vo.getMallProId());
                 stockQDTO.setSkuId(vo.getMallProSkuId());
                 stockQDTO.setStoreId(storeId);
-                stockQDTO.setChannelType(ProductStockChannelType.MALL.getCode());
+                stockQDTO.setChannelType(resp.getResult().getOrderInfo().getBusinessType());
                 ServiceResponse<Integer> stockResp = this.productStockApiService.queryGoodsStock(stockQDTO);
                 logger.info("门店库存查询orderId={},qdto={},result={}", orderId, JSON.toJSONString(stockQDTO),
                         JSON.toJSONString(stockResp));
@@ -358,6 +359,7 @@ public class GicOrderController {
     @RequestMapping("list-member-order")
     public RestResponse<Object> orderList(String enterpriseId, String memberId, String search,
             @RequestParam(defaultValue = "-1") int status, @RequestParam(defaultValue = "0") int deliveryChannel,
+            @RequestParam(required = false) Integer businessType,
             @RequestParam(defaultValue = "-1") int orderType, BasePageInfo pageInfo, String startTime, String endTime) {
         if (StringUtils.isEmpty(memberId)) {
             return RestResponse.failure("9999", "memberId为空");
@@ -387,7 +389,7 @@ public class GicOrderController {
         qdto.setMemberId(memberId);
         qdto.setStartDate(startDate);
         qdto.setEndDate(endDate);
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        qdto.setBusinessType(businessType);
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderType(SearchOrderTypeEnum.ORDER_NUMBER.getType());
             qdto.setSearchOrderParam(search);
@@ -539,7 +541,6 @@ public class GicOrderController {
             qdto.setDeliveryOptType(1);
         }
         qdto.setOrderStep("" + step);
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setPageNum(1);
         qdto.setPageSize(1);
         ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);

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

@@ -14,6 +14,12 @@ public class OrderDetailVO implements Serializable {
     private static final long serialVersionUID = 5215230055823016992L;
 
     /**
+     *订单来源类型
+     * @see com.gic.business.order.enums.OrderEnum.BusinessTypeEnum
+     */
+    private Integer businessType;
+
+    /**
      * 订单ID
      */
     private String orderId;
@@ -129,7 +135,15 @@ public class OrderDetailVO implements Serializable {
     
     // 物流包裹列表
     private List<String> orderLogisticsIdList ;
-    
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
     public List<String> getOrderLogisticsIdList() {
         return orderLogisticsIdList;
     }

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

@@ -14,6 +14,12 @@ public class OrderListVO implements Serializable {
     private static final long serialVersionUID = 5215230055823016992L;
 
     /**
+     *订单来源类型
+     * @see com.gic.business.order.enums.OrderEnum.BusinessTypeEnum
+     */
+    private Integer businessType;
+
+    /**
      * 订单ID
      */
     private String orderId;
@@ -98,8 +104,15 @@ public class OrderListVO implements Serializable {
      * 评价
      */
     private EvaluateVO evaluateVO;
-    
-    
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
     public String getVerificationClerkName() {
         return verificationClerkName;
     }

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

@@ -10,6 +10,12 @@ public class OrderExchangeDetailVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     *订单来源类型
+     * @see com.gic.business.order.enums.OrderEnum.BusinessTypeEnum
+     */
+    private Integer businessType;
+
     private String orderExchangeId;
     /**
      * 订单换货流水号
@@ -238,7 +244,15 @@ public class OrderExchangeDetailVO implements Serializable {
     
     // 2：门店自提 1：快递发货   
     private Integer deliveryChannel ;
-    
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
     public Integer getDeliveryChannel() {
         return deliveryChannel;
     }

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

@@ -10,6 +10,12 @@ import java.util.Date;
  */
 public class OrderRefundDetailVO implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    /**
+     *订单来源类型
+     * @see com.gic.business.order.enums.OrderEnum.BusinessTypeEnum
+     */
+    private Integer businessType;
     private String orderRefundId;
     private String orderId;// 订单ID
     private String orderItemId;// 订单项ID
@@ -106,7 +112,15 @@ public class OrderRefundDetailVO implements Serializable {
     
     // 2：门店自提 1：快递发货   
     private Integer deliveryChannel ;
-    
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
     public Integer getDeliveryChannel() {
         return deliveryChannel;
     }