From 476bcf0a8988c4131aeba6cac8fa091fca8bf575 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Thu, 20 Jul 2023 10:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/UserRegionMappingMapper.xml          |  4 ++--
 .../cool/store/entity/UserRegionMappingDO.java  | 17 +++++++++--------
 .../store/service/impl/LoginServiceImpl.java    |  1 -
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml
index abc0da398..f5573a7fc 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml
@@ -8,9 +8,9 @@
         <result column="type" jdbcType="INTEGER" property="type"/>
         <result column="deleted" jdbcType="BIT" property="deleted"/>
         <result column="create_id" jdbcType="VARCHAR" property="createId"/>
-        <result column="create_time" jdbcType="BIGINT" property="createTime"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_id" jdbcType="VARCHAR" property="updateId"/>
-        <result column="update_time" jdbcType="BIGINT" property="updateTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
         id, region_id, user_id, type, deleted, create_id, create_time, update_id, update_time
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java
index 0766bda0f..1970d919b 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java
@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -47,13 +48,13 @@ public class UserRegionMappingDO implements Serializable {
     private String createId;
 
     @ApiModelProperty("创建时间")
-    private Long createTime;
+    private Date createTime;
 
     @ApiModelProperty("更新人")
     private String updateId;
 
     @ApiModelProperty("更新时间")
-    private Long updateTime;
+    private Date updateTime;
 
     public static List<UserRegionMappingDO> convertSyncDO(String regionId, List<EnterpriseUserDTO> departmentUsers){
         if(CollectionUtils.isEmpty(departmentUsers)){
@@ -65,8 +66,8 @@ public class UserRegionMappingDO implements Serializable {
             userRegion.setRegionId(regionId);
             userRegion.setUserId(departmentUser.getUserId());
             userRegion.setType(DataSourceEnum.SYNC.getCode());
-            userRegion.setCreateTime(System.currentTimeMillis());
-            userRegion.setUpdateTime(System.currentTimeMillis());
+            userRegion.setCreateTime(new Date());
+            userRegion.setUpdateTime(new Date());
             userRegion.setDeleted(Boolean.FALSE);
             resultList.add(userRegion);
         }
@@ -83,8 +84,8 @@ public class UserRegionMappingDO implements Serializable {
             userRegion.setRegionId(regionId);
             userRegion.setUserId(userId);
             userRegion.setType(DataSourceEnum.SYNC.getCode());
-            userRegion.setCreateTime(System.currentTimeMillis());
-            userRegion.setUpdateTime(System.currentTimeMillis());
+            userRegion.setCreateTime(new Date());
+            userRegion.setUpdateTime(new Date());
             userRegion.setDeleted(Boolean.FALSE);
             resultList.add(userRegion);
         }
@@ -111,8 +112,8 @@ public class UserRegionMappingDO implements Serializable {
                 userRegion.setRegionId(split[split.length-1]);
                 userRegion.setUserId(user.getUserId());
                 userRegion.setType(DataSourceEnum.SYNC.getCode());
-                userRegion.setCreateTime(System.currentTimeMillis());
-                userRegion.setUpdateTime(System.currentTimeMillis());
+                userRegion.setCreateTime(new Date());
+                userRegion.setUpdateTime(new Date());
                 userRegion.setDeleted(Boolean.FALSE);
                 resultList.add(userRegion);
             }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
index f3cd6b128..40c097abc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
@@ -52,7 +52,6 @@ public class LoginServiceImpl implements LoginService {
             throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
         }
         LoginUserInfo currentUser = new LoginUserInfo();
-        RefreshUser refreshUser = new RefreshUser();
         // 查企业用户
         EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId);
         if(enterpriseUser == null){