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