From f91bb885d680d3f30cbf1bcffdd6819b3b10e6b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 21:03:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index 079b76d..eb8c190 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -293,21 +293,22 @@
public PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin) {
TAppUser appUser = null;
// 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUserVipDetail data1 = null;
if(isLogin == 1){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
appUser = appUserClient.getUserById(userId).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ data1 = appUserVipDetail.getData();
}
PageInfo<SiteVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
List<SiteVO> list = this.baseMapper.pageList(query,pageInfo);
if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
// 查询会员信息
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
- getAppUserVipDetail.setAppUserId(userId);
- getAppUserVipDetail.setVipId(appUser.getVipId());
- R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
- TAppUserVipDetail data1 = appUserVipDetail.getData();
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
TVip vip = JSON.parseObject(vipJson, TVip.class);
@@ -388,25 +389,28 @@
}
@Override
- public List<SiteVO> getMapSiteList(SiteQuery query) {
+ public List<SiteVO> getMapSiteList(SiteQuery query,Integer isLogin) {
if(StringUtils.isEmpty(query.getLon()) || StringUtils.isEmpty(query.getLat())){
return new ArrayList<>();
}
-
+ TAppUser appUser = null;
// 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
- // 根据id查询用户信息
- TAppUser appUser = appUserClient.getUserById(userId).getData();
- List<SiteVO> list = this.baseMapper.getMapSiteList(query);
- if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
- // 查询会员信息
-// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ TAppUserVipDetail data1 = null;
+ if(isLogin == 1){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ // 根据id查询用户信息
+ appUser = appUserClient.getUserById(userId).getData();
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
getAppUserVipDetail.setAppUserId(userId);
getAppUserVipDetail.setVipId(appUser.getVipId());
R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
- TAppUserVipDetail data1 = appUserVipDetail.getData();
+ data1 = appUserVipDetail.getData();
+ }
+ List<SiteVO> list = this.baseMapper.getMapSiteList(query);
+ if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
+ // 查询会员信息
+// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
TVip vip = JSON.parseObject(vipJson, TVip.class);
--
Gitblit v1.7.1