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/AdjustmentOrderMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/AdjustmentOrderMapper.xml
@@ -97,6 +97,9 @@
        <if test="request.expenseSheetType != null and request.expenseSheetType != ''">
            and a.expense_sheet_type = #{request.expenseSheetType}
        </if>
+        <if test="request.createUserId != null and request.createUserId != ''">
+            and a.create_user_id = #{request.createUserId}
+        </if>
        <if test="request.regionIds != null and !request.regionIds.isEmpty()">
            AND <foreach collection="request.regionIds" item="regionId" separator=" OR " open="(" close=")">
                     b.region_path LIKE CONCAT('%/', #{regionId}, '/%')
--- a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
@@ -45,6 +45,9 @@
      <if test="type != null">
        and type = #{type}
      </if>
+      <if test="enable !=null">
+        and enable_flag = #{enable}
+      </if>
    </where>
      order by
      enable_flag desc,
@@ -96,4 +99,15 @@
      </otherwise>
    </choose>
  </select>
+  <select id="getByRegionIdList" resultType="com.cool.store.entity.BigRegionDO">
+    select DISTINCT
+    group_name as groupName,
+    region_id as regionId,
+    region_name as regionName
+    from `xfsg_big_region`
+    where region_id in
+    <foreach item="item" collection="list" index="index" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </select>
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
@@ -48,6 +48,11 @@
            where shop_id = #{item.shopId}
        </foreach>
    </update>
+    <update id="updatePayType">
+        update xfsg_franchise_fee
+        set pay_type = #{payType}
+        where shop_id = #{shopId}
+    </update>

    <select id="selectByShopId" resultType="com.cool.store.entity.FranchiseFeeDO">
        select *
--- a/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml
@@ -22,7 +22,9 @@
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
    <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
-    <result column="annex" jdbcType="VARCHAR" property="annex"/>
+    <result column="actual_payment_amount" jdbcType="DECIMAL" property="actualPaymentAmount" />
+    <result column="financial_remarks" jdbcType="VARCHAR" property="financialRemarks" />
+    <result column="annex" jdbcType="VARCHAR" property="annex" />
  </resultMap>


--- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
@@ -29,13 +29,14 @@
        <result column="payment_receipt_code" jdbcType="VARCHAR" property="paymentReceiptCode"/>
        <result column="pay_serial_number" jdbcType="VARCHAR" property="paySerialNumber"/>
        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="xgj_fail_reason" jdbcType="VARCHAR" property="xgjFailReason"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code,
        bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time,
        update_time, create_user_id, update_user_id,
        deleted,pay_business_type,amount,combined_field,xgj_claim_status,payment_receipt_code,pay_serial_number,
-        remark
+        remark,xgj_fail_reason
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
@@ -399,7 +400,7 @@
        </if>
    </select>
    <select id="getFranchiseFeePayInfoByShopId" resultType="com.cool.store.entity.LinePayDO">
-        select * from xfsg_line_pay where deleted = 0 and shop_id = #{shopId} and pay_business_type = 1 order by
+        select * from xfsg_line_pay where deleted = 0 and shop_id = #{shopId} and pay_business_type = 1  order by
        create_time desc
    </select>
    <select id="getDateHandler" resultType="com.cool.store.entity.LinePayDO">
@@ -456,5 +457,14 @@
        </foreach>
        ) and pay_business_type = #{payBusinessType}
    </update>
+    <update id="updateAmountAndPayUserName">
+        update xfsg_line_pay
+        set
+        amount = #{amount},
+        pay_user_name = #{payUserName},
+        update_time = now(),
+        update_user_id = #{userId}
+        where id = #{id}
+    </update>
 </mapper>

--- a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml
@@ -23,11 +23,16 @@
    <result column="deleted" jdbcType="BIT" property="deleted" />
    <result column="audit_id" jdbcType="BIGINT" property="auditId" />
    <result column="result_type" jdbcType="TINYINT" property="resultType"/>
+    <result column="open_time" jdbcType="TIMESTAMP" property="openTime" />
+      <result column="first_day_income" jdbcType="VARCHAR" property="firstDayIncome" />
+      <result column="second_day_income" jdbcType="VARCHAR" property="secondDayIncome" />
+      <result column="third_day_income" jdbcType="VARCHAR" property="thirdDayIncome" />
  </resultMap>
  <sql id="Base_Column_List">
    id,shop_id,plan_source,survey_result,survey_result_url,activity_theme,activity_theme_url,
      submission_time,submitted_user_id,preparation_user_ids,route_completed,create_time,
-      update_time,create_user_id,update_user_id,deleted,audit_id,result_type
+      update_time,create_user_id,update_user_id,deleted,audit_id,result_type,open_time,
+      first_day_income,second_day_income,third_day_income
  </sql>
  <update id="updateByShopId">
    update  xfsg_opening_operation_plan
@@ -44,6 +49,20 @@
        and
          deleted = 0
  </select>
+  <select id="selectByShopIds" resultType="com.cool.store.entity.OpeningOperationPlanDO">
+    select
+        <include refid="Base_Column_List"/>
+    from
+    xfsg_opening_operation_plan
+    where deleted = 0
+    <if test="shopIds != null and shopIds.size() > 0">
+        and shop_id in
+        <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
+            #{shopId}
+        </foreach>
+    </if>
+  </select>
+
  <select id="getOpenPlanShopListByCondition"
          resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
      select si.id as shopId, si.region_id AS regionId,si.line_id as lineId, si.shop_name as shopName,
--- a/coolstore-partner-dao/src/main/resources/mapper/ReceivingBankMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ReceivingBankMapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
+<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
+<mapper namespace="com.cool.store.mapper.ReceivingBankMapper">
+    <!-- 所有的数据库操作都要写在mapper标签中，可以使用特定的标签表示数据库中的特定操作 -->
+    <resultMap id="BaseResultMap" type="com.cool.store.entity.ReceivingBankDO">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="regionId" column="region_id" jdbcType="BIGINT"/>
+        <result property="franchiseBrand" column="franchise_brand" jdbcType="INTEGER"/>
+        <result property="payType" column="pay_type" jdbcType="TINYINT"/>
+        <result property="payee" column="payee" jdbcType="VARCHAR"/>
+        <result property="receivingAccount" column="receiving_account" jdbcType="VARCHAR"/>
+        <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
+        <result property="branchBankName" column="branch_bank_name" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+        <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+        <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+    </resultMap>
+    <insert id="batchInsert">
+        <foreach collection="list" separator=";" item="item">
+            insert into
+                xfsg_receiving_bank
+                (region_id,franchise_brand,pay_type,payee,receiving_account,bank_name,
+                branch_bank_name,create_time,update_time,create_user,update_user)
+            values
+                (#{item.regionId},#{item.franchiseBrand},#{item.payType},#{item.payee},
+                #{item.receivingAccount},#{item.bankName},#{item.branchBankName},#{item.createTime},
+                #{item.updateTime},#{item.createUser},#{item.updateUser})
+        </foreach>
+    </insert>
+    <insert id="batchInsertOrUpdate">
+        <foreach collection="list" item="item" separator=";">
+            INSERT INTO xfsg_receiving_bank (
+            region_id, franchise_brand, pay_type, payee, receiving_account,
+            bank_name, branch_bank_name, create_time, update_time, create_user, update_user
+            ) VALUES (
+            #{item.regionId}, #{item.franchiseBrand}, #{item.payType},
+            #{item.payee}, #{item.receivingAccount}, #{item.bankName},
+            #{item.branchBankName}, #{item.createTime}, #{item.updateTime},
+            #{item.createUser}, #{item.updateUser}
+            )
+            ON DUPLICATE KEY UPDATE
+            payee = VALUES(payee),
+            receiving_account = VALUES(receiving_account),
+            bank_name = VALUES(bank_name),
+            branch_bank_name = VALUES(branch_bank_name),
+            update_time = VALUES(update_time),
+            update_user = VALUES(update_user)
+        </foreach>
+    </insert>
+    <select id="getByFranchiseBrandAndRegionId" resultType="com.cool.store.entity.ReceivingBankDO">
+        select * from xfsg_receiving_bank
+        where deleted=0
+        <if test="franchiseBrandList !=null and franchiseBrandList.size() >0">
+            <foreach collection="franchiseBrandList" item="item" separator="," open="and franchise_brand in(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="regionIdList !=null and regionIdList.size() >0">
+            <foreach collection="regionIdList" item="item" separator="," open="and region_id in(" close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -397,6 +397,12 @@
            </foreach>
            )
        </if>
+        <if test="request.authInvestRegionIds != null and request.authInvestRegionIds.size() > 0">
+            and a.invest_region_id in
+            <foreach collection="request.authInvestRegionIds" item="investRegionId" index="index" open="(" separator="," close=")">
+                #{investRegionId}
+            </foreach>
+        </if>
        <if test="request.signStageStartTime != null and request.signStageEndTime">
            and d.actual_complete_time between #{request.signStageStartTime} and #{request.signStageEndTime}
        </if>
--- 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
--- a/coolstore-partner-dao/src/main/resources/mapper/ThirdPartyAccountMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ThirdPartyAccountMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.ThirdPartyAccountMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.ThirdPartyAccountDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="local_store_code" jdbcType="VARCHAR" property="localStoreCode" />
+    <result column="third_party_account_id" jdbcType="VARCHAR" property="thirdPartyAccountId" />
+    <result column="third_party_store_id" jdbcType="VARCHAR" property="thirdPartyStoreId" />
+    <result column="account_type" jdbcType="TINYINT" property="accountType" />
+    <result column="position_id" jdbcType="TINYINT" property="positionId" />
+    <result column="is_valid" jdbcType="TINYINT" property="isValid" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+
+
+  <select id="getByCodeAndMobile" resultMap="BaseResultMap">
+    select * from xfsg_third_party_account
+    where is_valid = 1
+    <if test="shopCode!=null and shopCode!=''">
+      and local_store_code = #{shopCode}
+    </if>
+    <if test="mobile!=null and mobile!=''">
+      and mobile = #{mobile}
+    </if>
+  </select>
+
+  <select id="exists" resultType="boolean">
+    SELECT COUNT(1) > 0 FROM xfsg_third_party_store
+    WHERE local_store_code = #{storeCode} and mobile = #{mobile}
+  </select>
+
+
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/ThirdPartyMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ThirdPartyMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.ThirdPartyStoreMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.ThirdPartyStoreDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="local_store_code" jdbcType="VARCHAR" property="localStoreCode" />
+    <result column="third_party_store_url" jdbcType="VARCHAR" property="thirdPartyStoreUrl" />
+    <result column="third_party_store_id" jdbcType="VARCHAR" property="thirdPartyStoreId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+
+
+  <select id="getByLocalStoreCode" resultMap="BaseResultMap">
+    select * from xfsg_third_party_store
+    <where>
+      <if test="storeCode!=null and storeCode!=''">
+        and local_store_code = #{storeCode}
+      </if>
+    </where>
+  </select>
+
+  <select id="exists" resultType="boolean">
+    SELECT COUNT(1) > 0 FROM xfsg_third_party_store
+    WHERE local_store_code = #{localStoreCode}
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml
@@ -214,4 +214,32 @@

    </select>

+    <select id="getBigRegionByUserId" resultType="com.cool.store.dto.BigRegionUserDTO">
+        select
+        b.`name` as name,
+        b.`mobile` as mobiel ,
+        e.`name` as regionName,
+        e.id as regionId
+        from
+        `user_auth_mapping_${enterpriseId}` a
+        left join `enterprise_user_${enterpriseId}` b on a.`user_id` = b.`user_id`
+        left join `enterprise_user_role_${enterpriseId}` c on a.`user_id` = c.`user_id`
+        left join `sys_role_${enterpriseId}` d on c.`role_id` = d.`id`
+        left join `region_${enterpriseId}` e on e.id = a.`mapping_id`
+        <where>
+        <if test="regionIds!=null and regionIds.size>0">
+            and a.`mapping_id` in
+            <foreach collection="regionIds" item="regionId" open="(" separator="," close=")">
+                #{regionId}
+            </foreach>
+        </if>
+        <if test="roleName!=null and roleName!=''">
+            and d.`role_name` = #{roleName}
+        </if>
+        </where>
+    </select>
+
+
+
+
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/WithdrawApplicationMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/WithdrawApplicationMapper.xml
@@ -15,7 +15,9 @@
            fail_reason AS failReason,
            create_user_id AS createUserId,
            create_time AS createTime,
-            update_time AS updateTime
+            update_time AS updateTime,
+            relate_store_id AS relateStoreId,
+            remark
        FROM zxjp_withdraw_application
        WHERE 1=1
        <if test="request.withdrawNo != null and request.withdrawNo != ''">
--- a/coolstore-partner-dao/src/main/resources/mapper/approval/CommonApprovalLogMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/approval/CommonApprovalLogMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.approval.CommonApprovalLogMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.approval.CommonApprovalLogDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="application_no" jdbcType="VARCHAR" property="applicationNo" />
+    <result column="node_code" jdbcType="VARCHAR" property="nodeCode" />
+    <result column="node_name" jdbcType="VARCHAR" property="nodeName" />
+    <result column="handle_user_id" jdbcType="VARCHAR" property="handleUserId" />
+    <result column="handle_user_name" jdbcType="VARCHAR" property="handleUserName" />
+    <result column="result" jdbcType="VARCHAR" property="result" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="comment" jdbcType="VARCHAR" property="comment" />
+    <result column="operate_time" jdbcType="TIMESTAMP" property="operateTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="TINYINT" property="deleted" />
+  </resultMap>
+
+  <select id="getByApplicationNo" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_common_approval_log
+    WHERE application_no = #{applicationNo}
+      AND deleted = 0
+    ORDER BY version ASC, id ASC
+  </select>
+
+  <insert id="batchInsert" parameterType="java.util.List">
+    INSERT INTO zxjp_common_approval_log (application_no, node_code, node_name, handle_user_id, handle_user_name, result, status, version, comment, operate_time)
+    VALUES
+    <foreach collection="list" item="item" separator=",">
+      (#{item.applicationNo}, #{item.nodeCode}, #{item.nodeName}, #{item.handleUserId}, #{item.handleUserName}, #{item.result}, #{item.status}, #{item.version}, #{item.comment}, #{item.operateTime})
+    </foreach>
+  </insert>
+
+  <update id="batchUpdate" parameterType="java.util.List">
+    <foreach collection="list" item="item" separator=";">
+      UPDATE zxjp_common_approval_log
+      SET status = #{item.status},
+          comment = #{item.comment},
+          operate_time = #{item.operateTime}
+          <if test="item.result != null">, result = #{item.result}</if>
+      WHERE id = #{item.id}
+    </foreach>
+  </update>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/contract/ContractCostMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/contract/ContractCostMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.contract.ContractCostMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.contract.ContractCostDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="join_fee_amount" jdbcType="DECIMAL" property="joinFeeAmount" />
+    <result column="join_fee_frequency_years" jdbcType="DECIMAL" property="joinFeeFrequencyYears" />
+    <result column="join_fee_discount_amount" jdbcType="DECIMAL" property="joinFeeDiscountAmount" />
+    <result column="join_fee_discount_reason" jdbcType="VARCHAR" property="joinFeeDiscountReason" />
+    <result column="brand_usage_fee_amount" jdbcType="DECIMAL" property="brandUsageFeeAmount" />
+    <result column="brand_usage_fee_frequency_years" jdbcType="DECIMAL" property="brandUsageFeeFrequencyYears" />
+    <result column="brand_management_fee_amount" jdbcType="DECIMAL" property="brandManagementFeeAmount" />
+    <result column="brand_management_fee_frequency_years" jdbcType="DECIMAL" property="brandManagementFeeFrequencyYears" />
+    <result column="design_fee_amount" jdbcType="DECIMAL" property="designFeeAmount" />
+    <result column="system_usage_fee_amount" jdbcType="DECIMAL" property="systemUsageFeeAmount" />
+    <result column="performance_bond_amount" jdbcType="DECIMAL" property="performanceBondAmount" />
+    <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+    <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
+  </resultMap>
+
+  <select id="queryByContractNo" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_contract_cost
+    WHERE contract_no = #{contractNo}
+    ORDER BY id ASC
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/contract/ContractMasterMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/contract/ContractMasterMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.contract.ContractMasterMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.contract.ContractMasterDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="contract_type" jdbcType="VARCHAR" property="contractType" />
+    <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="store_id" jdbcType="VARCHAR" property="storeId" />
+    <result column="store_code" jdbcType="VARCHAR" property="storeCode" />
+    <result column="brand_name" jdbcType="VARCHAR" property="brandName" />
+    <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="sign_form" jdbcType="VARCHAR" property="signForm" />
+    <result column="contract_years" jdbcType="DECIMAL" property="contractYears" />
+    <result column="start_date" jdbcType="DATE" property="startDate" />
+    <result column="end_date" jdbcType="DATE" property="endDate" />
+    <result column="contract_status" jdbcType="VARCHAR" property="contractStatus" />
+    <result column="currency" jdbcType="VARCHAR" property="currency" />
+    <result column="sign_date" jdbcType="DATE" property="signDate" />
+    <result column="related_contract_no" jdbcType="VARCHAR" property="relatedContractNo" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="renewal_created" jdbcType="TINYINT" property="renewalCreated" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+    <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
+  </resultMap>
+
+  <select id="queryContractMasterList" resultType="com.cool.store.vo.contract.ContractMasterListVO">
+    SELECT a.id AS contractId, a.contract_type, a.contract_no, a.store_code, a.brand_name,
+           a.source, a.sign_form, a.contract_years, a.start_date, a.end_date,
+           a.contract_status, a.remark, a.related_contract_no, a.create_user_id, a.created_time
+    <if test="request.storeNameOrCode != null and request.storeNameOrCode != ''">
+        , c.store_name
+    </if>
+    FROM zxjp_contract_master a
+    <if test="request.storeNameOrCode != null and request.storeNameOrCode != ''">
+        LEFT JOIN store_${enterpriseId} c ON a.store_code = c.store_num
+    </if>
+    <where>
+        <if test="request.contractNo != null and request.contractNo != ''">
+            AND a.contract_no LIKE CONCAT('%', #{request.contractNo}, '%')
+        </if>
+        <if test="request.storeNameOrCode != null and request.storeNameOrCode != ''">
+            AND (c.store_name LIKE CONCAT('%', #{request.storeNameOrCode}, '%') OR c.store_num LIKE CONCAT('%', #{request.storeNameOrCode}, '%'))
+        </if>
+        <if test="request.endDateStart != null">
+            AND a.end_date &gt;= #{request.endDateStart}
+        </if>
+        <if test="request.endDateEnd != null">
+            AND a.end_date &lt;= #{request.endDateEnd}
+        </if>
+        <if test="request.brandName != null and request.brandName != ''">
+            AND a.brand_name = #{request.brandName}
+        </if>
+        <if test="request.contractType != null and request.contractType != ''">
+            AND a.contract_type = #{request.contractType}
+        </if>
+    </where>
+    ORDER BY a.created_time DESC
+  </select>
+
+  <select id="queryContractsNearExpiry" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_contract_master
+    WHERE end_date BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL #{days} DAY)
+      AND renewal_created = 0
+    ORDER BY end_date ASC
+  </select>
+
+  <select id="getLatestContractByStoreCode" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_contract_master
+    WHERE store_code = #{storeCode}
+    ORDER BY end_date DESC
+    LIMIT 1
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/exam/ExamAttemptAnswerMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/exam/ExamAttemptAnswerMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.exam.ExamAttemptAnswerMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.exam.ExamAttemptAnswerDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="attempt_id" jdbcType="BIGINT" property="attemptId" />
+    <result column="paper_id" jdbcType="BIGINT" property="paperId" />
+    <result column="paper_question_id" jdbcType="BIGINT" property="paperQuestionId" />
+    <result column="answer" jdbcType="VARCHAR" property="answer" />
+    <result column="score" jdbcType="DECIMAL" property="score" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+
+  <insert id="insertOrUpdate" parameterType="com.cool.store.entity.exam.ExamAttemptAnswerDO">
+    INSERT INTO zxjp_exam_attempt_answer (attempt_id, paper_id, paper_question_id, answer, score, create_user_id)
+    VALUES (#{attemptId}, #{paperId}, #{paperQuestionId}, #{answer}, #{score}, #{createUserId})
+    ON DUPLICATE KEY UPDATE
+    answer = #{answer}, score = #{score}
+  </insert>
+
+  <insert id="batchInsertOrUpdate" parameterType="java.util.List">
+    INSERT INTO zxjp_exam_attempt_answer (attempt_id, paper_id, paper_question_id, answer, score, create_user_id)
+    VALUES
+    <foreach collection="list" item="item" separator=",">
+      (#{item.attemptId}, #{item.paperId}, #{item.paperQuestionId}, #{item.answer}, #{item.score}, #{item.createUserId})
+    </foreach>
+    ON DUPLICATE KEY UPDATE
+    answer = VALUES(answer), score = VALUES(score)
+  </insert>
+
+  <update id="batchUpdateScore" parameterType="java.util.List">
+    UPDATE zxjp_exam_attempt_answer SET
+    score = CASE id
+    <foreach collection="list" item="item">
+      WHEN #{item.id} THEN #{item.score}
+    </foreach>
+    END
+    WHERE id IN
+    <foreach collection="list" item="item" open="(" separator="," close=")">
+      #{item.id}
+    </foreach>
+  </update>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/exam/ExamAttemptMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/exam/ExamAttemptMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.exam.ExamAttemptMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.exam.ExamAttemptDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="exam_id" jdbcType="BIGINT" property="examId" />
+    <result column="paper_id" jdbcType="BIGINT" property="paperId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="deadline_time" jdbcType="TIMESTAMP" property="deadlineTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="submit_type" jdbcType="INTEGER" property="submitType" />
+    <result column="total_score" jdbcType="DECIMAL" property="totalScore" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+
+  <select id="getAttemptCount" resultType="java.util.Map">
+    SELECT COUNT(1) AS attempt_count, exam_id FROM zxjp_exam_attempt
+    WHERE exam_id IN
+    <foreach item="item" collection="examInfoIds" separator="," open="(" close=")">
+      #{item}
+    </foreach>
+    GROUP BY exam_id
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/exam/ExamInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/exam/ExamInfoMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.exam.ExamInfoMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.exam.ExamInfoDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="paper_id" jdbcType="BIGINT" property="paperId" />
+    <result column="exam_name" jdbcType="VARCHAR" property="examName" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="duration_minutes" jdbcType="INTEGER" property="durationMinutes" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="entry_token" jdbcType="VARCHAR" property="entryToken" />
+    <result column="qrcode_url" jdbcType="VARCHAR" property="qrcodeUrl" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="INTEGER" property="deleted" />
+  </resultMap>
+
+  <select id="selectByToken" parameterType="java.lang.String" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_exam_info
+    WHERE entry_token = #{token} AND deleted = 0
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/exam/ExamPaperMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/exam/ExamPaperMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.exam.ExamPaperMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.exam.ExamPaperDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="paper_name" jdbcType="VARCHAR" property="paperName" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="total_score" jdbcType="DECIMAL" property="totalScore" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="start_exam" jdbcType="INTEGER" property="startExam" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="INTEGER" property="deleted" />
+  </resultMap>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/exam/ExamPaperQuestionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/exam/ExamPaperQuestionMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.exam.ExamPaperQuestionMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.exam.ExamPaperQuestionDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="paper_id" jdbcType="BIGINT" property="paperId" />
+    <result column="question_id" jdbcType="BIGINT" property="questionId" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="difficulty" jdbcType="INTEGER" property="difficulty" />
+    <result column="answer" jdbcType="VARCHAR" property="answer" />
+    <result column="score" jdbcType="DECIMAL" property="score" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="INTEGER" property="deleted" />
+    <result column="question_stem" jdbcType="LONGVARCHAR" property="questionStem" />
+    <result column="analysis" jdbcType="LONGVARCHAR" property="analysis" />
+    <result column="options" jdbcType="LONGVARCHAR" property="options" />
+  </resultMap>
+
+  <!-- 批量插入试卷题目 -->
+  <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+    INSERT INTO zxjp_exam_paper_question (
+      paper_id, question_id, type, difficulty, answer, score,
+      question_stem, analysis, options, deleted, create_user_id, create_time, update_time
+    ) VALUES
+    <foreach collection="list" item="item" separator=",">
+      (
+        #{item.paperId}, #{item.questionId}, #{item.type}, #{item.difficulty}, #{item.answer}, #{item.score},
+        #{item.questionStem}, #{item.analysis}, #{item.options}, #{item.deleted}, #{item.createUserId}, #{item.createTime}, #{item.updateTime}
+      )
+    </foreach>
+  </insert>
+
+  <!-- 根据试卷ID批量删除（逻辑删除） -->
+  <update id="deleteByPaperId">
+    UPDATE zxjp_exam_paper_question
+    SET deleted = 1, update_time = #{updateTime}
+    WHERE paper_id = #{paperId} AND deleted = 0
+  </update>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/exam/ExamQuestionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/exam/ExamQuestionMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.exam.ExamQuestionMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.exam.ExamQuestionDO">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="difficulty" jdbcType="INTEGER" property="difficulty" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="answer" jdbcType="VARCHAR" property="answer" />
+    <result column="score" jdbcType="DECIMAL" property="score" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted" jdbcType="INTEGER" property="deleted" />
+    <result column="question_stem" jdbcType="LONGVARCHAR" property="questionStem" />
+    <result column="analysis" jdbcType="LONGVARCHAR" property="analysis" />
+    <result column="options" jdbcType="LONGVARCHAR" property="options" />
+  </resultMap>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/renewal/RenewalApplicationMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/renewal/RenewalApplicationMapper.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.renewal.RenewalApplicationMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.renewal.RenewalApplicationDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="application_no" jdbcType="VARCHAR" property="applicationNo" />
+    <result column="store_code" jdbcType="VARCHAR" property="storeCode" />
+    <result column="original_contract_no" jdbcType="VARCHAR" property="originalContractNo" />
+    <result column="contract_expire_date" jdbcType="DATE" property="contractExpireDate" />
+    <result column="is_deleted" jdbcType="TINYINT" property="isDeleted" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="other_method" jdbcType="TINYINT" property="otherMethod" />
+    <result column="is_renovate" jdbcType="TINYINT" property="isRenovate" />
+    <result column="apply_time" jdbcType="TIMESTAMP" property="applyTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_user_name" jdbcType="VARCHAR" property="createUserName" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+    <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
+  </resultMap>
+
+  <select id="queryRenewalApplicationList" resultType="com.cool.store.vo.renewal.RenewalApplicationListVO">
+    SELECT a.id AS renewalId, a.application_no, a.store_code, a.contract_expire_date,
+           a.is_renovate, a.status, c.join_brand, c.store_name, c.store_address, c.join_brand AS brandName
+    FROM zxjp_renewal_application a
+        LEFT JOIN store_${enterpriseId} c ON a.store_code = c.store_num
+    <where>
+        a.is_deleted = 0
+        <if test="request.keyword != null and request.keyword != ''">
+            AND (c.store_name LIKE CONCAT('%', #{request.keyword}, '%') OR c.store_num LIKE CONCAT('%', #{request.keyword}, '%'))
+        </if>
+        <if test="request.regionId != null">
+            AND c.region_path LIKE CONCAT('%/', #{request.regionId}, '/%')
+        </if>
+        <if test="regionIds != null and !regionIds.isEmpty()">
+            AND <foreach collection="regionIds" item="regionId" separator=" OR " open="(" close=")">
+                c.region_path LIKE CONCAT('%/', #{regionId}, '/%')
+            </foreach>
+        </if>
+        <if test="request.contractStartDateStart != null">
+            AND a.contract_expire_date &gt;= #{request.contractStartDateStart}
+        </if>
+        <if test="request.contractStartDateEnd != null">
+            AND a.contract_expire_date &lt;= #{request.contractStartDateEnd}
+        </if>
+        <if test="request.contractEndDateStart != null">
+            AND a.contract_expire_date &gt;= #{request.contractEndDateStart}
+        </if>
+        <if test="request.contractEndDateEnd != null">
+            AND a.contract_expire_date &lt;= #{request.contractEndDateEnd}
+        </if>
+        <if test="request.isRenovate != null">
+            AND a.is_renovate = #{request.isRenovate}
+        </if>
+        <if test="request.status != null">
+            AND a.status = #{request.status}
+        </if>
+    </where>
+    ORDER BY a.created_time DESC
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/renewal/RenewalApplicationSignerInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/renewal/RenewalApplicationSignerInfoMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.renewal.RenewalApplicationSignerInfoMapper">
+    <resultMap id="BaseResultMap" type="com.cool.store.entity.renewal.RenewalApplicationSignerInfoDO">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="application_no" jdbcType="VARCHAR" property="applicationNo"/>
+        <result column="signer1_name" jdbcType="VARCHAR" property="signer1Name"/>
+        <result column="signer1_mobile" jdbcType="VARCHAR" property="signer1Mobile"/>
+        <result column="signer2_name" jdbcType="VARCHAR" property="signer2Name"/>
+        <result column="signer2_mobile" jdbcType="VARCHAR" property="signer2Mobile"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createdTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updatedTime"/>
+    </resultMap>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/renewal/RenewalRenovateApprovalMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/renewal/RenewalRenovateApprovalMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.renewal.RenewalRenovateApprovalMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.renewal.RenewalRenovateApprovalDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="application_no" jdbcType="VARCHAR" property="applicationNo" />
+    <result column="shop_area_id" jdbcType="BIGINT" property="shopAreaId" />
+    <result column="decoration_attributes" jdbcType="VARCHAR" property="decorationAttributes" />
+    <result column="decoration_level" jdbcType="VARCHAR" property="decorationLevel" />
+    <result column="decoration_requirement" jdbcType="VARCHAR" property="decorationRequirement" />
+    <result column="special_instruction" jdbcType="VARCHAR" property="specialInstruction" />
+    <result column="video_url" jdbcType="VARCHAR" property="videoUrl" />
+    <result column="shop_front_photo_url" jdbcType="VARCHAR" property="shopFrontPhotoUrl" />
+    <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+    <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
+  </resultMap>
+
+  <select id="getByApplicationNo" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_renewal_renovate_approval
+    WHERE application_no = #{applicationNo}
+  </select>
+</mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/store/StoreBusinessReportMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/store/StoreBusinessReportMapper.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.store.StoreBusinessReportMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.store.StoreBusinessReportDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="join_brand" jdbcType="TINYINT" property="joinBrand" />
+    <result column="domestic" jdbcType="BIT" property="domestic" />
+    <result column="date" jdbcType="VARCHAR" property="date" />
+    <result column="open_total_num" jdbcType="INTEGER" property="openTotalNum" />
+    <result column="period_begin_num" jdbcType="INTEGER" property="periodBeginNum" />
+    <result column="new_open_num" jdbcType="INTEGER" property="newOpenNum" />
+    <result column="close_num" jdbcType="INTEGER" property="closeNum" />
+    <result column="period_end_num" jdbcType="INTEGER" property="periodEndNum" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, join_brand, domestic, date, open_total_num, period_begin_num, new_open_num, close_num,
+    period_end_num, create_time
+  </sql>
+  <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
+    insert into store_business_report_${enterpriseId}
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="record.joinBrand != null">
+        join_brand,
+      </if>
+      <if test="record.domestic != null">
+        domestic,
+      </if>
+      <if test="record.date != null">
+        date,
+      </if>
+      <if test="record.openTotalNum != null">
+        open_total_num,
+      </if>
+      <if test="record.periodBeginNum != null">
+        period_begin_num,
+      </if>
+      <if test="record.newOpenNum != null">
+        new_open_num,
+      </if>
+      <if test="record.closeNum != null">
+        close_num,
+      </if>
+      <if test="record.periodEndNum != null">
+        period_end_num,
+      </if>
+      <if test="record.createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="record.joinBrand != null">
+        #{record.joinBrand},
+      </if>
+      <if test="record.domestic != null">
+        #{record.domestic},
+      </if>
+      <if test="record.date != null">
+        #{record.date},
+      </if>
+      <if test="record.openTotalNum != null">
+        #{record.openTotalNum},
+      </if>
+      <if test="record.periodBeginNum != null">
+        #{record.periodBeginNum},
+      </if>
+      <if test="record.newOpenNum != null">
+        #{record.newOpenNum},
+      </if>
+      <if test="record.closeNum != null">
+        #{record.closeNum},
+      </if>
+      <if test="record.periodEndNum != null">
+        #{record.periodEndNum},
+      </if>
+      <if test="record.createTime != null">
+        #{record.createTime},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective">
+    update store_business_report_${enterpriseId}
+    <set>
+      <if test="record.joinBrand != null">
+        join_brand = #{record.joinBrand},
+      </if>
+      <if test="record.domestic != null">
+        domestic = #{record.domestic},
+      </if>
+      <if test="record.date != null">
+        date = #{record.date},
+      </if>
+      <if test="record.openTotalNum != null">
+        open_total_num = #{record.openTotalNum},
+      </if>
+      <if test="record.periodBeginNum != null">
+        period_begin_num = #{record.periodBeginNum},
+      </if>
+      <if test="record.newOpenNum != null">
+        new_open_num = #{record.newOpenNum},
+      </if>
+      <if test="record.closeNum != null">
+        close_num = #{record.closeNum},
+      </if>
+      <if test="record.periodEndNum != null">
+        period_end_num = #{record.periodEndNum},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime},
+      </if>
+    </set>
+    where id = #{record.id}
+  </update>
+
+  <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    INSERT INTO store_business_report_${enterpriseId} (join_brand,domestic,date,open_total_num,period_begin_num,new_open_num,close_num,period_end_num) VALUES
+    <foreach collection="list" item="item" separator=",">
+      (#{item.joinBrand},#{item.domestic},#{item.date},#{item.openTotalNum},#{item.periodBeginNum},#{item.newOpenNum},#{item.closeNum},#{item.periodEndNum})
+    </foreach>
+    ON DUPLICATE KEY UPDATE
+    domestic = VALUES(domestic),
+    open_total_num = VALUES(open_total_num),
+    period_begin_num = VALUES(period_begin_num),
+    new_open_num = VALUES(new_open_num),
+    close_num = VALUES(close_num),
+    period_end_num = VALUES(period_end_num)
+    </insert>
+</mapper>