Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

puzhibing

2026-02-02 9e646c2ce8b0f7ad54c59dfabc02231ef7a2c120

Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java

@@ -144,7 +144,7 @@
            chargingOrder.setEndTime(DateUtils.stringToLocalDateTime(chargeOrder.getEndTime()));
            chargingOrder.setStatus(5);
            chargingOrder.setEndMode(1);
            chargingOrder.setElectrovalence(new BigDecimal(chargeOrder.getElecMoney()));
            chargingOrder.setElectrovalence(new BigDecimal(chargeOrder.getSeviceMoney()).multiply(new BigDecimal("1.19")));
            chargingOrder.setServiceCharge(new BigDecimal(chargeOrder.getSeviceMoney()));
            chargingOrder.setTotalElectricity(new BigDecimal(chargeOrder.getElecMoney()));
            chargingOrder.setPaymentAmount(new BigDecimal(chargeOrder.getTotalMoney()));
@@ -185,7 +185,7 @@
                        accountingStrategy.setServiceCharge(chargeDetail.getSevicePrice());
                        accountingStrategy.setCostServiceCharge(chargeDetail.getDetailSeviceMoney());
                        accountingStrategy.setChargingCapacity(chargeDetail.getDetailPower());
                        accountingStrategy.setPeriodElectricPrice(chargeDetail.getDetailElecMoney());
                        accountingStrategy.setPeriodElectricPrice(chargeDetail.getDetailSeviceMoney().multiply(new BigDecimal("1.19")));
                        accountingStrategy.setCouponDiscountAmount(BigDecimal.ZERO);
                        accountingStrategy.setVipDiscountAmount(BigDecimal.ZERO);
                        accountingStrategy.setPeriodServicePrice(chargeDetail.getDetailSeviceMoney());
@@ -598,7 +598,7 @@
                jsonObject = JSONObject.parseObject(s);
                pageInfo = JSON.parseObject(jsonObject.toJSONString(),  com.ruoyi.jianguan.domain.PageInfo.class);
                result.addAll(pageInfo.getChargeOrders());
                if (temp==5){
                if (temp==7){
                    break;
                }
                temp++;