Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa

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

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

@@ -242,6 +242,9 @@ public class OrderSdkAdapter {
         deliveryContactInfoCreateReq.setProvince(requestVO.getProvince());
         deliveryContactInfoCreateReq.setCity(requestVO.getCity());
         deliveryContactInfoCreateReq.setRegion(requestVO.getRegion());
+        JSONObject deliveryExtInfo = new JSONObject();
+        deliveryExtInfo.put("receiveId", requestVO.getReceiveId());
+        deliveryContactInfoCreateReq.setExtInfo(deliveryExtInfo.toJSONString());
         deliveryContactInfoList.add(deliveryContactInfoCreateReq);
         //第三方配送信息
         getThirdDeliveryInfo(deliveryContactInfoList, requestVO.getAddInfo());

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

@@ -164,6 +164,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
 
     private Byte payChannelType;
 
+    /**
+     * 收货地址Id
+     */
+    private String receiveId;
 
     @Data
     public static class DeliveryTypeInfo {
@@ -171,7 +175,6 @@ public class BaseCreateOrderRequest extends BaseConfig {
          * 订单类型，自配送self，第三方配送third
          */
         private QueryDeliveryType deliveryType;
-
     }
 
     @Data

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

@@ -556,6 +556,7 @@ public class OrderAdapter {
         createOrderDto.setSource(OrderSourceType.SAAS.getCode());
         createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());
         createOrderDto.setRemark(remark);
+        createOrderDto.setReceiveId(createOrderVo.getReceiveId());
         createOrderDto.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getExpectTime()) ? DateUtil.convert2Date(createOrderVo.getExpectTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
         BaseCreateOrderRequest.DeliveryTypeInfo deliveryTypeInfo = new BaseCreateOrderRequest.DeliveryTypeInfo();
         deliveryTypeInfo.setDeliveryType(QueryDeliveryType.getByCode(deliveryType));

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

@@ -46,6 +46,9 @@ public class DeliveryContactInfoCreateReq {
     //手机号码
     private String mobile;
 
+    //扩展字段
+    private String extInfo;
+
     //电话号码
     private String telephone;