merge

luodangjia

2024-11-01 ba5fb9cec090e0cf8ba32d0714f5d9a4430081b4

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

@@ -218,6 +218,8 @@
            BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
            myChargingOrderList.setPayMoney(payMoney);
            myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")));
            myChargingOrderList.setElectricCharge(tChargingOrder.getElectrovalence());
            myChargingOrderList.setServiceCharge(tChargingOrder.getServiceCharge());
            chargingOrder.add(myChargingOrderList);
         }
         myOrderInvoiceInfo.setChargingOrder(chargingOrder);