合并代码

Pu Zhibing

2024-11-02 53ae9959737e2a332b09d63251470438370e99f3

合并代码

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

@@ -298,7 +298,6 @@
        //下发硬件更新计费模板
        List<TChargingPile> tChargingPiles = this.listByIds(id);
        for (TChargingPile chargingPile : tChargingPiles) {
            System.err.println(JSON.toJSONString(accountingStrategyDetails));
            integrationClient.setupBillingModel1(chargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
        }
        

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

@@ -105,7 +105,7 @@
            </foreach>
        </if>
        <if test="null != query.name and '' != query.name">
            and CONCAT(b.number, a.name) like CONCAT('%', #{query.name}, '%')
            and CONCAT(b.name, a.name) like CONCAT('%', #{query.name}, '%')
        </if>
    </select>
</mapper>

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -461,7 +461,6 @@
        chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
        chargingOrder.setOrderSource(0);
        chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
        chargingOrder.setStatus(1);
        
        Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
        Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();