lyhzzz пре 1 година
родитељ
комит
d269e14701

+ 4 - 3
src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -191,16 +191,17 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         user.setPassword(passwordMd5);
         user.setStatus(1);
         user.setIsNotice(1);
-        user.setRegisterTime(new Date());
         user.setUserName(userName);
         user.setNickName(nickName);
         user.setCountry("86");
         user.setDownloadNumTotal(1000);
         user.setDownloadNum(0);
-        user.setCreateTime(new Date());
         user.setRecStatus("A");
+        if(userId == null){
+            user.setRegisterTime(new Date());
+            user.setCreateTime(new Date());
+        }
         user.setUpdateTime(new Date());
-        user.setUpdateTime(null);
         this.saveOrUpdate(user);
         return user;
     }

+ 5 - 1
src/main/java/com/fdkankan/manage/vo/response/UserVo.java

@@ -1,14 +1,18 @@
 package com.fdkankan.manage.vo.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class UserVo {
     private Long id;
     private String userName;
     private String nickName;
     private String email;
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
     private Integer vip;            //是否 vip  0 否,1是  (根据权益数量判定)
 
     private Long incrementCount;    //权益数量