From 73001dfb9a23d513acda7c9a5a15ee8297b15b59 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 8 Mar 2023 11:23:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E7=BD=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8F=82=E6=95=B0=20trycatch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderBasicInfoServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) 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 167b225c5..c8822f445 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 @@ -524,20 +524,25 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { 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())); + try { + 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())); + } catch (Exception e) { + logger.error("设置订单详情参数发生异常", e); + } + OrderTransactionDTO dto = new OrderTransactionDTO(); dto.setOrderBasicInfo(orderBasicInfo); dto.setOrderDetail(orderDetail);