Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4

@@ -16,6 +16,6 @@ public class SellerTask {
     private long id;
     private long id;
     private int uid;
     private int uid;
     private int type;
     private int type;
-    private String taskDesc;
+    private String taskMeta;
     private int createTime;
     private int createTime;
 }
 }

@@ -3,7 +3,7 @@
 <mapper namespace="com.yohoufo.dal.order.SellerTaskMapper">
 <mapper namespace="com.yohoufo.dal.order.SellerTaskMapper">
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.SellerTask"
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.SellerTask"
             useGeneratedKeys="true">
             useGeneratedKeys="true">
-        insert into seller_task (uid, type, task_desc, create_time)
-        values (#{uid,jdbcType=INTEGER}, #{type,jdbcType=INTEGER},#{taskDesc,jdbcType=VARCHAR}, #{createTime,jdbcType=INTEGER})
+        insert into seller_task (uid, type, task_meta, create_time)
+        values (#{uid,jdbcType=INTEGER}, #{type,jdbcType=INTEGER},#{taskMeta,jdbcType=VARCHAR}, #{createTime,jdbcType=INTEGER})
     </insert>
     </insert>
 </mapper>
 </mapper>

@@ -13,15 +13,15 @@ public class SellerTaskDTO<T> {
     //任务类型
     //任务类型
     private int taskType;
     private int taskType;
     //任务描述，会保存,json
     //任务描述，会保存,json
-    private String taskDesc;
+    private String taskMeta;
     private final ISellerTaskHandler taskHandler;
     private final ISellerTaskHandler taskHandler;
     private T processData;
     private T processData;
 
 
-    public SellerTaskDTO(int uid, int taskType, ISellerTaskHandler taskHandler, String taskDesc, T processData) {
+    public SellerTaskDTO(int uid, int taskType, ISellerTaskHandler taskHandler, String taskMeta, T processData) {
         this.uid = uid;
         this.uid = uid;
         this.taskType = taskType;
         this.taskType = taskType;
         this.taskHandler = taskHandler;
         this.taskHandler = taskHandler;
-        this.taskDesc = taskDesc;
+        this.taskMeta = taskMeta;
         this.processData = processData;
         this.processData = processData;
     }
     }
 
 
@@ -49,7 +49,8 @@ public class SellerTaskDTO<T> {
         return taskType;
         return taskType;
     }
     }
 
 
-    public String getTaskDesc() {
-        return taskDesc;
+    public String getTaskMeta() {
+        return taskMeta;
     }
     }
 }
 }
+

@@ -40,7 +40,7 @@ public class SellerTaskProcessor {
         SellerTask record = SellerTask.builder()
         SellerTask record = SellerTask.builder()
                 .uid(taskDto.getUid())
                 .uid(taskDto.getUid())
                 .type(taskDto.getTaskType())
                 .type(taskDto.getTaskType())
-                .taskDesc(taskDto.getTaskDesc())
+                .taskMeta(taskDto.getTaskMeta())
                 .createTime(DateUtil.getCurrentTimeSecond()).build();
                 .createTime(DateUtil.getCurrentTimeSecond()).build();
         sellerTaskMapper.insert(record);
         sellerTaskMapper.insert(record);
         return record.getId();
         return record.getId();