mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-17 08:18:34 +08:00
update
This commit is contained in:
@@ -1086,7 +1086,7 @@ public class OrderService {
|
|||||||
.acquirer(AcquirerEnum.ADAPAY.getValue())
|
.acquirer(AcquirerEnum.ADAPAY.getValue())
|
||||||
.build();
|
.build();
|
||||||
// 订单支付成功 支付回调
|
// 订单支付成功 支付回调
|
||||||
orderBasicInfoService.payOrderSuccessCallback(callbackDTO);
|
orderBasicInfoService.payOrderSuccessCallback(callbackDTO); // 订单在线支付成功回调
|
||||||
} else if (StringUtils.equals(scenarioType, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额
|
} else if (StringUtils.equals(scenarioType, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额
|
||||||
// 充值余额成功
|
// 充值余额成功
|
||||||
UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO();
|
UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO();
|
||||||
|
|||||||
@@ -3043,7 +3043,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
.startMode(dto.getStartMode())
|
.startMode(dto.getStartMode())
|
||||||
.acquirer(AcquirerEnum.LOCAL.getValue())
|
.acquirer(AcquirerEnum.LOCAL.getValue())
|
||||||
.build();
|
.build();
|
||||||
payOrderSuccessCallback(callbackDTO);
|
payOrderSuccessCallback(callbackDTO); // 白名单直接算支付成功
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -3409,7 +3409,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
.startMode(dto.getStartMode())
|
.startMode(dto.getStartMode())
|
||||||
.acquirer(AcquirerEnum.LOCAL.getValue())
|
.acquirer(AcquirerEnum.LOCAL.getValue())
|
||||||
.build();
|
.build();
|
||||||
payOrderSuccessCallback(callbackDTO);
|
payOrderSuccessCallback(callbackDTO); // 余额支付可以直接调支付回调方法
|
||||||
|
|
||||||
// 余额支付订单 记录会员交易流水
|
// 余额支付订单 记录会员交易流水
|
||||||
MemberTransactionRecord record = MemberTransactionRecord.builder()
|
MemberTransactionRecord record = MemberTransactionRecord.builder()
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
|
|||||||
* 2. 发送启动充电指令
|
* 2. 发送启动充电指令
|
||||||
*/
|
*/
|
||||||
protected void payOrderSuccessCallback(PayOrderSuccessCallbackDTO dto) {
|
protected void payOrderSuccessCallback(PayOrderSuccessCallbackDTO dto) {
|
||||||
orderBasicInfoService.payOrderSuccessCallback(dto);
|
orderBasicInfoService.payOrderSuccessCallback(dto); // AbstractProgramLogic 订单支付成功 支付回调
|
||||||
}
|
}
|
||||||
|
|
||||||
protected List<BalanceDeductionAmountVO> calculateTheBalanceDeductionAmount(String memberId, BigDecimal amount) {
|
protected List<BalanceDeductionAmountVO> calculateTheBalanceDeductionAmount(String memberId, BigDecimal amount) {
|
||||||
|
|||||||
Reference in New Issue
Block a user