fix 关注任务

netflix-dao/src/main/java/com/cyksj/model/entity/BaseEntity.java

@@ -1,8 +1,6 @@
 package com.cyksj.model.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ejlchina.searcher.bean.DbField;
 import lombok.Data;
@@ -19,7 +17,6 @@ import java.util.Date;
 public class BaseEntity {
 
     @TableId(value = "id",type = IdType.AUTO)
-    @DbField("id")
     private Long id;
 
     /**
@@ -27,13 +24,11 @@ public class BaseEntity {
      */
 
     @DbField("created_time")
-    @TableField(fill = FieldFill.INSERT)
     private Date createdTime;
 
     /**
      * 修改时间
      */
     @DbField("update_time")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

netflix-dao/src/main/java/com/cyksj/model/entity/TaskFollowPlatVerify.java

@@ -4,6 +4,8 @@ import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /*
  *项目名: netflix
  *文件名: TaskFollowPlatVerify
@@ -26,6 +28,8 @@ public class TaskFollowPlatVerify extends BaseEntity {
 
 	private String errorReason;
 
+	private Date verifyTime;
+
 	@Getter
 	public enum Status {
 		verifying("审核中"),

netflix-dao/src/main/java/com/cyksj/model/views/TaskFollowVerifyView.java

@@ -16,7 +16,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "task_follow_plat_verify tv left join user u on u.id = tv.user_id")
+@SearchBean(tables = "task_follow_plat_verify tv left join task t on t.id = tv.task_id" +
+		" left join user u on u.id = tv.user_id")
 public class TaskFollowVerifyView {
 	@DbField("tv.id")
 	private Long id;
@@ -36,9 +37,15 @@ public class TaskFollowVerifyView {
 	@DbField("tv.img")
 	private String img;
 
+	@DbField("t.points")
+	private Integer points;
+
 	@DbField("tv.status")
 	private TaskFollowPlatVerify.Status status;
 
 	@DbField("tv.created_time")
 	private Date createdTime;
+
+	@DbField("tv.verify_time")
+	private Date verifyTime;
 }

netflix-service/src/main/java/com/cyksj/service/market/impl/MarketFrontServiceImpl.java

@@ -318,6 +318,7 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 			record.setUserId(userId);
 			record.setPoints(data.getPoints());
 			record.setStatus(TaskUserCompleteRecord.Status.verifying);
+			taskUserCompleteRecordMapper.insert(record);
 		} catch (DuplicateKeyException e) {
 
 		}
@@ -340,7 +341,7 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 		dbTaskFollowPlatVerify.setImg(taskFollowReq.getImg());
 		taskFollowPlatVerifyMapper.updateById(dbTaskFollowPlatVerify);
 
-		TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectById(Wrappers.lambdaQuery(TaskUserCompleteRecord.class)
+		TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(Wrappers.lambdaQuery(TaskUserCompleteRecord.class)
 				.eq(TaskUserCompleteRecord::getUserId, dbTaskFollowPlatVerify.getUserId())
 				.eq(TaskUserCompleteRecord::getTaskId, dbTaskFollowPlatVerify.getTaskId())
 				.last("limit 1"));

netflix-service/src/main/java/com/cyksj/service/market/task/impl/TaskServiceImpl.java

@@ -118,6 +118,7 @@ public class TaskServiceImpl implements TaskService {
 					}
 				}
 				if (isFlag) {
+					dbPlatVerify.setVerifyTime(DateTime.now());
 					taskFollowPlatVerifyMapper.updateById(dbPlatVerify);
 					TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectById(Wrappers.lambdaQuery(TaskUserCompleteRecord.class)
 							.eq(TaskUserCompleteRecord::getUserId, taskVerify.getUserId())