From f3355fb48eeb2060ff535fd71c7e1b3b0e634616 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 十月 2024 11:44:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 1374035..2d16d90 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -351,7 +351,6 @@
Page<TAppUser> page = appUserService.lambdaQuery()
.like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
.eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
- .eq(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
.in(!userIds.isEmpty(),TAppUser::getId,userIds)
.eq(TAppUser::getStatus,1)
.page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
@@ -570,7 +569,9 @@
TAppUser byId = appUserService.getById(userId);
AppUserInfoDto appUserInfoDto = new AppUserInfoDto();
TVip data = vipClient.getVipInfoByType(2).getData();
- appUserInfoDto.setMinPrice(data.getMonthlyCard());
+ if(null != data){
+ appUserInfoDto.setMinPrice(data.getMonthlyCard());
+ }
//判断会员
if (byId.getVipEndTime()==null||byId.getVipEndTime().isBefore(LocalDateTime.now())){
@@ -963,7 +964,7 @@
boolean doubleVip = false;
if (one!=null){
TVip tVip = JSONObject.parseObject(one.getVipJson(), TVip.class);
- if (tVip.getDoubleIntegration()==1){
+ if (tVip.getDoubleIntegration()!=null&&tVip.getDoubleIntegration()==1){
doubleVip = true;
}
}
--
Gitblit v1.7.1