mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
交易分账 重构
This commit is contained in:
@@ -35,4 +35,9 @@ public class PayOrderSuccessCallbackDTO {
|
||||
* 0-后管启动;1-用户app启动;2-卡启动;3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动
|
||||
*/
|
||||
private String startMode;
|
||||
|
||||
/**
|
||||
* 收单机构(0-本账户余额;1-微信支付;2-汇付支付)
|
||||
*/
|
||||
private String acquirer;
|
||||
}
|
||||
|
||||
@@ -2799,11 +2799,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
String orderCode = dto.getOrderCode();
|
||||
BigDecimal payAmount = dto.getPayAmount();
|
||||
String payMode = dto.getPayMode();
|
||||
|
||||
// 白名单直接算支付成功
|
||||
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
|
||||
.orderCode(orderCode)
|
||||
.payAmount(payAmount)
|
||||
.payMode(payMode)
|
||||
.startMode(dto.getStartMode())
|
||||
.acquirer(AcquirerEnum.LOCAL.getValue())
|
||||
.build();
|
||||
payOrderSuccessCallback(callbackDTO);
|
||||
}
|
||||
@@ -2826,6 +2829,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
orderInfo.setPayTime(new Date());
|
||||
this.updateOrderBasicInfo(orderInfo);
|
||||
|
||||
// 记录订单支付流水
|
||||
OrderPayRecord orderPayRecord = OrderPayRecord.builder()
|
||||
.orderCode(dto.getOrderCode())
|
||||
.payMode(dto.getPayMode())
|
||||
.payAmount(payAmount)
|
||||
.acquirer(dto.getAcquirer())
|
||||
.createBy(null)
|
||||
.build();
|
||||
orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
|
||||
|
||||
// 是否发送启动指令
|
||||
boolean sendStartCharging = true;
|
||||
|
||||
@@ -3046,6 +3059,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
.payAmount(chargeAmount)
|
||||
.payMode(dto.getPayMode())
|
||||
.startMode(dto.getStartMode())
|
||||
.acquirer(AcquirerEnum.LOCAL.getValue())
|
||||
.build();
|
||||
payOrderSuccessCallback(callbackDTO);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user