diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 082d15a82..a10f0a721 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -130,7 +130,7 @@ public class HyPartnerLineInfoDAO { return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList); } - public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd, + public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd, String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList,List developmentManagerList){ return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index b143b1ee8..8acd80697 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -167,8 +167,8 @@ public interface HyPartnerLineInfoMapper { @Param("keywordType") String keywordType, @Param("workflowStage") String workflowStage, @Param("workflowStatus") String workflowStatus, - @Param("deadlineStart") Date deadlineStart, - @Param("deadlineEnd") Date deadlineEnd, + @Param("deadlineStart") String deadlineStart, + @Param("deadlineEnd") String deadlineEnd, @Param("intentAreaName") String intentAreaName, @Param("acceptAdjustType") Integer acceptAdjustType, @Param("storeKeyword") String storeKeyword, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java index 7684ccb2b..7322333b8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java @@ -29,10 +29,10 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { private String workflowStatus; @ApiModelProperty("截止时间_开始") - private Date deadlineStart; + private String deadlineStart; @ApiModelProperty("截止时间_结束") - private Date deadlineEnd; + private String deadlineEnd; @ApiModelProperty("意向区域") private String intentArea; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java index 99ad039cf..487127543 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java @@ -28,7 +28,7 @@ public interface ContentService { * 更新动态信息 * @param dto */ - void updateContent(ContentUpdateDto dto); + void updateContent(ContentUpdateDto dto) throws ApiException; /** * 查询动态列表 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java index f6522a26f..56fbf9e2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java @@ -63,7 +63,12 @@ public class ContentServiceImpl implements ContentService { * @param dto */ @Override - public void updateContent(ContentUpdateDto dto) { + public void updateContent(ContentUpdateDto dto) throws ApiException { + //增加不允许重复标题的逻辑 + Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle()); + if (isDuplicated) { + throw new ApiException(ErrorCodeEnum.CONTENT_DUPLICATED); + } HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); BeanUtil.copyProperties(dto, hyContentInfoDO); hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index f82422d77..55edc289d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -295,7 +295,7 @@ public class FlowServiceImpl implements FlowService { SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false); relshipProves.add(skrRelshipProve); } catch (Exception e) { - log.info("调用MDM接口出错{}", e.getMessage()); + log.info("调用MDM接口出错 url{}, fileUrl{}, e{}", url, fileUrl, e); throw new ApiException(e.getMessage()); } finally { outputStream.close(); @@ -319,7 +319,7 @@ public class FlowServiceImpl implements FlowService { return JSONObject.toJSONString(responseEntity.getBody().getData()); } } catch (Exception e) { - log.info("调用MDM接口出错{}", e); + log.info("调用MDM接口出错 url{}, e{}", url, e); throw new ApiException(e.getMessage()); } return null; @@ -340,7 +340,7 @@ public class FlowServiceImpl implements FlowService { return accessTokenDTO.getAccessToken(); } } catch (Exception e) { - log.info("调用MDM接口出错{}", e); + log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e); throw new ApiException(e.getMessage()); } return null; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index cc4760fce..06d85d45f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -267,6 +267,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic @Override public PartnerIntentInfoVO queryPartnerIntentInfo(PartnerUserInfoVO userInfoVO, Long lineId) { + log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo userInfoVO:{}", JSONObject.toJSONString(userInfoVO)); + String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId); if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); @@ -289,6 +291,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType()); } intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); + log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo intentInfoVO:{}", JSONObject.toJSONString(intentInfoVO)); + return intentInfoVO; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java index 1c46a2378..2efdf17a2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java @@ -114,9 +114,7 @@ public class InterviewWorkFlowService extends WorkFlowBaseService { (DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0 && DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) { throw new ServiceException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR); - } else if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) - &&(interviewInfo.getRoomStatus()!=null && String.valueOf(RoomStatus.WAIT_FOR_OPEN.getCode()).equals(interviewInfo.getRoomStatus())) - && DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) < 0) { + } else if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode())) { EntrustOthersReq entrustOthersReq = new EntrustOthersReq(); entrustOthersReq.setInterviewPlanId(interviewInfo.getInterviewPlanId()); entrustOthersReq.setNewInterviewerId(interviewInfo.getInterviewerId()); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java index feaba9dcf..28d75e5cf 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java @@ -48,7 +48,7 @@ public class ContentController { @PostMapping("/modify") @ApiOperation("修改动态") - public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) { + public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) throws ApiException { contentService.updateContent(dto); return ResponseResult.success(); }