suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-30 20:12:49 +08:00
parent 3a31cc1350 9aab961f9f
commit 41ef8bbc69
9 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
View File

@@ -130,7 +130,7 @@ public class HyPartnerLineInfoDAO {
return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList); return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList);
} }
public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd, public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd,
String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList){ String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList){
return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd,
intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList); intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList);

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
View File

@@ -167,8 +167,8 @@ public interface HyPartnerLineInfoMapper {
@Param("keywordType") String keywordType, @Param("keywordType") String keywordType,
@Param("workflowStage") String workflowStage, @Param("workflowStage") String workflowStage,
@Param("workflowStatus") String workflowStatus, @Param("workflowStatus") String workflowStatus,
@Param("deadlineStart") Date deadlineStart, @Param("deadlineStart") String deadlineStart,
@Param("deadlineEnd") Date deadlineEnd, @Param("deadlineEnd") String deadlineEnd,
@Param("intentAreaName") String intentAreaName, @Param("intentAreaName") String intentAreaName,
@Param("acceptAdjustType") Integer acceptAdjustType, @Param("acceptAdjustType") Integer acceptAdjustType,
@Param("storeKeyword") String storeKeyword, @Param("storeKeyword") String storeKeyword,

4
coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
View File

@@ -29,10 +29,10 @@ public class PrivateSeaLineListRequest extends PageInfoRequest {
private String workflowStatus; private String workflowStatus;
@ApiModelProperty("截止时间_开始") @ApiModelProperty("截止时间_开始")
private Date deadlineStart; private String deadlineStart;
@ApiModelProperty("截止时间_结束") @ApiModelProperty("截止时间_结束")
private Date deadlineEnd; private String deadlineEnd;
@ApiModelProperty("意向区域") @ApiModelProperty("意向区域")
private String intentArea; private String intentArea;

2
coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java
View File

@@ -28,7 +28,7 @@ public interface ContentService {
* 更新动态信息 * 更新动态信息
* @param dto * @param dto
*/ */
void updateContent(ContentUpdateDto dto); void updateContent(ContentUpdateDto dto) throws ApiException;
/** /**
* 查询动态列表 * 查询动态列表

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java
View File

@@ -63,7 +63,12 @@ public class ContentServiceImpl implements ContentService {
* @param dto * @param dto
*/ */
@Override @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(); HyContentInfoDO hyContentInfoDO = new HyContentInfoDO();
BeanUtil.copyProperties(dto, hyContentInfoDO); BeanUtil.copyProperties(dto, hyContentInfoDO);
hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); hyContentInfoDO.setId(Long.parseLong(dto.getContentId()));

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
View File

@@ -295,7 +295,7 @@ public class FlowServiceImpl implements FlowService {
SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false); SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false);
relshipProves.add(skrRelshipProve); relshipProves.add(skrRelshipProve);
} catch (Exception e) { } catch (Exception e) {
log.info("调用MDM接口出错{}", e.getMessage()); log.info("调用MDM接口出错 url{}, fileUrl{}, e{}", url, fileUrl, e);
throw new ApiException(e.getMessage()); throw new ApiException(e.getMessage());
} finally { } finally {
outputStream.close(); outputStream.close();
@@ -319,7 +319,7 @@ public class FlowServiceImpl implements FlowService {
return JSONObject.toJSONString(responseEntity.getBody().getData()); return JSONObject.toJSONString(responseEntity.getBody().getData());
} }
} catch (Exception e) { } catch (Exception e) {
log.info("调用MDM接口出错{}", e); log.info("调用MDM接口出错 url{}, e{}", url, e);
throw new ApiException(e.getMessage()); throw new ApiException(e.getMessage());
} }
return null; return null;
@@ -340,7 +340,7 @@ public class FlowServiceImpl implements FlowService {
return accessTokenDTO.getAccessToken(); return accessTokenDTO.getAccessToken();
} }
} catch (Exception e) { } catch (Exception e) {
log.info("调用MDM接口出错{}", e); log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e);
throw new ApiException(e.getMessage()); throw new ApiException(e.getMessage());
} }
return null; return null;

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
View File

@@ -267,6 +267,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
@Override @Override
public PartnerIntentInfoVO queryPartnerIntentInfo(PartnerUserInfoVO userInfoVO, Long lineId) { 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); String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId);
if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) {
PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class);
@@ -289,6 +291,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType()); intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType());
} }
intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName());
log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo intentInfoVO:{}", JSONObject.toJSONString(intentInfoVO));
return intentInfoVO; return intentInfoVO;
} }

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java
View File

@@ -114,9 +114,7 @@ public class InterviewWorkFlowService extends WorkFlowBaseService {
(DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0 (DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0
&& DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) { && DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) {
throw new ServiceException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR); throw new ServiceException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR);
} else if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) } 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) {
EntrustOthersReq entrustOthersReq = new EntrustOthersReq(); EntrustOthersReq entrustOthersReq = new EntrustOthersReq();
entrustOthersReq.setInterviewPlanId(interviewInfo.getInterviewPlanId()); entrustOthersReq.setInterviewPlanId(interviewInfo.getInterviewPlanId());
entrustOthersReq.setNewInterviewerId(interviewInfo.getInterviewerId()); entrustOthersReq.setNewInterviewerId(interviewInfo.getInterviewerId());

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java
View File

@@ -48,7 +48,7 @@ public class ContentController {
@PostMapping("/modify") @PostMapping("/modify")
@ApiOperation("修改动态") @ApiOperation("修改动态")
public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) { public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) throws ApiException {
contentService.updateContent(dto); contentService.updateContent(dto);
return ResponseResult.success(); return ResponseResult.success();
} }