Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-26 68a9c2da2d18c25fd7126b63ca3c1a98a63d7e77

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

@@ -39,6 +39,7 @@
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

@@ -237,9 +238,9 @@
      if(StringUtils.isEmpty(site.getAddress())){
         return AjaxResult.error("详细地址不能为空");
      }
      if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
         return AjaxResult.error("地图位置不能为空");
      }
//      if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
//         return AjaxResult.error("地图位置不能为空");
//      }
      if(StringUtils.isEmpty(site.getPhone())){
         return AjaxResult.error("站点电话不能为空");
      }
@@ -292,7 +293,7 @@
         TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
         if(Objects.nonNull(vip) && vip.getType() == 2){
            list.forEach(item -> {
               item.setVipElectrovalence(vip.getDiscount().multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
               item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
            });
         }
      }
@@ -374,7 +375,7 @@
         TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
         if(Objects.nonNull(vip) && vip.getType() == 2){
            list.forEach(item -> {
               item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
               item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
            });
         }
      }
@@ -393,7 +394,7 @@
      Site site = this.getById(id);
      site.setAccountingStrategyId(accountingStrategyId);
      this.updateById(site);
      List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, id).eq(TChargingGun::getDelFlag, 0));
      List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, id).eq(TChargingGun::getDelFlag, 0));
      for (TChargingGun tChargingGun : list) {
         tChargingGun.setAccountingStrategyId(accountingStrategyId);
      }