合併代碼

puzhibing

2024-10-12 0b5ae5d7b81ceeca9e05c29c853cd6a047a09a2b

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -121,7 +121,11 @@
         // 当前时间属于那个阶段 取哪个阶段的电价
         if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
            siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence());
            if(null != byId1.getDiscount()){
            siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP));
            }else{
               siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
            }
         }
      }
      siteInfoVO.setChargingGunId(chargingGun.getId());
@@ -147,7 +151,11 @@
         // 当前时间属于那个阶段 取哪个阶段的电价
         if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
            siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence());
            if(null != byId1.getDiscount()){
            siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP));
            }else{
               siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
            }
         }
      }
      siteInfoVO.setChargingPileId(one.getId());