|
@@ -136,6 +136,7 @@ public class CmsUserController{
|
|
|
if (StrUtil.isNotBlank(otherSql)) {
|
|
if (StrUtil.isNotBlank(otherSql)) {
|
|
|
builder.put("otherConditionSql", otherSql);
|
|
builder.put("otherConditionSql", otherSql);
|
|
|
}
|
|
}
|
|
|
|
|
+ DateTime now = DateTime.now();
|
|
|
SearchResult<UserView> search = beanSearcher.search(UserView.class, builder.build());
|
|
SearchResult<UserView> search = beanSearcher.search(UserView.class, builder.build());
|
|
|
search.getDataList().forEach(data -> {
|
|
search.getDataList().forEach(data -> {
|
|
|
Long userId = data.getId();
|
|
Long userId = data.getId();
|
|
@@ -154,6 +155,13 @@ public class CmsUserController{
|
|
|
Integer selectCount = userCertRecordMapper.selectCount(Wrappers.lambdaQuery(UserCertRecord.class)
|
|
Integer selectCount = userCertRecordMapper.selectCount(Wrappers.lambdaQuery(UserCertRecord.class)
|
|
|
.eq(UserCertRecord::getUserId, userId));
|
|
.eq(UserCertRecord::getUserId, userId));
|
|
|
data.setIsCert(selectCount > 0 ? true : false);
|
|
data.setIsCert(selectCount > 0 ? true : false);
|
|
|
|
|
+ VipUser vipUser = vipUserMapper.selectOne(Wrappers.lambdaQuery(VipUser.class)
|
|
|
|
|
+ .eq(VipUser::getUserId, userId)
|
|
|
|
|
+ .last("limit 1"));
|
|
|
|
|
+ if (vipUser != null && vipUser.getExpiryTime().after(now)) {
|
|
|
|
|
+ data.setIsVip(true);
|
|
|
|
|
+ data.setVipExpiryTime(vipUser.getExpiryTime());
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|
|
}
|