autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-10 10:19:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单分账逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-26 14:22:03 +08:00
parent 6a651782d0
commit 4bad102219
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -841,7 +841,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); 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); totalElectricityAmount = totalElectricityAmount.add(multiply);
} }
@@ -856,7 +858,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); 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); totalElectricityAmount = totalElectricityAmount.add(multiply);
} }
@@ -871,7 +875,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); 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); totalElectricityAmount = totalElectricityAmount.add(multiply);
} }
@@ -886,7 +892,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); 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); totalElectricityAmount = totalElectricityAmount.add(multiply);
} }
@@ -1167,9 +1175,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
public void tempOrderSplittingOperations(String merchantId, String tradeDate) { public void tempOrderSplittingOperations(String merchantId, String tradeDate) {
logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate);
// AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
// adapayMemberAccount.setAdapayMemberId("0");
// 查询运营商有没有开通结算账户 // 查询运营商有没有开通结算账户
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
if (adapayMemberAccount == null) { if (adapayMemberAccount == null) {