Merge #118 into master from cc_20260506_newsign

feat:addShopDecorationLog

* cc_20260506_newsign: (14 commits squashed)

  - feat：新签调整

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：id

  - feat:招商副总裁审核

  - feat:招商经理

  - feat:招商经理

  - feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核

  - feat:SHOP_SUB_STAGE_STATUS_150_5

  - feat:建店代办处理

  - feat:addShopDecorationLog

  - feat:addShopDecorationLog

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/118

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDecorationLogDAO.java

@@ -0,0 +1,32 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.ShopDecorationLogDO;
+import com.cool.store.mapper.ShopDecorationLogMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 门店装修修改记录 DAO
+ */
+@Repository
+public class ShopDecorationLogDAO {
+
+    @Resource
+    private ShopDecorationLogMapper shopDecorationLogMapper;
+
+    /**
+     * 插入修改记录
+     */
+    public int insert(ShopDecorationLogDO record) {
+        return shopDecorationLogMapper.insertSelective(record);
+    }
+
+    /**
+     * 通过门店ID查询所有修改记录（按时间倒序）
+     */
+    public List<ShopDecorationLogDO> listByShopIdOrderByTimeDesc(Long shopId) {
+        return shopDecorationLogMapper.listByShopIdOrderByTimeDesc(shopId);
+    }
+}

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java

@@ -270,10 +270,11 @@ public class ShopStageInfoDAO {
         return shopStageInfoMapper.updateShopStageAndAuditInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId);
     }
 
-    public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize) {
+    public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List<String> authRegionIds) {
         PageHelper.startPage(pageNum, pageSize);
         ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21;
-        return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(), shopSubStageStatus.getShopSubStageStatus());
+        return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(),
+                shopSubStageStatus.getShopSubStageStatus(),authRegionIds);
     }
 
     public List<ShopStageInfoDO> getShopIdListByStageStatus(Integer shopSubStageStatus) {

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDecorationLogMapper.java

@@ -0,0 +1,18 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.ShopDecorationLogDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 门店装修修改记录表 Mapper
+ */
+public interface ShopDecorationLogMapper extends Mapper<ShopDecorationLogDO> {
+
+    /**
+     * 通过门店ID查询所有修改记录（按时间倒序）
+     */
+    List<ShopDecorationLogDO> listByShopIdOrderByTimeDesc(@Param("shopId") Long shopId);
+}

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

@@ -116,7 +116,10 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
      * @param userId
      * @return
      */
-    Page<RentInfoToDoVO> getRentContractToDoPage(@Param("userId") String userId, @Param("shopSubStage")Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus);
+    Page<RentInfoToDoVO> getRentContractToDoPage(@Param("userId") String userId,
+                                                 @Param("shopSubStage")Integer shopSubStage,
+                                                 @Param("shopSubStageStatus") Integer shopSubStageStatus,
+                                                 @Param("authRegionIds") List<String> authRegionIds);
 
     List<ShopStageInfoDO> getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus);
 

coolstore-partner-dao/src/main/resources/mapper/ShopDecorationLogMapper.xml

@@ -0,0 +1,18 @@
+<?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.ShopDecorationLogMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.ShopDecorationLogDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="shop_id" jdbcType="BIGINT" property="shopId" />
+    <result column="old_data" jdbcType="VARCHAR" property="oldData" />
+    <result column="new_data" jdbcType="VARCHAR" property="newData" />
+    <result column="operator" jdbcType="VARCHAR" property="operator" />
+    <result column="operator_time" jdbcType="TIMESTAMP" property="operatorTime" />
+  </resultMap>
+
+  <select id="listByShopIdOrderByTimeDesc" resultMap="BaseResultMap">
+    SELECT * FROM zxjp_shop_decoration_log
+    WHERE shop_id = #{shopId}
+    ORDER BY operator_time DESC
+  </select>
+</mapper>

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -244,8 +244,17 @@
         inner join xfsg_line_info b on a.line_id = b.id
         left join xfsg_shop_info c on a.shop_id = c.id
         where c.deleted=0
-       and a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and
-        b.deleted = 0 and b.development_manager = #{userId}
+       and a.shop_sub_stage = #{shopSubStage}
+       and a.shop_sub_stage_status = #{shopSubStageStatus}
+       and a.deleted = 0
+       and b.deleted = 0
+        <if test="authRegionIds != null and authRegionIds.size() > 0">
+            and c.invest_region_id in
+            <foreach collection="authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
+                #{regionId}
+            </foreach>
+        </if>
+        order by a.id desc
     </select>
 
 

coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml

@@ -70,7 +70,8 @@
     <select id="selectByShopIds" resultType="com.cool.store.entity.SignFranchiseDO">
         select contract_code,shop_id,sign_type,contract_start_time,contract_end_time,contract_amount,create_time,
         partnership_signatory_first,partnership_signatory_second ,partnership_signatory_second_id_number,partnership_signatory_second_mobile,
-        introduction_award,introduce_store,introducer,protective_distance,partnership_signatory_first_which_store
+        introduction_award,introduce_store,introducer,protective_distance,partnership_signatory_first_which_store,
+        display_cabinets_num
         from xfsg_sign_franchise
         where 1=1
         <if test="list !=null and list.size >0">