Merge #126 into master from cc_20260408_close_up

歇业管理逻辑修改 * cc_20260408_close_up: (31 commits squashed) - fix:歇业管理（部分） - fix:歇业管理（部分） - fix:审批逻辑修改；拒绝审批实现 - fix:恢复开业申请及审批 - fix:主流程补充 - fix:主流程补充 - fix:字段补充及逻辑修改 - fix:字段补充 - fix - fix:平台处理新增字段 - fix - Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up - fix:歇业营业发送短信 - fix:排序 - fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败 - fix:申请单详情接口新增品牌字段 - fix:新增列表筛选条件；审批单状态校验 - Merge branch 'master' into cc_20260408_close_up # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java - fix:歇业对接三方平台 - fix:歇业对接三方平台 - fix:日志 - fix:歇业后自动恢复营业;抖音自动歇业三方对接 - fix:歇业后自动恢复营业;抖音自动歇业三方对接 - fix:火码平台账号处理状态初始化为已处理 - Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up - fix:歇业管理逻辑修改 - 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 'master' into cc_20260408_close_up - 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/126
2026-05-12 08:13:30 +00:00
parent 27af1561ac
commit 56b85c3322
26 changed files with 729 additions and 58 deletions
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
@@ -199,18 +199,21 @@ public class StoreDao {
     * @param closeUpReason 暂停营业原因
     */
    public void closeUp(String storeId, String closeUpReason) {
-        if (storeMapper.updateStatus(storeId, StoreStatusEnum.CLOSE_UP.getValue()) > 0) {
-            storeMapper.insertOrUpdateCloseUpReason(storeId, closeUpReason);
-        }
+        storeMapper.insertOrUpdateCloseUpReason(storeId, closeUpReason, 1);
    }

    /**
     * 暂停营业门店转在营
     */
    public void closeUpToOpen(String storeId) {
-        if (storeMapper.updateStatus(storeId, StoreStatusEnum.OPEN.getValue()) > 0) {
-            storeMapper.insertOrUpdateCloseUpReason(storeId, null);
-        }
+        storeMapper.insertOrUpdateCloseUpReason(storeId, null, 0);
+    }
+
+    /**
+     * 获取门店歇业状态
+     */
+    public Integer getCloseUpStatus(String storeId) {
+        return storeMapper.getCloseUpStatus(storeId);
    }

    /**
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
@@ -44,7 +44,7 @@ public class CloseUpPlatformDAO {
        return list;
    }

-    public List<CloseUpPlatformDO> getList(Long applyId, Integer status, Integer type) {
+    public List<CloseUpPlatformDO> getList(Long applyId, Integer status, Integer type, Boolean hasTaskId) {
        Example example = new Example(CloseUpPlatformDO.class);
        Example.Criteria criteria = example.createCriteria()
                .andEqualTo("applyId", applyId);
@@ -54,6 +54,9 @@ public class CloseUpPlatformDAO {
        if (Objects.nonNull(type)) {
            criteria.andEqualTo("type", type);
        }
+        if (Boolean.TRUE.equals(hasTaskId)) {
+            criteria.andIsNotNull("taskId").andNotEqualTo("taskId", "");
+        }
        return closeUpPlatformMapper.selectByExample(example);
    }

@@ -71,6 +74,13 @@ public class CloseUpPlatformDAO {
        closeUpPlatformMapper.updateByExampleSelective(update, example);
    }

+    public void updateStatusAndTaskId(List<CloseUpPlatformDO> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        closeUpPlatformMapper.updateStatusAndTaskId(list);
+    }
+
    /**
     * 根据申请单id删除
     */
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
@@ -129,7 +129,12 @@ public interface StoreMapper {
     */
    int insertOrUpdateCloseInfo(@Param("storeId") String storeId, @Param("closeReason") Integer closeReason, @Param("closeNature") Integer closeNature);

-    int insertOrUpdateCloseUpReason(@Param("storeId") String storeId, @Param("closeUpReason") String closeUpReason);
+    int insertOrUpdateCloseUpReason(@Param("storeId") String storeId, @Param("closeUpReason") String closeUpReason, @Param("isCloseUp") Integer isCloseUp);
+
+    /**
+     * 获取门店歇业状态
+     */
+    Integer getCloseUpStatus(@Param("storeId") String storeId);

    /**
     * 查询最近没有订货记录的门店
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
@@ -14,4 +14,6 @@ public interface CloseUpPlatformMapper extends Mapper<CloseUpPlatformDO> {
     * 查询待处理的申请单id
     */
    List<Long> selectTodoApplyIds(@Param("applyType") Integer applyType, @Param("storeKeyword") String storeKeyword);
+
+    void updateStatusAndTaskId(@Param("list") List<CloseUpPlatformDO> list);
 }
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -344,12 +344,19 @@
    </insert>

    <insert id="insertOrUpdateCloseUpReason">
-        INSERT INTO store_extend_info_${enterpriseId}(store_id, close_up_reason)
-        VALUES(#{storeId}, #{closeUpReason})
+        INSERT INTO store_extend_info_${enterpriseId}(store_id, close_up_reason, is_close_up)
+        VALUES(#{storeId}, #{closeUpReason}, #{isCloseUp})
        ON DUPLICATE KEY UPDATE
-            close_up_reason = VALUES(close_up_reason)
+            close_up_reason = VALUES(close_up_reason),
+            is_close_up = VALUES(is_close_up)
    </insert>

+    <select id="getCloseUpStatus" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(is_close_up), 0)
+        FROM store_extend_info_${enterpriseId}
+        WHERE store_id = #{storeId}
+    </select>
+
    <select id="getNoOrderStore" resultType="com.cool.store.entity.StoreDO">
        SELECT * FROM store_${enterpriseId} a
        LEFT JOIN store_extend_info_${enterpriseId} b ON a.store_id = b.store_id
--- a/coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
@@ -21,10 +21,11 @@
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
    <result column="urls" jdbcType="LONGVARCHAR" property="urls" />
+    <result column="is_open" jdbcType="TINYINT" property="isOpen" />
  </resultMap>
  <sql id="Base_Column_List_A">
    a.id, a.type, a.store_id, a.apply_no, a.line_id, a.status, a.plan_close_date, a.actual_close_date, a.plan_open_date, a.actual_open_date,
-        a.user_id, a.reason, a.source_apply_id, a.create_time, a.updated_time, a.urls
+        a.user_id, a.reason, a.source_apply_id, a.create_time, a.updated_time, a.urls, a.is_open
  </sql>

  <select id="getList" parameterType="com.cool.store.request.closeup.CloseUpQueryRequest" resultMap="BaseResultMap">
--- a/coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
@@ -16,13 +16,14 @@
    <result column="icon" jdbcType="VARCHAR" property="icon" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
  </resultMap>
  
  <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
-    INSERT INTO zxjp_close_up_platform(apply_id, apply_type, code, name, status, type, task_start_date, icon)
+    INSERT INTO zxjp_close_up_platform(apply_id, apply_type, code, name, status, type, task_start_date, icon, task_id)
    VALUES
    <foreach collection="list" item="item" separator=",">
-      (#{item.applyId}, #{item.applyType}, #{item.code}, #{item.name}, #{item.status}, #{item.type}, #{item.taskStartDate}, #{item.icon})
+      (#{item.applyId}, #{item.applyType}, #{item.code}, #{item.name}, #{item.status}, #{item.type}, #{item.taskStartDate}, #{item.icon}, #{item.taskId})
    </foreach>
  </insert>

@@ -41,4 +42,22 @@
    </if>
    ORDER BY a.create_time DESC
  </select>
+
+  <update id="updateStatusAndTaskId">
+    UPDATE zxjp_close_up_platform
+    SET status = CASE id
+      <foreach collection="list" item="item">
+        WHEN #{item.id} THEN #{item.status}
+      </foreach>
+      END,
+      task_id = CASE id
+      <foreach collection="list" item="item">
+        WHEN #{item.id} THEN #{item.taskId}
+      </foreach>
+      END
+    WHERE id IN
+    <foreach collection="list" item="item" open="(" separator="," close=")">
+      #{item.id}
+    </foreach>
+  </update>
 </mapper>