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

Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

Browse Source
This commit is contained in:
苏竹红
2023-08-18 10:30:16 +08:00
parent d9a2e0dccc b06b98db5f
commit 88c04db1cd
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
View File

@@ -49,7 +49,7 @@ public class HyFollowTaskDAO {
* @return
*/
public List<HyFollowTaskDO> getFollowTaskList(List<Long> followTaskIds){
if(Objects.isNull(followTaskIds)){
if(CollectionUtils.isEmpty(followTaskIds)){
return null;
}
return hyFollowTaskMapper.getFollowTaskList(followTaskIds);
@@ -90,6 +90,7 @@ public class HyFollowTaskDAO {
HyFollowTaskDO update = new HyFollowTaskDO();
update.setId(followTaskId);
update.setTaskStatus(FollowTaskStatusEnum.FINISHED.getCode());
update.setFinishTime(new Date());
return updateFollowTask(update);
}

12
coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
View File

@@ -10,13 +10,14 @@
<result column="deadline" jdbcType="TIMESTAMP" property="deadline"/>
<result column="communication_content" jdbcType="VARCHAR" property="communicationContent"/>
<result column="task_status" jdbcType="TINYINT" property="taskStatus"/>
<result column="finish_time" jdbcType="TIMESTAMP" property="finishTime"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id, partner_line_id, follow_user_id, task_title, communication_type, deadline, communication_content,
task_status, deleted, create_time, update_time
task_status, finish_time, deleted, create_time, update_time
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_follow_task
@@ -42,6 +43,9 @@
<if test="record.taskStatus != null">
task_status,
</if>
<if test="record.finishTime != null">
finish_time,
</if>
<if test="record.deleted != null">
deleted,
</if>
@@ -74,6 +78,9 @@
<if test="record.taskStatus != null">
#{record.taskStatus},
</if>
<if test="record.finishTime != null">
#{record.finishTime},
</if>
<if test="record.deleted != null">
#{record.deleted},
</if>
@@ -109,6 +116,9 @@
<if test="record.taskStatus != null">
task_status = #{record.taskStatus},
</if>
<if test="record.finishTime != null">
finish_time = #{record.finishTime},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted},
</if>

3
coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
View File

@@ -43,6 +43,9 @@ public class HyFollowTaskDO implements Serializable {
@ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废")
private Integer taskStatus;
@ApiModelProperty("任务截止时间")
private Date finishTime;
@ApiModelProperty("删除标识")
private Boolean deleted;

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

@@ -194,7 +194,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),DateUtil.formatDateTime(new Date()),hyPartnerBaseInfoDO.getUsername(),hyPartnerBaseInfoDO.getMobile());
//作废待完成&已逾期的任务
hyFollowTaskDAO.updateUndoTaskFollowUserId(request.getLineId(), request.getUserId());
hyFollowTaskDAO.cancelUndoFollowTask(request.getLineId());
//添加日志
LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(),