营销活动订单

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

@@ -118,8 +118,6 @@ 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
@@ -143,7 +141,6 @@ public class GicOrderController {
         }
         CountOrderStatusQDTO qdto = new CountOrderStatusQDTO();
         qdto.setEnterpriseId(enterpriseId);
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         // 配送方式 -1：所有 2：门店自提 1：快递发货
         qdto.setDeliveryChannel(1);
         // 库存 - 门店库存2
@@ -187,7 +184,6 @@ public class GicOrderController {
             qdto.setOrderStep("4");
             qdto.setDeliveryOptType(1);
         }
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
         return this.orderListSelect(qdto, pageInfo, false);
     }
@@ -301,7 +297,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));
@@ -387,7 +383,6 @@ public class GicOrderController {
         qdto.setMemberId(memberId);
         qdto.setStartDate(startDate);
         qdto.setEndDate(endDate);
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderType(SearchOrderTypeEnum.ORDER_NUMBER.getType());
             qdto.setSearchOrderParam(search);
@@ -539,7 +534,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);