From 4bad102219f712e9d79ac419aac15e7d15f120f6 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 26 Aug 2023 14:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E8=B4=A6=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderBasicInfoServiceImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 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 96493d03d..5104c2720 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 @@ -841,7 +841,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getSharpElectricityPrice().multiply(new BigDecimal(sharpUsedElectricity)).setScale(2, RoundingMode.DOWN); + BigDecimal multiply = orderDetail.getSharpElectricityPrice() + .multiply(new BigDecimal(sharpUsedElectricity)) + .setScale(2, RoundingMode.DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -856,7 +858,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getPeakElectricityPrice().multiply(new BigDecimal(peakUsedElectricity)).setScale(2, RoundingMode.DOWN); + BigDecimal multiply = orderDetail.getPeakElectricityPrice() + .multiply(new BigDecimal(peakUsedElectricity)) + .setScale(2, RoundingMode.DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -871,7 +875,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getFlatElectricityPrice().multiply(new BigDecimal(flatUsedElectricity)).setScale(2, RoundingMode.DOWN); + BigDecimal multiply = orderDetail.getFlatElectricityPrice() + .multiply(new BigDecimal(flatUsedElectricity)) + .setScale(2, RoundingMode.DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -886,7 +892,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getValleyElectricityPrice().multiply(new BigDecimal(valleyUsedElectricity)).setScale(2, RoundingMode.DOWN); + BigDecimal multiply = orderDetail.getValleyElectricityPrice() + .multiply(new BigDecimal(valleyUsedElectricity)) + .setScale(2, RoundingMode.DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -1167,9 +1175,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { public void tempOrderSplittingOperations(String merchantId, String tradeDate) { logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); - // AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); - // adapayMemberAccount.setAdapayMemberId("0"); - // 查询运营商有没有开通结算账户 AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); if (adapayMemberAccount == null) {