perfectAddress

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetIntegralActivityDrawService.java

@@ -25,7 +25,7 @@ public interface ISweetIntegralActivityDrawService extends IService<SweetIntegra
 
     ResponseDto<List<IntegralActivityDrawVo>> winPrizeUser(String integralActivityId);
 
-    ResponseDto perfectAddress(String drawId, String receivingAddressesId, String receivingName, String receivingPhone, String receivingAddress);
+    ResponseDto perfectAddress(String drawId, String receivingAddressesId);
 
     ResponseDto<IntegralActivityDrawVo> detail(String drawId);
 }

liquidnet-bus-service/liquidnet-service-sweet/pom.xml

@@ -90,6 +90,12 @@
             <artifactId>liquidnet-api-feign-stone</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-adam</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetIntegralActivityDrawController.java

@@ -82,19 +82,13 @@ public class SweetIntegralActivityDrawController {
     @ApiOperation("中奖完善收货地址")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "drawId", value = "中奖ID", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "receivingAddressesId", value = "adam收货地址addresses_id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "receivingName", value = "adam收货人姓名", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "receivingPhone", value = "adam收货人手机号", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "receivingAddress", value = "adam收货人完整地址 空格隔离省市区详细地址", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String", name = "receivingAddressesId", value = "adam收货地址addresses_id", required = true)
     })
     public ResponseDto perfectAddress(
             @RequestParam("drawId") String drawId,
-            @RequestParam("receivingAddressesId") String receivingAddressesId,
-            @RequestParam("receivingName") String receivingName,
-            @RequestParam("receivingPhone") String receivingPhone,
-            @RequestParam("receivingAddress") String receivingAddress
+            @RequestParam("receivingAddressesId") String receivingAddressesId
     ) {
-        return activityDrawService.perfectAddress(drawId, receivingAddressesId, receivingName, receivingPhone, receivingAddress);
+        return activityDrawService.perfectAddress(drawId, receivingAddressesId);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -5,10 +5,12 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 import com.liquidnet.service.stone.dto.StoneScoreListDto;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
@@ -59,6 +61,8 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
 
     @Autowired
     private FeignStoneIntegralClient feignStoneIntegralClient;
+    @Autowired
+    private FeignAdamBaseClient feignAdamBaseClient;
 
     @Override
     public ResponseDto<SweetIntegralActivityPrizeVo> create(String integralActivityId) {
@@ -210,10 +214,20 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
     }
 
     @Override
-    public ResponseDto perfectAddress(String drawId, String receivingAddressesId, String receivingName, String receivingPhone, String receivingAddress) {
+    public ResponseDto perfectAddress(String drawId, String receivingAddressesId) {
         // 更新缓存
         IntegralActivityDrawVo drawVo = redisDataUtils.getIntegralActivityDrawInfo(drawId);
         drawVo.setReceivingAddressesId(receivingAddressesId);
+        // 获取地址数据
+        ResponseDto<AdamAddressesVo> queryAddresses = feignAdamBaseClient.queryAddresses(receivingAddressesId, CurrentUtil.getCurrentUid());
+        if (!queryAddresses.getCode().equals("0")) {
+            return ResponseDto.failure("获取地址信息失败");
+        }
+        AdamAddressesVo addressesData = queryAddresses.getData();
+        String receivingPhone = addressesData.getPhone();
+        String receivingName = addressesData.getName();
+        String receivingAddress = addressesData.getAddress();
+
         drawVo.setReceivingName(receivingName);
         drawVo.setReceivingPhone(receivingPhone);
         drawVo.setReceivingAddress(receivingAddress);