商品+票务 下单入场人接口提交

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/AddressVo.java

+package com.liquidnet.service.goblin.dto.manage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@ApiModel(value = "AddressVo")
+@Data
+public class AddressVo {
+
+    @ApiModelProperty(value = "收货人姓名")
+    private String name;
+    @ApiModelProperty(value = "代理id")
+    private String Province;
+    @ApiModelProperty(value = "省份行政编码")
+    private String county;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "收货地址")
+    private String address;
+    @ApiModelProperty(value = "区县")
+    private String phone;
+    @ApiModelProperty(value = "区县行政编码")
+    private String countyId;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinOrderParam.java

@@ -33,8 +33,8 @@ public class GoblinOrderParam {
     private String uid;
     @ApiModelProperty(value = "扫码枪code")
     private String authCode;
-
-
+    @ApiModelProperty(value = "入场人地址vo")
+    private AddressVo addressesVo;
     @ApiModelProperty(value = "商品相关参数集合")
     private List<GoblinOrderStoreParam> goblinOrderStoreParamList;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/AddressVo.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "AddressVo")
+@Data
+public class AddressVo {
+
+    @ApiModelProperty(value = "收货人姓名")
+    private String name;
+    @ApiModelProperty(value = "代理id")
+    private String Province;
+    @ApiModelProperty(value = "省份行政编码")
+    private String county;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "收货地址")
+    private String address;
+    @ApiModelProperty(value = "区县")
+    private String phone;
+    @ApiModelProperty(value = "区县行政编码")
+    private String countyId;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

@@ -62,4 +62,6 @@ public class PayOrderParam {
     private String adCode;
     @ApiModelProperty(value = "快递方式productCode")
     private String productCode;
+    @ApiModelProperty(value = "入场人地址vo")
+    private AddressVo addressesVo;
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -3,15 +3,14 @@ package com.liquidnet.service.order.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.feign.candy.api.FeignGoblinBaseClient;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
+import com.liquidnet.service.goblin.dto.manage.AddressVo;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderSkuParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderStoreParam;
@@ -101,7 +100,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 userVo = orderUtils.adamAddressEnterMember(uid, null, addressId);
                 log.info("adam接口调用：" + (System.currentTimeMillis() - time1) + "秒");
             }
-            AdamAddressesVo addressesVo = AdamAddressesVo.getNew();
+            AddressVo addressesVo = param.getAddressesVo();
             boolean isMember;
             if (userVo == null) {
                 if (noZhengzaiOrder(uid)) {
@@ -110,14 +109,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     isMember = false;
                     addressesVo = null;
                 }
-//                addressesVo.setName("");
-//                addressesVo.setProvince("");
-//                addressesVo.setCounty("");
-//                addressesVo.setCity("");
-//                addressesVo.setAddress("");
-//                addressesVo.setPhone("");
             } else {
-                addressesVo = userVo.getAddressesVo();
                 switch (userVo.getMembership()) {
                     case 10:
                     case 11:
@@ -234,7 +226,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         }
     }
 
-    private GoblinOrderPreParam order(GoblinOrderParam param, GoblinOrderStoreParam storeParam, String uid, boolean isMember, AdamAddressesVo addressesVo, String orderMasterCode, String orderId, String orderCode, List<String> platformCodeList, List<String> storeCodeList) throws Exception {
+    private GoblinOrderPreParam order(GoblinOrderParam param, GoblinOrderStoreParam storeParam, String uid, boolean isMember, AddressVo addressesVo, String orderMasterCode, String orderId, String orderCode, List<String> platformCodeList, List<String> storeCodeList) throws Exception {
         long timeAll = System.currentTimeMillis();
         String platVoucherCode = storeParam.getPlatVoucherCode();
         String storeVoucherCode = storeParam.getStoreVoucherCode();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -11,10 +11,7 @@ import com.liquidnet.service.base.*;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
-import com.liquidnet.service.kylin.dto.param.PayAgainParam;
-import com.liquidnet.service.kylin.dto.param.PayOrderParam;
-import com.liquidnet.service.kylin.dto.param.SyncOrderDtoParam;
-import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinIpAreaVo;
@@ -186,7 +183,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             AdamRscPolymer01Vo userVo = orderUtils.adamAddressEnterMember(uid, enterIds, addressId);
             List<AdamEntersVo> entersVos;
-            AdamAddressesVo addressesVo;
+            AddressVo addressesVo = payOrderParam.getAddressesVo();
             boolean isMember;
             boolean isOldMember;
             if (userVo == null) {
@@ -197,7 +194,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //                entersVos = new ArrayList();
             } else {
                 entersVos = userVo.getEntersVos();
-                addressesVo = userVo.getAddressesVo();
                 if (payOrderParam.getIsExpress() == 1) {
                     payOrderParam.setAdCode(addressesVo.getCountyId());
                     log.error("[快递地址异常]");
@@ -392,7 +388,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
     }
 
-    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap, AdamAddressesVo addressesVo, String orderTicketId, String orderCode) throws Exception {
+    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap, AddressVo addressesVo, String orderTicketId, String orderCode) throws Exception {
         LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
         String headerCliSource = CurrentUtil.getHeaderCliSource(), headerCliVersion = CurrentUtil.getHeaderCliVersion();
         String source = headerCliSource == null ? "" : headerCliSource;