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:
苏竹红
2023-06-30 09:27:21 +08:00
parent 2e2bcb02d8 01b0284dc0
commit 35d3a93515
15 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/pom.xml
View File

@@ -102,7 +102,7 @@
<dependency>
<groupId>org.icepdf.os</groupId>
<artifactId>icepdf-core</artifactId>
<version>6.1.2</version>
<version>6.2.2</version>
<exclusions>
<exclusion>
<groupId>javax.media</groupId>

2
coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java
View File

@@ -155,7 +155,7 @@ public class PDFUtils {
document.dispose();
return outputStream;
}
} catch (PDFException | IOException | PDFSecurityException e) {
} catch (PDFException | IOException | InterruptedException | PDFSecurityException e) {
log.error("PDF转图片异常, e{}", e.getMessage());
} finally {
try {

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

@@ -41,9 +41,9 @@ public interface HyContentInfoMapper {
/**
* B 端使用的动态查询
* C 端使用的动态查询
*/
List<HyContentInfoVO> queryContentListForB(ContentQueryListDto dto);
List<HyContentInfoVO> queryContentListForC(ContentQueryListDto dto);
/**
* 根据contentId查询动态详情

10
coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml
View File

@@ -24,7 +24,7 @@
</resultMap>
<sql id="Base_Column_List">
id, content_title, subject, content_type, cover, content, status, deleted, create_time, update_time,
id, content_title, `subject`, content_type, cover, content, `status`, deleted, create_time, update_time,
create_user_id, update_user_id
</sql>
<sql id="Blob_Column_List">
@@ -165,6 +165,7 @@
<if test="endTime != null and endTime != ''">
and update_time &lt;= #{endTime}
</if>
order by update_time desc
</select>
<select id="getUpdateUserName" resultType="string">
select name
@@ -179,12 +180,12 @@
and user_id = #{updateUserId}
</select>
<!-- B 端使用的动态查询 -->
<select id="queryContentListForB" resultType="com.cool.store.vo.HyContentInfoVO">
<!-- C 端使用的动态查询 -->
<select id="queryContentListForC" resultType="com.cool.store.vo.HyContentInfoVO">
select <include refid="Base_Column_List"></include>
from hy_content_info
where deleted = 0
and status = 1
and status = 0
<if test="contentTitle != null and contentTitle != ''">
and content_title like concat('%', #{contentTitle}, '%')
</if>
@@ -200,6 +201,7 @@
<if test="endTime != null and endTime != ''">
and update_time &lt;= #{endTime}
</if>
order by update_time desc
</select>
<!-- 查询动态详情 -->

6
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -357,13 +357,13 @@
and hpui.mobile like concat('%',#{record.partnerMobile},'%')
</if>
<if test="record.roomId !=null and record.roomId!=''">
and hpip.room_id = #{record.roomId}
and hpip.room_id like concat('%', #{record.roomId}, '%')
</if>
<if test="record.interviewerName !=null and record.interviewerName!=''">
and hpui.username like concat('%',#{record.interviewerName},'%')
and eu.name like concat('%',#{record.interviewerName},'%')
</if>
<if test="record.interviewerMobile !=null and record.interviewerMobile!=''">
and hpui.mobile like concat('%',#{record.interviewerMobile},'%')
and eu.mobile like concat('%',#{record.interviewerMobile},'%')
</if>
<if test="record.roomStatus !=null">
and hpip.room_status = #{record.roomStatus}

2
coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java
View File

@@ -7,6 +7,6 @@ import lombok.Data;
public class ContentQueryTitlesDto {
@ApiModelProperty("用户输入标题")
private String tittle;
private String title;
}

24
coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java
View File

@@ -63,18 +63,18 @@ public class JobHandler {
}
}
@XxlJob("updateAbsentInterview")
public void updateAbsentInterview(){
try {
log.info("面试缺席定时任务开始");
hyPartnerInterviewPlanService.updateAbsentInterview();
log.info("面试缺席定时任务结束");
XxlJobHelper.handleSuccess();
}catch (Exception e){
log.error("面试缺席定时任务异常",e);
XxlJobHelper.log("面试缺席定时任务异常"+e.getMessage());
}
}
// @XxlJob("updateAbsentInterview")
// public void updateAbsentInterview(){
// try {
// log.info("面试缺席定时任务开始");
// hyPartnerInterviewPlanService.updateAbsentInterview();
// log.info("面试缺席定时任务结束");
// XxlJobHelper.handleSuccess();
// }catch (Exception e){
// log.error("面试缺席定时任务异常",e);
// XxlJobHelper.log("面试缺席定时任务异常"+e.getMessage());
// }
// }
@XxlJob("approvalReminder")
public void approvalReminder(){

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

@@ -35,6 +35,11 @@ public interface ContentService {
*/
List<HyContentInfoVO> queryContentList(ContentQueryListDto dto);
/**
* 查询动态列表 C 端用
*/
List<HyContentInfoVO> queryContentListToC(ContentQueryListDto dto);
/**
* 查询动态详情
* @param contentId

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

@@ -75,7 +75,15 @@ public class ContentServiceImpl implements ContentService {
*/
@Override
public List<HyContentInfoVO> queryContentList(ContentQueryListDto dto) {
return contentInfoMapper.queryContentListForB(dto);
return contentInfoMapper.queryContentList(dto);
}
/**
* 查询动态列表 C 端用
*/
@Override
public List<HyContentInfoVO> queryContentListToC(ContentQueryListDto dto) {
return contentInfoMapper.queryContentListForC(dto);
}
/**

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

@@ -146,7 +146,7 @@ public class FlowServiceImpl implements FlowService {
String jobNumber = investmentManager.getJobnumber();
String mobile = investmentManager.getMobile();
DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) {
if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) {
throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
}
rpcRequest.setDingUserId(dingdingUserDO.getUserid());
@@ -158,7 +158,7 @@ public class FlowServiceImpl implements FlowService {
if (!Objects.isNull(developmentDirector)) {
String mobile = developmentDirector.getMobile();
DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) {
if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) {
throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
}
rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid());
@@ -217,7 +217,6 @@ public class FlowServiceImpl implements FlowService {
}
@Override
@Transactional
public void qualificationCallback(QualificationCallbackReq request) {
log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request));
//1. 信息是否完整
@@ -252,6 +251,7 @@ public class FlowServiceImpl implements FlowService {
// TODO pass_reason 暂无
Date passDate = new Date(request.getModifiedTime());
//3. 生成通过函并修改数据库相关信息
//TODO 问题：如果因为 pdf 生成失败或者其他原因导致异常，但是由于 MDM 只是做回调，不对回调是否成功负责，会导致流程信息缺失
genPassLetterAndUpdateDB(partnerName, verifyCity, passDate, interviewId);
// TODO 4. 修改流程状态到下一阶段 4 分配选址开发经理
//审核未通过

14
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java
View File

@@ -179,11 +179,14 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
return;
}
List<Long> lineIds = overTimeReserveLineList.stream().map(o -> o.getId()).collect(Collectors.toList());
List<HyPartnerInterviewDO> interviewBaseInfoList = hyPartnerInterviewMapper.getInterviewBaseInfoListByLineIds(lineIds);
if(CollectionUtils.isEmpty(interviewBaseInfoList)){
return;
for (Long lineId : lineIds) {
CloseFollowRequest closeFollowRequest = new CloseFollowRequest();
closeFollowRequest.setRejectPublicReason("超时未预约");
closeFollowRequest.setRejectRealReason("超时未预约");
closeFollowRequest.setLineId(lineId);
closeFollowRequest.setType("overtime_interview");
hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest);
}
handleOverTimeInterview(interviewBaseInfoList,"超时未预约");
}
@Override
@@ -192,7 +195,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
//更新会议开始时间为5分钟之内的房间状态为开启,会议状态变为已开始
Date startTime = new Date();
List<HyPartnerLineInfoDO> waitForOpenInterviewLineList = hyPartnerLineInfoMapper.getWaitForOpenInterviewLineList(startTime, DateUtil.offsetMinute(startTime, 5));
List<HyPartnerLineInfoDO> waitForOpenInterviewLineList = hyPartnerLineInfoMapper.getWaitForOpenInterviewLineList(DateUtil.offsetDay(startTime,-2), DateUtil.offsetMinute(startTime, 5));
if(CollectionUtils.isEmpty(waitForOpenInterviewLineList)){
return;
}
@@ -248,6 +251,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
for (Long lineId : lineIds) {
CloseFollowRequest closeFollowRequest = new CloseFollowRequest();
closeFollowRequest.setRejectPublicReason(rejectPublicReason);
closeFollowRequest.setRejectRealReason(rejectPublicReason);
closeFollowRequest.setLineId(lineId);
closeFollowRequest.setType("overtime_interview");
hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest);

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
View File

@@ -258,6 +258,7 @@ public class InterviewServiceImpl implements InterviewService {
record.setId(Long.valueOf(request.getInterviewPlanId()));
record.setStartTime(Convert.toDate(request.getNewStartBookingTime()));
record.setInterviewDate(Convert.toDate(request.getNewStartBookingTime()));
record.setEndTime(Convert.toDate(request.getNewEndBookingTime()));
record.setUpdateTime(new Date());
hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record);

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java
View File

@@ -187,6 +187,7 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO();
record.setId(Long.valueOf(request.getInterviewPlanId()));
record.setStartTime(Convert.toDate(request.getNewStartBookingTime()));
record.setInterviewDate(Convert.toDate(request.getNewStartBookingTime()));
record.setEndTime(Convert.toDate(request.getNewEndBookingTime()));
record.setUpdateTime(new Date());
interviewPlanMapper.updateByPrimaryKeySelective(record);

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

@@ -30,7 +30,7 @@ public class ContentController {
@PostMapping("/queryTitles")
@ApiOperation("搜索标题是否重复")
public ResponseResult<Boolean> queryTitles(@RequestBody ContentQueryTitlesDto title) {
return ResponseResult.success(contentService.queryTitles(title.getTittle()));
return ResponseResult.success(contentService.queryTitles(title.getTitle()));
}
@PostMapping("/add")

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

@@ -29,7 +29,7 @@ public class ContentController {
@ApiOperation("查询动态列表")
public ResponseResult<PageInfo<HyContentInfoVO>> queryContentList(@RequestBody ContentQueryListDto dto) {
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<HyContentInfoVO> list = contentService.queryContentList(dto);
List<HyContentInfoVO> list = contentService.queryContentListToC(dto);
PageInfo<HyContentInfoVO> page = new PageInfo<>(list);
return ResponseResult.success(page);
}