微商城兼容,点餐到店不查无单收银

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -738,6 +738,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setOrderClients(queryOrdersRequest.getOrderClients());
         orderConditionsReq.setBizTypes(queryOrdersRequest.getBizTypes());
         orderConditionsReq.setMarketingType(queryOrdersRequest.getMarketingType());
+        orderConditionsReq.setMarketingTypes(queryOrdersRequest.getMarketingTypes());
 
         return orderConditionsReq;
     }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersRequest.java

@@ -87,5 +87,7 @@ public class QueryOrdersRequest extends BaseConfig {
      */
     private Integer queryOrderType;
 
+    private List<Integer> marketingTypes;
+
 
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -647,13 +647,14 @@ public class OrderAdapter {
         } else if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {
             orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(),OrderClientType.ALIPAY.getIndex());
             bizTypes.add(BizTypeEnum.MALL.getBizType());
+            //新版查微商城订单marketingType　不传
+            if(queryOrderDto.getMarketingType() == null || Objects.equals(1,queryOrderDto.getMarketingType())){
+                queryOrdersDto.setMarketingType(MarketTypeEnum.ORDER.getIndex());
+            }
+            //微商城拼团
             if(Objects.equals(MarketTypeEnum.GROUPB.getIndex(),queryOrderDto.getMarketingType())){
                 queryOrdersDto.setMarketingType(MarketTypeEnum.GROUPB.getIndex());
             }
-            //以前参数定义，商城marketingType传1
-            if(Objects.equals(1,queryOrderDto.getMarketingType())){
-                queryOrdersDto.setMarketingType(MarketTypeEnum.ORDER.getIndex());
-            }
         } else if (OrderChannelType.APP.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.APP.getIndex());
             bizTypes = Arrays.asList(BizTypeEnum.ORDINARY.getBizType(), BizTypeEnum.SALE_COUPON.getBizType());
@@ -664,6 +665,7 @@ public class OrderAdapter {
         } else {
             orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(),OrderClientType.ALIPAY.getIndex(),OrderClientType.APP.getIndex());
             bizTypes = Arrays.asList(BizTypeEnum.ORDINARY.getBizType(), BizTypeEnum.SALE_COUPON.getBizType(), BizTypeEnum.ADVANCE_ORDER.getBizType());
+            queryOrdersDto.setMarketingTypes(Arrays.asList(MarketTypeEnum.ORDER.getIndex(),MarketTypeEnum.COLLAGE.getIndex(),MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex()));
         }
         List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
         queryOrdersDto.setPayStatus((Integer[]) payStatus.toArray());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderUserConditionsReq.java

@@ -75,4 +75,6 @@ public class OrderUserConditionsReq {
      */
     private Integer invoiceState;
 
+    private List<Integer> marketingTypes;
+
 }