From f0ac012e220dcbfd0017fe5fceb286df60e72da5 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 8 Mar 2023 11:11:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=9D=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8A=A5=E6=96=87=E5=8F=91=E8=BF=87=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E4=BB=B7=E5=92=8C=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 1343a3ba7..167b225c5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -523,13 +523,21 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderBasicInfo.setSettlementTime(DateUtils.getNowDate()); // 结算时间 orderBasicInfo.setRefundAmount(residue); // 结算退款金额 - // 订单详情 + // 更新订单详情 orderDetail.setTotalUsedElectricity(new BigDecimal(data.getTotalElectricity())); // 总用电量 orderDetail.setTotalOrderAmount(orderAmount); // 订单总金额 orderDetail.setSharpUsedElectricity(new BigDecimal(data.getSharpUsedElectricity())); // 尖时段用电量 + orderDetail.setSharpPrice(new BigDecimal(data.getSharpPrice())); + orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); orderDetail.setPeakUsedElectricity(new BigDecimal(data.getPeakUsedElectricity())); // 峰时段用电量 + orderDetail.setPeakPrice(new BigDecimal(data.getPeakPrice())); + orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); orderDetail.setFlatUsedElectricity(new BigDecimal(data.getFlatUsedElectricity())); // 平时段用电量 + orderDetail.setFlatPrice(new BigDecimal(data.getFlatPrice())); + orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); orderDetail.setValleyUsedElectricity(new BigDecimal(data.getValleyUsedElectricity())); // 谷时段用电量 + orderDetail.setValleyPrice(new BigDecimal(data.getValleyPrice())); + orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); OrderTransactionDTO dto = new OrderTransactionDTO(); dto.setOrderBasicInfo(orderBasicInfo); dto.setOrderDetail(orderDetail);