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

创建订单时不保存支付金额，在支付成功后保存支付金额

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-25 12:33:24 +08:00
parent 621c765a9d
commit 3203d99144
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1907,7 +1907,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.orderBasicInfo(orderBasicInfo) .orderBasicInfo(orderBasicInfo)
.orderDetail(orderDetail) .orderDetail(orderDetail)
.build(); .build();
pileTransactionService.doCreateOrder(createOrderTransactionDTO); pileTransactionService.doCreateOrder(createOrderTransactionDTO); // 保存异常订单到订单主表
} }
/** /**
@@ -2593,7 +2593,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.orderBasicInfo(orderBasicInfo) .orderBasicInfo(orderBasicInfo)
.orderDetail(orderDetail) .orderDetail(orderDetail)
.build(); .build();
pileTransactionService.doCreateOrder(createOrderTransactionDTO); pileTransactionService.doCreateOrder(createOrderTransactionDTO); // 联联平台生成订单
// 组装结果集 // 组装结果集
Map<String, Object> resultMap = Maps.newHashMap(); Map<String, Object> resultMap = Maps.newHashMap();
@@ -3083,7 +3083,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderInfo.setPayMode(dto.getPayMode()); orderInfo.setPayMode(dto.getPayMode());
orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue());
BigDecimal orderPayAmount = orderInfo.getPayAmount() == null ? BigDecimal.ZERO : orderInfo.getPayAmount(); BigDecimal orderPayAmount = orderInfo.getPayAmount() == null ? BigDecimal.ZERO : orderInfo.getPayAmount();
// 2024年3月25日12点26分 发现重复记录的情况
if(orderPayAmount.compareTo(payAmount) != 0) {
orderInfo.setPayAmount(orderPayAmount.add(payAmount)); orderInfo.setPayAmount(orderPayAmount.add(payAmount));
}
orderInfo.setPayTime(new Date()); orderInfo.setPayTime(new Date());
if (sendStartCharging) { if (sendStartCharging) {
@@ -3515,7 +3518,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.pileConnectorCode(dto.getPileSn() + dto.getConnectorCode()) .pileConnectorCode(dto.getPileSn() + dto.getConnectorCode())
.startMode(dto.getStartMode()) .startMode(dto.getStartMode())
.payStatus(Constants.ZERO) .payStatus(Constants.ZERO)
.payAmount(dto.getChargeAmount()) // 支付完成后填入支付金额 // .payAmount(dto.getChargeAmount()) // 支付完成后填入支付金额
.payMode(dto.getPayMode()) .payMode(dto.getPayMode())
.plateNumber(plateNumber) .plateNumber(plateNumber)
.orderAmount(BigDecimal.ZERO) .orderAmount(BigDecimal.ZERO)