From 1d03a9e224dc0ce11d47bede74da9db2189d663c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 11:21:09 +0800
Subject: [PATCH] 202107021
---
gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java | 9 +++++++++
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 2 +-
gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java | 3 +++
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
index c84bad1..c9513c7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
@@ -96,7 +96,7 @@
}
Integer status = jhyOrder.getStatus();
if(JhyOrder.ORDER_STATUS_WAITING != status){
- return JsonResult.failMessage("订单不是待接单状态，不允许取消！");
+ return JsonResult.failMessage("订单不是待接单状态，不允许指派！");
}
long jhyId = model.getJhyId();
JhyInfo jhyInfo = jhyOrderMapper.selectJhyInfoByUserId(jhyId);
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());
+ }
}
}
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
index 37173a4..a6e6891 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
@@ -47,6 +47,9 @@
@ApiModelProperty(value = "申请时间")
private String createTime;
+ @ApiModelProperty(value = "最后登录时间")
+ private String lastLogintime;
+
@ApiModelProperty(hidden = true)
private Date createdTime;
}
--
Gitblit v1.9.1