From d25897a9e4a96079e3ef9d767083e631ead13a1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 16:23:51 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
index f61ca1a..2637795 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
@@ -103,6 +103,15 @@
                     AccountInfo accountInfo = accountMapper.selectOneByUserId(userId);
                     String collectScore = StrUtil.isEmpty(accountInfo.getCollectScore()) ? "0" : accountInfo.getCollectScore();
                     jhyInfoListVo.setScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
+
+                    Example example = new Example(UserLoginInfo.class);
+                    Example.Criteria criteria = example.createCriteria();
+                    criteria.andEqualTo("userId", userId);
+                    example.setOrderByClause("login_time desc");
+                    List<UserLoginInfo> userLoginInfos = userLoginInfoMapper.selectByExample(example);
+                    if (CollUtil.isNotEmpty(userLoginInfos)) {
+                        jhyInfoListVo.setLastLogintime(CollUtil.getFirst(userLoginInfos).getLoginTime());
+                    }
                 }
             }
         }

--
Gitblit v1.9.1