Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-11-01 71153ebbd5bb6cf17069b0e8afd4fd9e4680ac1f

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

@@ -308,14 +308,16 @@
         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())){
                  item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
               }
            });
         if(Objects.nonNull(data1)){
            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())){
                     item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
                  }
               });
            }
         }
      }
      pageInfo.setRecords(list);
@@ -405,12 +407,14 @@
         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()));
            });
         if(Objects.nonNull(data1)){
            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()));
               });
            }
         }
      }
      return list;