Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into…

Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into feature/2.0.1-collageOrder-刘鹏飞

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

@@ -212,7 +212,9 @@ public class OrderSdkAdapter {
         request.setBarCounter(requestVO.getBarCounter());
 
         //订单market类型
-        request.setMarketingType(ClassUtils.toInteger(requestVO.getMarketingType()));
+        if (requestVO.getMarketingType() != null) {
+            request.setMarketingType(ClassUtils.toInteger(requestVO.getMarketingType()));
+        }
 
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
@@ -1062,7 +1064,9 @@ public class OrderSdkAdapter {
         data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
 
         //订单类型回传
-        data.setMarketingType(ClassUtils.toByte(orderInfoReqs.getMarketingType()));
+        if (orderInfoReqs.getMarketingType() != null) {
+            data.setMarketingType(ClassUtils.toByte(orderInfoReqs.getMarketingType()));
+        }
 
         return data;
     }