From b96f00d1f2765833a295a8f7d536a8cd4f85a2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Thu, 8 May 2025 21:50:57 +0800
Subject: [PATCH] feat:xxl

---
 .../impl/BuildInformationServiceImpl.java        | 16 ++++++++--------
 .../service/impl/SignFranchiseServiceImpl.java   |  1 +
 .../webb/PCSignFranchiseController.java          |  2 +-
 3 files changed, 10 insertions(+), 9 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 9391f3232..968394093 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
@@ -114,14 +114,14 @@ public class BuildInformationServiceImpl implements BuildInformationService {
                 response.setXgjVicePresident(user.getName());
             }
         }
-            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 (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.getAddresseeAddress())){
             response.setAddresseeAddress(shopInfo.getDetailAddress());}
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
index 2acdfa286..aad113c4d 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
@@ -399,6 +399,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
         Long auditId = shopAuditInfoDO.getId();
         shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum, auditId);
+        signFranchiseMapper.updateAuditByShopId(auditId, shopId);
         //审批记录表记录
         List<OperationLogDO> operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, OperationTypeEnum.OPERATION_TYPE_1.getCode());
         operationLogService.batchUpdateProcessed(operationLogs, auditId, user.getUserId(), request.getCause());
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
index 79d4b18a2..f9fbdf693 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
@@ -29,7 +29,7 @@ public class PCSignFranchiseController {
         return signFranchiseService.submitSignFranchise(request,user);
     }
 
-    @ApiOperation("提交(更新)加盟合同签约")
+    @ApiOperation("重新提交加盟合同签约")
     @PostMapping("/reSubmitSignFranchise")
     public ResponseResult<Boolean> reSubmitSignFranchise(@RequestBody @Validated AddSignFranchiseRequest request) {
         LoginUserInfo user = CurrentUserHolder.getUser();