From 368a61b8ffc9ff3a1eccf32344ad25fe709f7093 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Wed, 16 Apr 2025 15:33:39 +0800
Subject: [PATCH] fix

---
 .../impl/BuildInformationServiceImpl.java     | 26 ++++++++++++-------
 .../cool/store/config/SignValidateFilter.java |  3 ++-
 2 files changed, 18 insertions(+), 11 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 3dc6eb4fd..603051b24 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
@@ -17,6 +17,7 @@ import com.cool.store.service.BuildInformationService;
 import com.cool.store.mapper.BuildInformationMapper;
 import com.cool.store.service.PreparationService;
 import com.cool.store.service.UserAuthMappingService;
+import com.cool.store.utils.poi.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,13 +103,18 @@ public class BuildInformationServiceImpl implements BuildInformationService {
             if (Objects.nonNull(warehouseInfoDO)) {
                 response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
             }
-        }else {
-            if (Objects.nonNull(pointInfo)){
-            response.setAddresseeProvince(pointInfo.getProvince());
-            response.setAddresseeCity(pointInfo.getCity());
-            response.setAddresseeDistrict(pointInfo.getDistrict());}
-            response.setAddresseeAddress(shopInfo.getDetailAddress());
         }
+            if (Objects.nonNull(pointInfo)) {
+                if (StringUtils.isNotBlank(response.getAddresseeProvince())){
+                response.setAddresseeProvince(pointInfo.getProvince());}
+                if (StringUtils.isNotBlank(response.getAddresseeCity())){
+                response.setAddresseeCity(pointInfo.getCity());}
+                if (StringUtils.isNotBlank(response.getAddresseeDistrict())){
+                response.setAddresseeDistrict(pointInfo.getDistrict());}
+            }
+        if (StringUtils.isNotBlank(response.getAddresseeAddress())){
+            response.setAddresseeAddress(shopInfo.getDetailAddress());}
+
         return response;
 
     }
@@ -152,20 +158,20 @@ public class BuildInformationServiceImpl implements BuildInformationService {
         BuildInformationDO buildInformationDO = request.toDO();
         OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request);
         OrderSysInfoDO orderSysInfoDO1 = orderSysInfoDAO.selectByShopId(request.getShopId());
-        if (Objects.nonNull(orderSysInfoDO1)){
+        if (Objects.nonNull(orderSysInfoDO1)) {
             orderSysInfoDAO.updateByShopId(orderSysInfoDO);
-        }else{
+        } else {
             orderSysInfoDAO.insertSelective(orderSysInfoDO);
         }
         ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
         LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
         QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
-        if (request.getJuridicalIsSamePartner()){
+        if (request.getJuridicalIsSamePartner()) {
             request.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo());
             request.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
             request.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
         }
-        if (request.getSettlerIsSamePartner()){
+        if (request.getSettlerIsSamePartner()) {
             request.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo());
             request.setSettlerName(lineInfoDO.getUsername());
             request.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
index d96af4e4a..44b826e8d 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
@@ -59,7 +59,8 @@ public class SignValidateFilter implements Filter {
                     "/zxjp/mini/program/v1/partnerManage/openArea/areaApplyQuery",
                     "/zxjp/**/api/audit/result",
                     "/zxjp/**/api/license",
-                    "/zxjp/mini/line/getRegionPayPic"
+                    "/zxjp/mini/line/getRegionPayPic",
+                    "/zxjp/mini/**"
 
             );