Merge #149 into master from cc_20260408_close_up_v2

fix:歇业管理优化 * cc_20260408_close_up_v2: (37 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 - fix:平台关闭开启处理自动发起三方调用 - Merge branch 'master' into cc_20260408_close_up_v2 # Conflicts: #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:平台关闭开启时调用三方平台接口 - fix:修复自动关闭三方平台状态更新失败的问题 - Merge branch 'refs/heads/master' into cc_20260408_close_up_v2 - fix:修复三方门店歇业失败时POS待办不更新的问题 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/149
2026-05-26 09:21:02 +00:00
parent ce882e5d87
commit 567ff3536f
11 changed files with 163 additions and 43 deletions
--- 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, Boolean hasTaskId) {
+    public List<CloseUpPlatformDO> getList(Long applyId, Integer status, Integer type, Boolean hasTaskId, Boolean needQueryTask) {
        Example example = new Example(CloseUpPlatformDO.class);
        Example.Criteria criteria = example.createCriteria()
                .andEqualTo("applyId", applyId);
@@ -57,13 +57,16 @@ public class CloseUpPlatformDAO {
        if (Boolean.TRUE.equals(hasTaskId)) {
            criteria.andIsNotNull("taskId").andNotEqualTo("taskId", "");
        }
+        if (Boolean.TRUE.equals(needQueryTask)) {
+            criteria.andNotEqualTo("taskStatus", 0);
+        }
        return closeUpPlatformMapper.selectByExample(example);
    }

    /**
     * 更新状态
     */
-    public void updateStatusByIds(List<Long> ids, Integer status) {
+    public void updateStatusByIds(List<Long> ids, Integer status, Integer taskStatus) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
@@ -71,6 +74,9 @@ public class CloseUpPlatformDAO {
        example.createCriteria()
                .andIn("id", ids);
        CloseUpPlatformDO update = CloseUpPlatformDO.builder().status(status).build();
+        if (Objects.nonNull(taskStatus)) {
+            update.setTaskStatus(taskStatus);
+        }
        closeUpPlatformMapper.updateByExampleSelective(update, example);
    }

@@ -81,6 +87,13 @@ public class CloseUpPlatformDAO {
        closeUpPlatformMapper.updateStatusAndTaskId(list);
    }

+    public void updateStatusAndTaskIdExcludeTaskStatus(List<CloseUpPlatformDO> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        closeUpPlatformMapper.updateStatusAndTaskIdExcludeTaskStatus(list);
+    }
+
    /**
     * 根据申请单id删除
     */
@@ -94,4 +107,8 @@ public class CloseUpPlatformDAO {
    public List<Long> selectTodoApplyIds(Integer applyType, String storeKeyword) {
        return closeUpPlatformMapper.selectTodoApplyIds(applyType, storeKeyword);
    }
+
+    public CloseUpPlatformDO getById(Long id) {
+        return closeUpPlatformMapper.selectByPrimaryKey(id);
+    }
 }
--- 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
@@ -16,4 +16,6 @@ public interface CloseUpPlatformMapper extends Mapper<CloseUpPlatformDO> {
    List<Long> selectTodoApplyIds(@Param("applyType") Integer applyType, @Param("storeKeyword") String storeKeyword);

    void updateStatusAndTaskId(@Param("list") List<CloseUpPlatformDO> list);
+
+    void updateStatusAndTaskIdExcludeTaskStatus(@Param("list") List<CloseUpPlatformDO> list);
 }
--- a/coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
@@ -54,10 +54,33 @@
      <foreach collection="list" item="item">
        WHEN #{item.id} THEN #{item.taskId}
      </foreach>
+      END,
+      task_status = CASE id
+      <foreach collection="list" item="item">
+        WHEN #{item.id} THEN #{item.taskStatus}
+      </foreach>
      END
    WHERE id IN
    <foreach collection="list" item="item" open="(" separator="," close=")">
      #{item.id}
    </foreach>
  </update>
+
+  <update id="updateStatusAndTaskIdExcludeTaskStatus">
+    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>