修改bug

xuhy

2024-10-23 5b72eafbfbc6877d32d4cc22fafee002eecd572b

修改bug

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

@@ -371,7 +371,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()));
                });
            }
        }

 ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml

@@ -285,8 +285,10 @@
        left join (
        select
        a.accounting_strategy_id,
        a.service_charge AS serviceCharge,
        a.electrovalence AS electrovalenceOriginal,
        (a.electrovalence+a.service_charge) AS electrovalence,
        ((a.electrovalence+a.service_charge)*b.discount) AS vipElectrovalence
        (a.electrovalence+(a.service_charge*b.discount)) AS vipElectrovalence
        from
        t_accounting_strategy_detail a
        left join