Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-12 1e7bea1cfadbbbc95b0c0697b13aa9050cf02dc7

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

@@ -10,6 +10,7 @@
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TParkingLot;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
import com.ruoyi.chargingPile.api.vo.SiteVO;
@@ -259,9 +260,10 @@
   public AjaxResult delSite(Integer[] ids) {
      //查询是否有关联数据
      //充电桩
      long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getSiteId, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));
      long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, Arrays.asList(ids))
            .eq(TChargingPile::getDelFlag, 0));
      if(count1 > 0){
         return AjaxResult.error("该站点有关联充电桩，删除失败！");
         return AjaxResult.error("该站点已添加充电桩，不可删除。");
      }
      for (Integer id : ids) {
         Site site = this.getById(id);
@@ -286,7 +288,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().multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
            });
         }
      }
@@ -295,8 +297,8 @@
   }

   @Override
   public SiteDetailVO getDetailById(Integer siteId) {
      return this.baseMapper.getDetailById(siteId);
   public SiteDetailVO getDetailById(SiteDetailQuery query) {
      return this.baseMapper.getDetailById(query);
   }

   @Override