From 3b1e6f6cb9386927dac708fb0552961565f04593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Mon, 23 Mar 2026 09:00:10 +0000 Subject: [PATCH] Merge #69 into master from cc_20250922_closeStore_w MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:闭店材料字段新增 * cc_20250922_closeStore_w: (74 commits squashed) - feat:闭店流程init - feat:闭店流程接口 - feat:闭店 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w - fix:闭店材料模块 - fix:账号关闭流程 - feat:闭店审批流程（未测）；字典表 - fix:闭店审批流程完善 - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店流程流转补充 - feat:闭店退款 - fix:字典表接口 - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店原因接口新增闭店发起方式字段 - fix:修改审批记录返回数据类型 feat:新增退款流程跳过 - fix - fix:新增字段 - feat:新增闭店退款提交人列表接口 - fix:闭店初始化数据来源修改；小程序闭店材料详情新增模板url字段 - fix:新增接口返回字段 - fix:闭店管理、审批待办类别所属品牌筛选改为多选 - fix:闭店管理列表新增完成阶段数量字段 - feat:新增第三方闭店申请接口 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java # 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 - fix:自动发起闭店申请定时任务 - feat:火码账号关闭 - fix:闭店流程修改 - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java - fix:删除云流水发起闭店接口 - fix:取消闭店申请入参修改 - fix:闭店申请列表赋值异常问题 - fix:闭店审批通过异常 - fix:普通方法参数校验 - fix:账号关闭时校验阶段状态 - fix:初始化 - fix:字段新增 - fix:接口补充 - fix - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # 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-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/common/InsertGroup.java # coolstore-partner-common/src/main/java/com/cool/store/common/UpdateGroup.java # 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-dao/src/main/java/com/cool/store/dao/dict/SysDictColumnDAO.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/dict/SysDictColumnMapper.java # coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml # coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DictManagerController.java # coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:闭店流程修改 - fix:闭店流程修改 - fix:修改三方付款状态接口 - fix:闭店申请测试接口 - fix:退款供应商接口补充 - fix:支行列表接口 - fix:错误信息修改 - Merge branch 'master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java # coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java # coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjSavePartnerRequest.java # coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java # coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreRefundServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreRefundController.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java # coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:闭店材料详情接口新增字段 - fix:闭店材料修改单个材料时，去除审批状态 - Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w - fix:闭店材料详情接口新增模板链接字段 - fix:闭店材料详情新增材料状态转义字段 - Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w - fix:新管家应退实退金额字段修改 - fix:闭店支行测试环境mock - fix:redis报错修复 - fix:新管家关店原因字段补充 - fix:新增字段 - fix:字段补充 - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息 - fix:小程序退款信息列表修改 - fix:闭店审批允许管理员审批 - fix:阶段名称修改 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店 - fix:提交新管家字段取值逻辑修改 - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w - fix:闭店定时任务过滤闭店状态补充 - Merge branch 'master' into cc_20250922_closeStore_w - fix:闭店材料新增字段 - fix - fix:小程序闭店材料详情新增字段 - fix:闭店流程流转校验除授权书外是否已邮寄 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/69 --- .../java/com/cool/store/dao/CloseStoreFileInfoDAO.java | 4 ++-- .../main/java/com/cool/store/dao/CloseStoreInfoDAO.java | 4 +++- .../com/cool/store/mapper/CloseStoreFileInfoMapper.java | 2 +- .../src/main/resources/mapper/CloseStoreFileInfoMapper.xml | 3 +++ .../java/com/cool/store/entity/CloseStoreFileInfoDO.java | 6 ++++++ .../request/close/file/CloseStoreFileSubmitRequest.java | 3 +++ .../cool/store/vo/close/file/CloseStoreFileInfoMiniVO.java | 3 +++ .../com/cool/store/vo/close/file/CloseStoreFileInfoVO.java | 3 +++ .../service/close/impl/CloseStoreFileServiceImpl.java | 7 +++++-- 9 files changed, 29 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java index 6030f43d7..ad91091fa 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreFileInfoDAO.java @@ -55,8 +55,8 @@ public class CloseStoreFileInfoDAO { /** * 提交材料 */ - public Boolean updateFile(Long id, String urls) { - return closeStoreFileInfoMapper.updateFile(id, urls) > 0; + public Boolean updateFile(Long id, String urls, Integer receivedFile) { + return closeStoreFileInfoMapper.updateFile(id, urls, receivedFile) > 0; } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreInfoDAO.java index a47736dfe..1d2d39c2e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/CloseStoreInfoDAO.java @@ -50,7 +50,9 @@ public class CloseStoreInfoDAO { public boolean existOngoingRecord(String storeId) { Example example = new Example(CloseStoreInfoDO.class); example.createCriteria().andEqualTo("storeId", storeId) - .andIn("closeStatus", Arrays.asList(CloseStoreStatusEnum.UNDER_APPROVAL.getCloseStoreStatus(), CloseStoreStatusEnum.CLOSING.getCloseStoreStatus())); + .andIn("closeStatus", Arrays.asList(CloseStoreStatusEnum.UNDER_APPROVAL.getCloseStoreStatus(), + CloseStoreStatusEnum.MANAGER_UNDER_APPROVAL.getCloseStoreStatus(), + CloseStoreStatusEnum.CLOSING.getCloseStoreStatus())); return closeStoreInfoMapper.selectCountByExample(example) > 0; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CloseStoreFileInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CloseStoreFileInfoMapper.java index 68847b2f2..c82991056 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CloseStoreFileInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CloseStoreFileInfoMapper.java @@ -27,7 +27,7 @@ public interface CloseStoreFileInfoMapper extends Mapper { * @param id 主键id * @param urls 图片列表 */ - int updateFile(@Param("id") Long id, @Param("urls") String urls); + int updateFile(@Param("id") Long id, @Param("urls") String urls, @Param("receivedFile") Integer receivedFile); /** * 更新材料状态为审批状态 diff --git a/coolstore-partner-dao/src/main/resources/mapper/CloseStoreFileInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/CloseStoreFileInfoMapper.xml index 870422d62..78d25bf04 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/CloseStoreFileInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/CloseStoreFileInfoMapper.xml @@ -56,6 +56,9 @@ SET urls = #{urls}, file_status = CASE WHEN file_status = 2 THEN 5 WHEN file_status = 5 THEN 5 ELSE 3 END, approve_status = NULL + + , received_file = #{receivedFile} + WHERE id = #{id} AND file_status IN (0, 2, 3, 5) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java index e511658f5..5929ae226 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/CloseStoreFileInfoDO.java @@ -77,4 +77,10 @@ public class CloseStoreFileInfoDO { */ @Column(name = "urls") private String urls; + + /** + * 是否收到材料 0已收到 1未收到 2已遗失 + */ + @Column(name = "received_file") + private Integer receivedFile; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java index 4eec07d50..226b1a8de 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/file/CloseStoreFileSubmitRequest.java @@ -25,4 +25,7 @@ public class CloseStoreFileSubmitRequest { @ApiModelProperty("图片列表，逗号隔开") private String urls; + + @ApiModelProperty("是否收到材料 0已收到 1未收到 2已遗失") + private Integer receivedFile; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoMiniVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoMiniVO.java index 93dd1ac58..6ab275c0a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoMiniVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoMiniVO.java @@ -41,6 +41,9 @@ public class CloseStoreFileInfoMiniVO { @ApiModelProperty("图片列表") private String urls; + @ApiModelProperty("是否收到材料 0已收到 1未收到 2已遗失") + private Integer receivedFile; + public String getFileStatusName() { return FileStatusEnum.getDescByStatus(this.fileStatus); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java index 94dd7a6f2..40fdb91db 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/close/file/CloseStoreFileInfoVO.java @@ -44,6 +44,9 @@ public class CloseStoreFileInfoVO { @ApiModelProperty("图片列表") private String urls; + @ApiModelProperty("是否收到材料 0已收到 1未收到 2已遗失") + private Integer receivedFile; + public String getFileStatusName() { return FileStatusEnum.getDescByStatus(this.fileStatus); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreFileServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreFileServiceImpl.java index 52a103a88..ff073f673 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreFileServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreFileServiceImpl.java @@ -113,7 +113,10 @@ public class CloseStoreFileServiceImpl implements CloseStoreFileService { */ private void verifyComplete(CloseStoreFileInfoRequest request) { List fileList = closeStoreFileInfoDAO.getByCloseStoreId(request.getCloseStoreId()); - boolean completeApprove = fileList.stream().allMatch(v -> Objects.nonNull(v.getApproveStatus()) && CommonConstants.INDEX_ONE.equals(v.getMailStatus())); + // 除了授权书其他材料完成邮寄 + boolean completeApprove = fileList.stream() + .filter(v -> !CloseStoreFileEnum.SQS.getCode().equals(v.getFileCode())) + .allMatch(v -> Objects.nonNull(v.getApproveStatus()) && CommonConstants.INDEX_ONE.equals(v.getMailStatus())); if (completeApprove) { closeStoreFileDetailDAO.insertOrUpdateFileInfoSelective(CloseStoreFileApproveRequest.builder().closeStoreId(request.getCloseStoreId()).build(), true); boolean pass = fileList.stream().allMatch(v -> CommonConstants.INDEX_ONE.equals(v.getApproveStatus())); @@ -198,7 +201,7 @@ public class CloseStoreFileServiceImpl implements CloseStoreFileService { public Boolean updateFile(CloseStoreFileSubmitRequest request) { CloseStoreSubStageStatusEnum[] conditions = {CLOSE_STORE_SUB_STAGE_STATUS_15, CLOSE_STORE_SUB_STAGE_STATUS_17, CLOSE_STORE_SUB_STAGE_STATUS_19}; closeStoreStageInfoDAO.verifyStage(request.getCloseStoreId(), STAGE, SUB_STAGE, conditions); - return closeStoreFileInfoDAO.updateFile(request.getId(), request.getUrls()); + return closeStoreFileInfoDAO.updateFile(request.getId(), request.getUrls(), request.getReceivedFile()); } @Override