From 417d2a8ff7d9f61bfa7a9342dcc0c7638a7ec798 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Wed, 24 Apr 2024 00:37:29 +0800
Subject: [PATCH] init

---
 .../ruoyi/xq/dto/app/user/vo/HomeUserVo.java  |  3 +++
 .../com/ruoyi/xq/enums/image/ImagesEnums.java | 20 ++++++++++++++
 .../xq/service/impl/UserServiceImpl.java      |  2 ++
 .../service/impl/WxTransLogServiceImpl.java   | 27 +++++++++++++++----
 .../main/resources/mapper/xq/UserMapper.xml   |  6 +++--
 5 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/enums/image/ImagesEnums.java

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
index bf54216..d99dd12 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
@@ -11,6 +11,9 @@ public class HomeUserVo {
 
     @Schema(description = "是否可以查看头像，当不可以查看的时候头像和图片是空")
     private Boolean showAvatarBool = true;
+
+    @Schema(description = "最近登录时间")
+    private String lastLoginTime;
     @Schema(description = "用户ID")
     private Long userId;
     @Schema(description = "用户编号")
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/image/ImagesEnums.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/image/ImagesEnums.java
new file mode 100644
index 0000000..d4a469d
--- /dev/null
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/image/ImagesEnums.java
@@ -0,0 +1,20 @@
+package com.ruoyi.xq.enums.image;
+
+import lombok.Getter;
+
+@Getter
+public enum ImagesEnums {
+    VIP_LOG("xq/images/logs/"),
+    CONSUMER_LOG("xq/images/logs/"),
+    SYSTEM_LOG("xq/images/logs/"),
+    LOGO_LOG("xq/images/logs/"),
+    ;
+
+    private final String path;
+
+    ImagesEnums(String path) {
+        this.path = path;
+    }
+
+
+}
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
index d4bf9f4..91a0965 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
@@ -125,6 +125,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
         if(userId.equals(currentUserId)){
             return result;
         }
+        User currentUser = this.getById(currentUserId);
+        // TODO 登录时间
         boolean star = userStarService.existsStar(currentUserId, userId);
         result.setStar(star);
         UserStatus userStatus = userStatusService.getByUserId(userId);
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java
index c634da1..f8930f0 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransLogServiceImpl.java
@@ -14,6 +14,9 @@ import com.ruoyi.xq.dto.app.account.WxTransLogListVo;
 import com.ruoyi.xq.dto.app.account.WxTransLogQuery;
 import com.ruoyi.xq.dto.common.user.MinUser;
 import com.ruoyi.xq.enums.account.WxTransLogCateEnum;
+import com.ruoyi.xq.enums.common.SystemConfigEnum;
+import com.ruoyi.xq.enums.image.ImagesEnums;
+import com.ruoyi.xq.manager.SystemConfigManager;
 import com.ruoyi.xq.mapper.WxTransLogMapper;
 import com.ruoyi.xq.service.UserService;
 import com.ruoyi.xq.service.WxTransLogService;
@@ -38,6 +41,8 @@ import java.util.stream.Collectors;
 public class WxTransLogServiceImpl extends ServiceImpl<WxTransLogMapper,WxTransLog> implements WxTransLogService {
     @Autowired
     private UserService userService;
+    @Autowired
+    private SystemConfigManager systemConfigManager;
 
     @Override
     public Page<WxTransLogListVo> pageApp(PageQuery pageQuery, WxTransLogQuery query) {
@@ -46,6 +51,7 @@ public class WxTransLogServiceImpl extends ServiceImpl<WxTransLogMapper,WxTransL
         if(CollectionUtils.isEmpty(records)){
             return PageConvert.convertEmpty(page);
         }
+        String cosDomain = systemConfigManager.getSystemConfig(SystemConfigEnum.COS_DOMAIN);
         List<Long> userIdList = records.stream().map(WxTransLog::getTarUserId).filter(Objects::nonNull).collect(Collectors.toList());
         List<User> users = userService.listByIds(userIdList);
         Map<Long, User> userMap = users.stream().collect(Collectors.toMap(User::getId, Function.identity()));
@@ -59,11 +65,22 @@ public class WxTransLogServiceImpl extends ServiceImpl<WxTransLogMapper,WxTransL
             res.setContent(record.getRemark());
             res.setCreateTime(record.getCreateTime());
             res.setChangeValue(record.getChangeValue());
-            User user = userMap.get(record.getTarUserId());
-            if(user != null){
-                res.setSourceUserId(user.getId());
-                res.setSourceNickname(user.getNickname());
-                res.setSourceImg(user.getAvatar());
+            if(WxTransLogCateEnum.CONSUMER.getCode().equals(record.getCateId())){
+                User user = userMap.get(record.getTarUserId());
+                if(user != null){
+                    res.setSourceUserId(user.getId());
+                    res.setSourceNickname(user.getNickname());
+                    res.setSourceImg(user.getAvatar());
+                }
+            }else if(WxTransLogCateEnum.VIP_GIVE.getCode().equals(record.getCateId())){
+                res.setSourceImg(cosDomain + ImagesEnums.VIP_LOG.getPath());
+            }else if(WxTransLogCateEnum.ORDER.getCode().equals(record.getCateId())){
+                res.setSourceImg(cosDomain + ImagesEnums.CONSUMER_LOG.getPath());
+            }else if(WxTransLogCateEnum.SYSTEM.getCode().equals(record.getCateId())){
+                res.setSourceImg(cosDomain + ImagesEnums.SYSTEM_LOG.getPath());
+            }
+            if(res.getSourceImg() == null){
+                res.setSourceImg(cosDomain + ImagesEnums.LOGO_LOG.getPath());
             }
             vo.add(res);
         }
diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml
index 30dc015..d03794a 100644
--- a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml
@@ -95,8 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                t1.education, t1.profession, if(t2.card_num_auth = 1, 1, 0) as cardNumAuthBool
         from xq_user t1
         join xq_user_auth t2 on t1.id = t2.user_id
-        where t1.type = 0  and t1.status = 0 and t1.finish_base_status = 1
-        and exists(select 1 from xq_user_vip p1 where p1.user_id = t1.id and p1.vip_status = 1 and p1.vip_timeout &lt;= now())
+        join xq_user_status t3 on t1.id = t3.user_id
+        join xq_user_login t4 on t1.id = t4.user_id
+        where t1.type = 0  and t1.status = 0 and t1.finish_base_status = 1 and t1.open_vip = 1 and t3.push_vip = 1
+        order by t4.last_login_time desc
     </select>
     <select id="getMinUserById" resultType="com.ruoyi.xq.dto.common.user.MinUser">
         select t1.id,t1.usercode