回退订单聚合原对象中marketingType类型，改为类型转换传递

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

@@ -26,6 +26,7 @@ import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
+import com.freemud.sdk.api.assortment.order.util.ClassUtils;
 import com.freemud.sdk.api.assortment.order.util.WeightUtils;
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.impl.DefaultMapperFactory;
@@ -211,7 +212,7 @@ public class OrderSdkAdapter {
         request.setBarCounter(requestVO.getBarCounter());
 
         //订单market类型
-        request.setMarketingType(requestVO.getMarketingType());
+        request.setMarketingType(ClassUtils.toInteger(requestVO.getMarketingType()));
 
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
@@ -1061,7 +1062,7 @@ public class OrderSdkAdapter {
         data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
 
         //订单类型回传
-        data.setMarketingType(orderInfoReqs.getMarketingType());
+        data.setMarketingType(ClassUtils.toByte(orderInfoReqs.getMarketingType()));
 
         return data;
     }

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

@@ -171,7 +171,7 @@ public class BaseCreateOrderRequest extends BaseConfig {
     /**
      * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
      */
-    private Integer marketingType;
+    private Byte marketingType;
 
     @Data
     public static class DeliveryTypeInfo {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -242,7 +242,7 @@ public class QueryOrdersResponse {
             /**
              * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
              */
-            private Integer marketingType;
+            private Byte marketingType;
 
 
             /**

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/util/ClassUtils.java

+package com.freemud.sdk.api.assortment.order.util;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0.0
+ * @Description:
+ * @author: hui.miao
+ * @date: 2020-10-14 17:01
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+public class ClassUtils {
+    public static Integer toInteger(Byte b) {
+        return b & 0xff;
+    }
+
+    public static Byte toByte(Integer x) {
+        return (byte) (x & 0xff);
+    }
+}

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -85,7 +85,7 @@ public class CreateOrderVo {
     /**
      * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
      */
-    private Integer marketingType;
+    private Byte marketingType;
 
     /**
      * 到店类型  orderType 传1的时候    如果reachStoreTyp为空转成订单类型4  如果不为空存储4(打包带走)和5（店内就餐）

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -363,7 +363,7 @@ public class QueryOrderResponseVo {
     /**
      * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
      */
-    private Integer marketingType;
+    private Byte marketingType;
 
     @Data
     public static class OrderStatusFlow {

order-application-service/src/main/java/cn/freemud/enums/OrderMarketType.java

@@ -14,18 +14,18 @@ import java.util.Arrays;
 @Getter
 @AllArgsConstructor
 public enum OrderMarketType {
-    ORDER(1, "普通订单"),
-    GROUPB(2, "拼团订单"),
-    SEC_KILL(3, "秒杀订单"),
-    COLLAGE(4, "拼单订单")
+    ORDER((byte)1, "普通订单"),
+    GROUPB((byte)2, "拼团订单"),
+    SEC_KILL((byte)3, "秒杀订单"),
+    COLLAGE((byte)4, "拼单订单")
     ;
 
-    private Integer index;
+    private byte index;
     private String name;
 
     public static final String API_DESC = "销售类型或营销活动类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单";
 
-    public static OrderMarketType getByIndex(int index) {
+    public static OrderMarketType getByIndex(byte index) {
         return Arrays.stream(OrderMarketType.values())
                 .filter(e -> e.getIndex() == index)
                 .findFirst()

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

@@ -117,7 +117,7 @@ public class OrderResp {
     private String pickUpGoodsNo;
 
     /*** OrderMarketType.API_DESC***/
-    private Integer marketingType;
+    private Byte marketingType;
 
     /*** "销售类型对应的场景值"***/
     private String marketingCode;

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

@@ -91,7 +91,7 @@ public class OrderItemCreateReq {
     private Boolean canRefund = true;
 
     //销售类型或营销活动类型 1普通订单 2秒杀订单 3推广活动
-    private Integer marketingType;
+    private Byte marketingType;
 
     //活动ID
     private String marketingCode;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/carpark/OrderResp.java

@@ -117,7 +117,7 @@ public class OrderResp {
     private String pickUpGoodsNo;
 
     /*** OrderMarketType.API_DESC***/
-    private Integer marketingType;
+    private Byte marketingType;
 
     /*** "销售类型对应的场景值"***/
     private String marketingCode;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java

@@ -92,7 +92,7 @@ public class OrderItemResp {
     private Boolean canRefund = true;
 
     //销售类型或营销活动类型 1普通订单 2秒杀订单 3推广活动 4拼单订单
-    private Integer marketingType;
+    private Byte marketingType;
 
     //活动ID
     private String marketingCode;