autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-03 13:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

计算启动金额

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-06 10:40:46 +08:00
parent 3a0eae4aeb
commit 4ce6d3d7d6
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
View File

@@ -71,8 +71,7 @@ public class PileRemoteService {
* *
* @param pileSn 充电桩sn * @param pileSn 充电桩sn
*/ */
public void remoteStartCharging(String pileSn, String connectorCode, String transactionCode, BigDecimal accountBalance) { public void remoteStartCharging(String pileSn, String connectorCode, String transactionCode, BigDecimal chargeAmount) {
// String s = "550314127823050120180619144446808800000000000101000000100000057300000000D14B0A54A0860100";
if (StringUtils.isEmpty(pileSn) || StringUtils.isEmpty(connectorCode)) { if (StringUtils.isEmpty(pileSn) || StringUtils.isEmpty(connectorCode)) {
log.warn("远程启动充电, 充电桩编号和枪口号不能为空"); log.warn("远程启动充电, 充电桩编号和枪口号不能为空");
return; return;
@@ -82,7 +81,7 @@ public class PileRemoteService {
.pileSn(pileSn) .pileSn(pileSn)
.connectorCode(connectorCode) .connectorCode(connectorCode)
.transactionCode(transactionCode) .transactionCode(transactionCode)
.chargeAmount(accountBalance) .chargeAmount(chargeAmount)
.build(); .build();
ykcPushCommandService.pushStartChargingCommand(startChargingCommand); ykcPushCommandService.pushStartChargingCommand(startChargingCommand);
} }

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

@@ -3049,12 +3049,27 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
if (billingTemplateVO != null) { if (billingTemplateVO != null) {
pileRemoteService.publishPileBillingTemplate(pileSn, billingTemplateVO); pileRemoteService.publishPileBillingTemplate(pileSn, billingTemplateVO);
} }
// 获取启动金额
BigDecimal chargeAmount = computeChargeAmount(orderInfo.getMerchantId(), orderInfo.getStationId(), orderInfo.getMemberId(), orderInfo.getPayAmount());
// 发送启动指令 // 发送启动指令
pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), orderInfo.getPayAmount()); pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), chargeAmount);
logger.info("订单:{}支付成功, 发送启动指令", dto.getOrderCode()); logger.info("订单:{}支付成功, 发送启动指令", dto.getOrderCode());
} }
} }
// 计算启动金额
private BigDecimal computeChargeAmount(String merchantId, String stationId, String memberId, BigDecimal payAmount) {
// 默认折扣100%
BigDecimal discount = BigDecimal.ONE;
// TODO 如果member享受会员价，则获取到该会员在此站点的折扣
// 启动金额 = 支付金额 ➗ 折扣 保留两位小数
BigDecimal chargeAmount = payAmount.divide(discount, 2, RoundingMode.DOWN);
return chargeAmount;
}
/** /**
* 查询订单推款记录 * 查询订单推款记录
* *