Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 6cbe15b5456b1b6a10ef74046f2b69a2ed85cbda

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -1,9 +1,13 @@
package com.ruoyi.chargingPile.service.impl;

import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.AppUserVipDetailClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserVipDetail;
import com.ruoyi.account.api.vo.GetAppUserVipDetail;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
@@ -81,7 +85,8 @@
   
   @Resource
   private IntegrationClient integrationClient;

   @Resource
   private AppUserVipDetailClient vipDetailClient;
   
   
   /**
@@ -287,9 +292,9 @@
   @Override
   public PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin) {
      TAppUser appUser = null;
      // 获取当前登录用户id
      Long userId = tokenService.getLoginUserApplet().getUserId();
      if(isLogin == 1){
         // 获取当前登录用户id
         Long userId = tokenService.getLoginUserApplet().getUserId();
         // 根据id查询用户信息
         appUser = appUserClient.getUserById(userId).getData();
      }
@@ -297,7 +302,14 @@
      List<SiteVO> list = this.baseMapper.pageList(query,pageInfo);
      if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
         // 查询会员信息
         TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
//         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();
         String vipJson = data1.getVipJson();
         TVip vip = JSON.parseObject(vipJson, TVip.class);
         if(Objects.nonNull(vip) && vip.getType() == 2){
            list.forEach(item -> {
               if(Objects.nonNull(vip.getDiscount())){
@@ -387,7 +399,14 @@
      List<SiteVO> list = this.baseMapper.getMapSiteList(query);
      if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
         // 查询会员信息
         TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
//         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();
         String vipJson = data1.getVipJson();
         TVip vip = JSON.parseObject(vipJson, TVip.class);
         if(Objects.nonNull(vip) && vip.getType() == 2){
            list.forEach(item -> {
               item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));