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

update 结算订单

Browse Source
This commit is contained in:
Guoqs
2024-08-12 13:38:02 +08:00
parent 7a3d3b3ec3
commit 402d628975
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java
View File

@@ -626,6 +626,9 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo);
// 重新查询订单信息
orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
// 结算订单操作 // 结算订单操作
try { try {
// 新逻辑 // 新逻辑

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
View File

@@ -557,7 +557,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
pileReservationInfo.setEndTime(Time.valueOf("23:00:00")); pileReservationInfo.setEndTime(Time.valueOf("23:00:00"));
pileReservationInfo.setVerifyIdentity(Constants.ZERO); pileReservationInfo.setVerifyIdentity(Constants.ZERO);
pileReservationInfo.setStatus(Constants.ZERO); pileReservationInfo.setStatus(Constants.ZERO);
pileReservationInfo.setDelFlag("0"); pileReservationInfo.setDelFlag(DelFlagEnum.NORMAL.getValue());
pileReservationInfoMapper.insert(pileReservationInfo); pileReservationInfoMapper.insert(pileReservationInfo);
log.info("未查询到个人桩预约信息, 初始化个人桩预约信息:{}", JSON.toJSONString(pileReservationInfo)); log.info("未查询到个人桩预约信息, 初始化个人桩预约信息:{}", JSON.toJSONString(pileReservationInfo));
} }

1
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -196,6 +196,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
BigDecimal orderAmount = new BigDecimal(data.getConsumptionAmount()).setScale(2, RoundingMode.HALF_UP); BigDecimal orderAmount = new BigDecimal(data.getConsumptionAmount()).setScale(2, RoundingMode.HALF_UP);
// 付款金额 - 实际消费金额，如果有剩余，需要走退款操作 当使用余额支付时payAmount = principalPay + giftPay // 付款金额 - 实际消费金额，如果有剩余，需要走退款操作 当使用余额支付时payAmount = principalPay + giftPay
BigDecimal payAmount = orderBasicInfo.getPayAmount(); BigDecimal payAmount = orderBasicInfo.getPayAmount();
logger.info("结算订单:【{}】, 支付金额:{}, 消费金额:{}", orderCode, payAmount, orderAmount);
// 有时候充电桩到达金额停止充电会多出一点金额，比如实际需要充50元的电，充电桩传来的消费金额为50.01元，在后台记录的时候需要舍去 // 有时候充电桩到达金额停止充电会多出一点金额，比如实际需要充50元的电，充电桩传来的消费金额为50.01元，在后台记录的时候需要舍去
if (orderAmount.compareTo(payAmount) > 0) { if (orderAmount.compareTo(payAmount) > 0) {