Longlin 5 лет назад
Родитель
Сommit
723bc1abde

+ 27 - 0
whepi-web/src/main/java/com/bofeng/entity/JmTuangou.java

@@ -34,6 +34,11 @@ public class JmTuangou implements Serializable {
     private String tgTitle;
 
     /**
+     * 团购标题
+     */
+    private String tgType;
+
+    /**
      * 团购供应商
      */
     private String tgSupplier;
@@ -101,5 +106,27 @@ public class JmTuangou implements Serializable {
 
     private Integer count;
 
+    /**
+     * 新增人
+     */
+    private Long userCreate;
+
+    /**
+     * 新增时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date timeCreate;
+
+    /**
+     * 修改人
+     */
+    private Long userUpdate;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date timeUpdate;
+
     private static final long serialVersionUID = 1L;
 }

+ 10 - 0
whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java

@@ -67,6 +67,11 @@ public class JmTuangouService {
     jmTuangou.setTgEndTime(tgEndTime);
     jmTuangou.setTgDeliverTime(tgDeliverTime);
 
+    jmTuangou.setUserCreate(jmTuangou.getUserId());
+    jmTuangou.setTimeCreate(new Date());
+    jmTuangou.setUserUpdate(jmTuangou.getUserId());
+    jmTuangou.setTimeUpdate(new Date());
+
     return jmTuangouDao.insert(jmTuangou);
   }
 
@@ -185,6 +190,11 @@ public class JmTuangouService {
     jmTuangou.setTgStatus(1);
     jmTuangou.setUserId(JwtHelper.getUserId());
 
+    jmTuangou.setUserCreate(JwtHelper.getUserId());
+    jmTuangou.setTimeCreate(new Date());
+    jmTuangou.setUserUpdate(JwtHelper.getUserId());
+    jmTuangou.setTimeUpdate(new Date());
+
     return jmTuangouDao.insert(jmTuangou);
   }
 

+ 4 - 4
whepi-web/src/main/resources/mapper/JmTuangouMapper.xml

@@ -58,15 +58,15 @@
     </select>
 
     <update id="updateRemarkByJmId">
-        update jm_tuangou set remark=#{remark} where jm_id=#{JmId}
+        update jm_tuangou set remark=#{remark}, time_update=now() where jm_id=#{JmId}
     </update>
 
     <update id="updateStatusByJmId">
-        update jm_tuangou set tg_status=#{status} where jm_id=#{JmId}
+        update jm_tuangou set tg_status=#{status}, time_update=now() where jm_id=#{JmId}
     </update>
 
     <update id="updateStatusRemarkByJmId">
-        update jm_tuangou set tg_status=#{status},remark=#{remark} where jm_id=#{JmId}
+        update jm_tuangou set tg_status=#{status},remark=#{remark}, time_update=now() where jm_id=#{JmId}
     </update>
 
     <select id="selectAll" resultType="com.bofeng.entity.JmTuangou">
@@ -75,7 +75,7 @@
 
     <update id="updateAll">
         <foreach collection="tg" item="item" index="index" separator=";">
-            update jm_tuangou set tg_status=#{item.tgStatus} where jm_id=#{item.jmId}
+            update jm_tuangou set tg_status=#{item.tgStatus}, time_update=now() where jm_id=#{item.jmId}
         </foreach>
     </update>