From 5ff5673914bbca31e43dffb46a252b81ceb98b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?=
 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Date: Wed, 8 Apr 2026 10:44:03 +0000
Subject: [PATCH] Merge #89 into master from cc_20260402_minor_req
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix:诸多小需求

* cc_20260402_minor_req: (6 commits squashed)

  - fix:PC端新增租赁合同相关接口

  - fix:新发标签不过滤私域码

  - fix:开店管理新增签约阶段完成时间筛选条件

  - fix:删除多余接口

  - fix:网商激活短链显示

  - fix:开店管理导出去除限制

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/89
---
 .../cool/store/enums/FranchiseBrandEnum.java  | 16 ++++++-------
 .../com/cool/store/enums/SpecialTagEnum.java  |  4 +++-
 .../main/resources/mapper/ShopInfoMapper.xml  |  6 +++++
 .../cool/store/dto/wallet/AccountInfoDTO.java |  3 +++
 .../cool/store/request/BranchShopRequest.java |  6 +++++
 .../cool/store/vo/wallet/AccountInfoVO.java   |  3 +++
 .../impl/ExportRealizeServiceImpl.java        |  9 +++----
 .../store/service/impl/ExportServiceImpl.java | 24 ++++++++++++-------
 8 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java
index 02513c87f..f727f9028 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java
@@ -4,7 +4,7 @@ import com.cool.store.utils.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
-import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -59,13 +59,13 @@ public enum FranchiseBrandEnum {
         if (StringUtils.isBlank(code)){
             return null;
         }
-        int i = Integer.parseInt(code);
-        for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
-            if (i == e.getCode()) {
-                return e.getDesc();
-            }
-        }
-        return null;
+        return Arrays.stream(code.split(","))
+                .map(v -> {
+                    FranchiseBrandEnum brand = getEnumByCode(v);
+                    return Objects.nonNull(brand) ? brand.getDesc() : null;
+                })
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.joining(","));
     }
 
     public static FranchiseBrandEnum getEnumByCode(String code) {
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
index 1b1136524..54b11d58e 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
@@ -15,7 +15,9 @@ public enum SpecialTagEnum {
     ACTIVITY_CAROUSEL("活动轮播"),
     ACTIVITY_PACKAGE("活动套餐"),
     PROMOTIONAL_VIDEO("宣传视频"),
-    CALLING_SCREEN("叫号屏");;
+    CALLING_SCREEN("叫号屏"),
+    PRIVATE_SPHERE_QR("私域码"),
+    ;
 
     private final String tagName;
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index bb1dac26e..0d1b0e11c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -324,6 +324,9 @@
         <if test="request.contractStartTime !=null and request.contractEndTime != null">
             left join xfsg_sign_franchise c on a.id = c.shop_id
         </if>
+        <if test="request.signStageStartTime != null and request.signStageEndTime">
+            left join xfsg_shop_stage_info d on a.id = d.shop_id and d.shop_stage = 2 and d.shop_sub_stage = 80
+        </if>
         where a.deleted = 0
         <if test="request.contractStartTime !=null and request.contractEndTime !=null">
             and c.create_time between #{request.contractStartTime} and #{request.contractEndTime}
@@ -394,6 +397,9 @@
             </foreach>
             )
         </if>
+        <if test="request.signStageStartTime != null and request.signStageEndTime">
+            and d.actual_complete_time between #{request.signStageStartTime} and #{request.signStageEndTime}
+        </if>
         order by a.update_time desc
     </select>
     <select id="getShopListByRegion" resultType="com.cool.store.entity.ShopInfoDO">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java
index 84069a95c..84dd28dc0 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java
@@ -86,4 +86,7 @@ public class AccountInfoDTO {
 
     @ApiModelProperty("crm门店id")
     private String outStoreId;
+    
+    @ApiModelProperty("网商激活短链（平安不返回），调用重新发送后会变")
+    private String activityUrl;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
index f32fd14e0..8089085f2 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
@@ -51,6 +51,12 @@ public class BranchShopRequest  extends PageBasicInfo{
     private Date contractStartTime;
     @ApiModelProperty("合同结束时间")
     private Date contractEndTime;
+
+    @ApiModelProperty("签约阶段完成开始时间")
+    private Date signStageStartTime;
+
+    @ApiModelProperty("签约阶段完成结束时间")
+    private Date signStageEndTime;
     
     @ApiModelProperty(value = "招商区域", hidden = true)
     private List<String> authInvestRegionIds;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java
index fd3aaa975..85ee3c062 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java
@@ -51,4 +51,7 @@ public class AccountInfoVO {
 
     @ApiModelProperty("工商类型 1.企业 2.个体工商户 3.小微商户(自然人)")
     private Integer businessType;
+
+    @ApiModelProperty("网商激活短链（平安不返回），调用重新发送后会变")
+    private String activityUrl;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
index 0a99dc7f1..afa31ccf7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
@@ -55,6 +55,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.cool.store.utils.CommonUtil.convertToBig;
 import static com.cool.store.utils.poi.DateUtils.*;
 
 /**
@@ -170,10 +171,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                 if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
                     dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
                     dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
-                    String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
-                            .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
-                            .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
-                            .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
+                    String total = (convertToBig(franchiseFeeDTO.getPerformanceBond()).add(convertToBig(franchiseFeeDTO.getFirstYearFee()))
+                            .add(convertToBig(franchiseFeeDTO.getFirstYearManagementFee()))
+                            .add(convertToBig(franchiseFeeDTO.getYearFranchiseFee()))
+                            .add(convertToBig(franchiseFeeDTO.getLoanMargin())).toString());
                     dto.setTotalAmountContributions(total);
                     dto.setFranchiseFeeBill(franchiseFeeDTO.getYearFranchiseFee());
                     dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
index a5a86b5ff..b77ea70e6 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
@@ -94,17 +94,23 @@ public class ExportServiceImpl implements ExportService {
 
     @Override
     public Long branchShopList(BranchShopRequest request, LoginUserInfo user) {
-        request.setPageSize(CommonConstants.MAX_EXPORT_SIZE + 100);
-        request.setPageNum(CommonConstants.ONE);
-        PageInfo<BranchShopResponse> branchShopList = shopService.getBranchShopList(request, user.getUserId());
-        long total = branchShopList.getTotal();
+        request.setPageSize(1000);
         List<BranchShopResponse> exportList = new ArrayList<>();
+        boolean hasNext = true;
+        int pageNum = 1;
+        long total = 0;
+        while (hasNext) {
+            request.setPageNum(pageNum++);
+            PageInfo<BranchShopResponse> branchShopList = shopService.getBranchShopList(request, user.getUserId());
+            if (CollectionUtils.isEmpty(branchShopList.getList())) {
+                break;
+            }
+            hasNext = branchShopList.getList().size() >= request.getPageSize();
+            total += branchShopList.getList().size();
+            exportList.addAll(branchShopList.getList());
+        }
         if (total == CommonConstants.ZERO) {
             return CommonConstants.ZERO_LONG;
-        } else if (total > CommonConstants.MAX_EXPORT_SIZE) {
-            exportList.addAll(branchShopList.getList().subList(0, CommonConstants.MAX_EXPORT_SIZE));
-        } else {
-            exportList.addAll(branchShopList.getList());
         }
         ImportTaskDO importTaskDO = new ImportTaskDO();
         importTaskDO.setStatus(ImportStatusEnum.Ongoing.getCode());
@@ -115,7 +121,7 @@ public class ExportServiceImpl implements ExportService {
         importTaskDO.setCreateTime(new Date().getTime());
         importTaskDO.setCreateName(user.getName());
         importTaskMapper.insert(eid, importTaskDO);
-        exportRealizeService.branchShopList(branchShopList.getList(), importTaskDO);
+        exportRealizeService.branchShopList(exportList, importTaskDO);
         return total;
     }