mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-28 19:18:00 +08:00
支付状态新增待补缴
This commit is contained in:
@@ -3001,22 +3001,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
OrderBasicInfo orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
|
OrderBasicInfo orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
|
||||||
BigDecimal payAmount = dto.getPayAmount();
|
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;
|
boolean sendStartCharging = true;
|
||||||
|
|
||||||
if (StartModeEnum.AUTH_CARD.getValue().equals(dto.getStartMode())) {
|
if (StartModeEnum.AUTH_CARD.getValue().equals(dto.getStartMode())) {
|
||||||
sendStartCharging = false;
|
sendStartCharging = false;
|
||||||
} else if (StartModeEnum.VIN_CODE.getValue().equals(dto.getStartMode())) {
|
} else if (StartModeEnum.VIN_CODE.getValue().equals(dto.getStartMode())) {
|
||||||
sendStartCharging = false;
|
sendStartCharging = false;
|
||||||
} else if (StartTypeEnum.APPOINTMENT.getValue().equals(orderInfo.getStartType())) {
|
} else if (StartTypeEnum.APPOINTMENT.getValue().equals(orderInfo.getStartType())) {
|
||||||
sendStartCharging = false;
|
sendStartCharging = false;
|
||||||
|
} else if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {
|
||||||
|
sendStartCharging = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sendStartCharging) {
|
if (sendStartCharging) {
|
||||||
@@ -3032,6 +3026,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), chargeAmount);
|
pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), chargeAmount);
|
||||||
logger.info("订单:{}支付成功, 发送启动指令", dto.getOrderCode());
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user