From 9d16956755e506536ef9f2ccf40d56aa4abd37a4 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 13 May 2025 10:40:19 +0800
Subject: [PATCH] fix

---
 .../impl/BuildInformationServiceImpl.java     | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
index 7f0efaf68..fae418f59 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -77,13 +77,10 @@ public class BuildInformationServiceImpl implements BuildInformationService {
         response.setShopId(shopId);
         response.setShopName(shopInfo.getShopName());
         response.setShopCode(shopInfo.getShopCode());
-        PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId());
-        if (Objects.nonNull(pointInfo)) {
-            response.setProvince(pointInfo.getProvince());
-            response.setDistrict(pointInfo.getDistrict());
-            response.setCity(pointInfo.getCity());
-            response.setTownship(pointInfo.getTownship());
-        }
+        response.setProvince(shopInfo.getProvince());
+        response.setDistrict(shopInfo.getDistrict());
+        response.setCity(shopInfo.getCity());
+        response.setTownship(shopInfo.getDetailAddress());
         BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
         if (Objects.nonNull(informationDO)) {
             extracted(response, informationDO);
@@ -112,31 +109,33 @@ public class BuildInformationServiceImpl implements BuildInformationService {
             }
             response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
         }
-        if (StringUtils.isBlank(response.getXgjVicePresident())){
+        if (StringUtils.isBlank(response.getXgjVicePresident())) {
             EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId());
-            if (Objects.nonNull(user)){
+            if (Objects.nonNull(user)) {
                 response.setXgjVicePresident(user.getName());
             }
         }
         //根据映射关系默认带出新管家组织
-        if (StringUtils.isBlank(response.getXgjRegionName())){
+        if (StringUtils.isBlank(response.getXgjRegionName())) {
             Integer joinMode = shopInfo.getJoinMode() == 3 ? CommonConstants.ONE : CommonConstants.ZERO;
             BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), joinMode);
-            if (Objects.nonNull(bigRegionDO)){
+            if (Objects.nonNull(bigRegionDO)) {
                 response.setXgjRegionId(bigRegionDO.getOrgId());
                 response.setXgjRegionName(bigRegionDO.getOrgName());
             }
         }
-        if (Objects.nonNull(pointInfo)) {
-            if (StringUtils.isBlank(response.getAddresseeProvince())){
-            response.setAddresseeProvince(pointInfo.getProvince());}
-            if (StringUtils.isBlank(response.getAddresseeCity())){
-            response.setAddresseeCity(pointInfo.getCity());}
-            if (StringUtils.isBlank(response.getAddresseeDistrict())){
-            response.setAddresseeDistrict(pointInfo.getDistrict());}
+        if (StringUtils.isBlank(response.getAddresseeProvince())) {
+            response.setAddresseeProvince(shopInfo.getProvince());
+        }
+        if (StringUtils.isBlank(response.getAddresseeCity())) {
+            response.setAddresseeCity(shopInfo.getCity());
+        }
+        if (StringUtils.isBlank(response.getAddresseeDistrict())) {
+            response.setAddresseeDistrict(shopInfo.getDistrict());
+        }
+        if (StringUtils.isBlank(response.getAddresseeAddress())) {
+            response.setAddresseeAddress(shopInfo.getDetailAddress());
         }
-        if (StringUtils.isBlank(response.getAddresseeAddress())){
-            response.setAddresseeAddress(shopInfo.getDetailAddress());}
 
         return response;