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

支付状态新增待补缴

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-17 18:04:57 +08:00
parent 8c5f3cfe6a
commit b4f5b19a95
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3001,22 +3001,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
OrderBasicInfo orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
BigDecimal payAmount = dto.getPayAmount();
// 修改订单
orderInfo.setPayMode(dto.getPayMode());
orderInfo.setPayStatus(Constants.ONE);
orderInfo.setPayAmount(payAmount);
orderInfo.setPayTime(new Date());
this.updateOrderBasicInfo(orderInfo);
// 是否发送启动指令
boolean sendStartCharging = true;
if (StartModeEnum.AUTH_CARD.getValue().equals(dto.getStartMode())) {
sendStartCharging = false;
} else if (StartModeEnum.VIN_CODE.getValue().equals(dto.getStartMode())) {
sendStartCharging = false;
} else if (StartTypeEnum.APPOINTMENT.getValue().equals(orderInfo.getStartType())) {
sendStartCharging = false;
} else if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {
sendStartCharging = false;
}
if (sendStartCharging) {
@@ -3032,6 +3026,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), chargeAmount);
logger.info("订单:{}支付成功, 发送启动指令", dto.getOrderCode());
}
// 修改订单
orderInfo.setPayMode(dto.getPayMode());
orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue());
BigDecimal orderPayAmount = orderInfo.getPayAmount() == null ? BigDecimal.ZERO : orderInfo.getPayAmount();
orderInfo.setPayAmount(orderPayAmount.add(payAmount));
orderInfo.setPayTime(new Date());
if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {
orderInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
}
this.updateOrderBasicInfo(orderInfo);
}
/**