Merge #128 into master from cc_20250512_uploadRentContract

feat:租赁合同新增审批记录 * cc_20250512_uploadRentContract: (100 commits squashed) - fix:计划闭店时间修改 - Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak - feat：新签调整 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java - fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段 - Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak - feat：招商 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java - feat：招商 - feat：招商 - feat：招商 - fix:删除字段 - Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak - feat：招商 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak - feat：数据同步名称新增MX 等前缀 - feat：上海魔盒未来食品有限公司 - fix:修改查询逻辑 - Merge branch 'cc_20260428_store_report' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - feat：id - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak - Merge branch 'cc_20260507_smz' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java - Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak - feat：翻新 - feat:用户列表为空 - Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak - feat:用户列表为空 - Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak - feat:RenewalRenovateApprovalVO - Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak - feat:招商副总裁 - Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java - feat:招商副总裁审核 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - feat:费用单调整 - feat:招商经理 - feat:招商经理 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - feat:费用调整 - Merge branch 'master' into cc_20260226_fix - fix:bug修复 - fix:未开业门店试营业日期 - Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - feat:新增审批 - fix:开业日期报备不同步门店状态 - Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak - fix:字段名称修改 - Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak - fix:闭店中止新增审批记录 - Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak - feat:费用调整单 - feat:招商大区总审核或者分部内勤审核其他状态不能审核 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - feat:调整单 - feat:SHOP_SUB_STAGE_STATUS_150_5 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - fix:试营业测试接口 - Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak - Merge branch 'master' into cc_20250514_common_bak - feat:page - feat:自动分账 - Merge branch 'master' into cc_20250514_common_bak - fix:私域二维码门店绑定关系缓存改为7天 - Merge branch 'cc_20260226_fix' into cc_20250514_common_bak - feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询 - Merge branch 'cc_20260509_fix' into cc_20250514_common_bak - fix:修改门店开业日期判断条件修改 - Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak - feat:填写添加门店 - feat:建店代办处理 - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak - feat:userAuthMappingService - feat:addShopDecorationLog - Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak - feat:待采购确认审批流程 - feat:问题修复 - Merge branch 'cc_20260511_fix' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java #	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - feat:问题修复 - feat:问题修复 - feat:流水查询条件 - Merge branch 'master' into cc_20260508_adjustment - feat：费用流水筛选条件 - fix:歇业管理逻辑修改 - Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak - feat：getAdjustAmount - Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml #	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml #	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml #	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java #	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java #	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java #	coolstore-partner-web/src/main/resources/application-ab.properties #	coolstore-partner-web/src/main/resources/application-local.properties #	coolstore-partner-web/src/main/resources/application-online.properties #	coolstore-partner-web/src/main/resources/application-test.properties - fix:合并冲突 - Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:合并冲突 - Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak - Merge branch 'master' into cc_20260408_close_up - fix:火码歇业时机修改 - Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak - feat:租赁合同新增审批记录 - Merge branch 'master' into cc_20250512_uploadRentContract # Conflicts: #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java - feat:merge冲突 - feat:merge冲突 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/128
2026-05-12 09:01:35 +00:00
parent 56b85c3322
commit 20f063dc55
325 changed files with 14065 additions and 264 deletions
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -378,6 +378,23 @@
        </choose>
    </select>

+    <select id="getStoreByRegionIds" resultMap="BaseResultMap">
+        SELECT * FROM store_${enterpriseId}
+        <where>
+            is_delete = 'effective' AND store_status != 'closed'
+            <if test="keyword != null and keyword != ''">
+                AND (store_name LIKE concat('%', #{keyword}, '%') OR store_num LIKE concat('%', #{keyword}, '%'))
+            </if>
+            <if test="regionIds != null and !regionIds.isEmpty()">
+                AND (
+                <foreach collection="regionIds" item="regionId" separator=" OR ">
+                    region_path LIKE concat('%/', #{regionId}, '/%')
+                </foreach>
+                )
+            </if>
+        </where>
+    </select>
+
    <select id="storeNumStatisticsByAd" resultType="java.util.Map">
        SELECT YEAR(open_date) year, province, city, COUNT(1) store_num, QUARTER(open_date) quarter
        FROM store_${enterpriseId}
@@ -405,22 +422,6 @@
        </if>
    </select>

-    <select id="getStoreByRegionIds" resultMap="BaseResultMap">
-        SELECT * FROM store_${enterpriseId}
-        <where>
-            is_delete = 'effective' AND store_status != 'closed'
-            <if test="keyword != null and keyword != ''">
-                AND (store_name LIKE concat('%', #{keyword}, '%') OR store_num LIKE concat('%', #{keyword}, '%'))
-            </if>
-            <if test="regionIds != null and !regionIds.isEmpty()">
-                AND (
-                <foreach collection="regionIds" item="regionId" separator=" OR ">
-                    region_path LIKE concat('%/', #{regionId}, '/%')
-                </foreach>
-                )
-            </if>
-        </where>
-    </select>

    <select id="getStoreAddress" resultType="com.cool.store.dto.store.StoreAddressDTO">
        SELECT * FROM store_${enterpriseId}
@@ -466,6 +467,119 @@
        WHERE store_id = #{storeId}
    </select>

+    <select id="totalOpenStoreReport" resultType="com.cool.store.dto.store.StoreReportDTO">
+        SELECT join_brand, COUNT(1) num
+        FROM store_${enterpriseId} a
+        <where>
+            a.is_delete = 'effective'
+            AND a.store_status IN ('open', 'close_up')
+            <if test="joinBrandList != null and joinBrandList.size() > 0">
+                AND a.join_brand IN
+                <foreach collection="joinBrandList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="date != null">
+                AND DATE_FORMAT(a.open_date, CASE WHEN LENGTH(#{date}) = 4 THEN '%Y' ELSE '%Y-%m' END) &lt;= #{date}
+            </if>
+            <if test="domestic != null and domestic == 2">
+                AND LOCATE('_', a.store_num) > 0
+            </if>
+            <if test="domestic != null and domestic == 1">
+                AND LOCATE('_', a.store_num) = 0
+            </if>
+            AND NOT EXISTS (
+                SELECT 1 FROM store_business_report_exclude_${enterpriseId} b WHERE b.type = 1 AND a.store_num = b.store_num
+            )
+        </where>
+        GROUP BY join_brand
+    </select>
+
+    <select id="periodBeginStoreReport" resultType="com.cool.store.dto.store.StoreReportDTO">
+        SELECT join_brand, COUNT(1) num
+        FROM store_${enterpriseId} a
+        <where>
+            a.is_delete = 'effective'
+            <if test="joinBrandList != null and joinBrandList.size() > 0">
+                AND a.join_brand IN
+                <foreach collection="joinBrandList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="date != null">
+                AND DATE_FORMAT(a.open_date, CASE WHEN LENGTH(#{date}) = 4 THEN '%Y' ELSE '%Y-%m' END) &lt; #{date}
+            </if>
+            <if test="domestic != null and domestic == 2">
+                AND LOCATE('_', a.store_num) > 0
+            </if>
+            <if test="domestic != null and domestic == 1">
+                AND LOCATE('_', a.store_num) = 0
+            </if>
+        </where>
+        GROUP BY join_brand
+    </select>
+
+    <select id="newOpenStoreReport" resultType="com.cool.store.dto.store.StoreReportDTO">
+        SELECT join_brand, COUNT(1) num
+        FROM store_${enterpriseId} a
+        <where>
+            a.is_delete = 'effective'
+            AND a.store_status IN ('open', 'close_up', 'closed')
+            <if test="joinBrandList != null and joinBrandList.size() > 0">
+                AND a.join_brand IN
+                <foreach collection="joinBrandList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="date != null">
+                AND DATE_FORMAT(a.open_date, CASE WHEN LENGTH(#{date}) = 4 THEN '%Y' ELSE '%Y-%m' END) = #{date}
+            </if>
+            <if test="domestic != null and domestic == 2">
+                AND LOCATE('_', a.store_num) > 0
+            </if>
+            <if test="domestic != null and domestic == 1">
+                AND LOCATE('_', a.store_num) = 0
+            </if>
+            AND NOT EXISTS (
+                SELECT 1 FROM store_business_report_exclude_${enterpriseId} b WHERE b.type = 1 AND a.store_num = b.store_num
+            )
+        </where>
+        GROUP BY join_brand
+    </select>
+
+    <select id="closeStoreReport" resultType="com.cool.store.dto.store.StoreReportDTO">
+        SELECT join_brand, COUNT(1) num
+        FROM store_${enterpriseId} a
+        <where>
+            a.is_delete = 'effective'
+            AND a.store_status = 'closed'
+            <if test="joinBrandList != null and joinBrandList.size() > 0">
+                AND a.join_brand IN
+                <foreach collection="joinBrandList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="date != null">
+                AND DATE_FORMAT(a.close_store_time, CASE WHEN LENGTH(#{date}) = 4 THEN '%Y' ELSE '%Y-%m' END) = #{date}
+            </if>
+            <if test="domestic != null and domestic == 2">
+                AND LOCATE('_', a.store_num) > 0
+                AND EXISTS (
+                    SELECT 1 FROM store_business_report_exclude_${enterpriseId} b WHERE b.type = 1 AND a.store_num = b.store_num AND b.domestic = 2
+                )
+            </if>
+            <if test="domestic != null and domestic == 1">
+                AND LOCATE('_', a.store_num) = 0
+            </if>
+            AND NOT EXISTS (
+                SELECT 1 FROM store_business_report_exclude_${enterpriseId} b WHERE b.type = 2 AND a.store_num = b.store_num
+            )
+        </where>
+        GROUP BY join_brand
+    </select>
+
+
+
    <insert id="insertOrUpdateSoftOpenDate">
        INSERT INTO store_extend_info_${enterpriseId}(store_id, soft_open_date)
        VALUES