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

交易分账 重构

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-28 14:53:02 +08:00
parent 994370f323
commit 7a9361af9d
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -277,19 +277,20 @@ public class OrderService {
.orderCode(orderCode) .orderCode(orderCode)
.payAmount(amount) .payAmount(amount)
.payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
.acquirer(AcquirerEnum.WECHAT_PAY.getValue())
.build(); .build();
// 订单支付成功 支付回调 // 订单支付成功 支付回调
orderBasicInfoService.payOrderSuccessCallback(callbackDTO); orderBasicInfoService.payOrderSuccessCallback(callbackDTO);
// 记录订单支付流水 // 记录订单支付流水
OrderPayRecord orderPayRecord = OrderPayRecord.builder() // OrderPayRecord orderPayRecord = OrderPayRecord.builder()
.orderCode(orderCode) // .orderCode(orderCode)
.payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) // .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())
.payAmount(amount) // .payAmount(amount)
.acquirer(AcquirerEnum.WECHAT_PAY.getValue()) // .acquirer(AcquirerEnum.WECHAT_PAY.getValue())
.createBy(null) // .createBy(null)
.build(); // .build();
orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); // orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
} else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 } else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额
// 充值余额成功 // 充值余额成功
// memberId = (String) map.get("memberId"); // memberId = (String) map.get("memberId");
@@ -1016,19 +1017,20 @@ public class OrderService {
.orderCode(orderCode) .orderCode(orderCode)
.payAmount(amount) .payAmount(amount)
.payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
.acquirer(AcquirerEnum.ADAPAY.getValue())
.build(); .build();
// 订单支付成功 支付回调 // 订单支付成功 支付回调
orderBasicInfoService.payOrderSuccessCallback(callbackDTO); orderBasicInfoService.payOrderSuccessCallback(callbackDTO);
// 记录订单支付流水 // 记录订单支付流水
OrderPayRecord orderPayRecord = OrderPayRecord.builder() // OrderPayRecord orderPayRecord = OrderPayRecord.builder()
.orderCode(orderCode) // .orderCode(orderCode)
.payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) // .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())
.payAmount(amount) // .payAmount(amount)
.acquirer(AcquirerEnum.ADAPAY.getValue()) // .acquirer(AcquirerEnum.ADAPAY.getValue())
.createBy(null) // .createBy(null)
.build(); // .build();
orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); // orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
} else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 } else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额
scenarioType = ScenarioEnum.BALANCE.getValue(); scenarioType = ScenarioEnum.BALANCE.getValue();
// 充值余额成功 // 充值余额成功

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderSuccessCallbackDTO.java
View File

@@ -35,4 +35,9 @@ public class PayOrderSuccessCallbackDTO {
* 0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动 * 0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动
*/ */
private String startMode; private String startMode;
/**
* 收单机构（0-本账户余额；1-微信支付；2-汇付支付）
*/
private String acquirer;
} }

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

@@ -2799,11 +2799,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
String orderCode = dto.getOrderCode(); String orderCode = dto.getOrderCode();
BigDecimal payAmount = dto.getPayAmount(); BigDecimal payAmount = dto.getPayAmount();
String payMode = dto.getPayMode(); String payMode = dto.getPayMode();
// 白名单直接算支付成功
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
.orderCode(orderCode) .orderCode(orderCode)
.payAmount(payAmount) .payAmount(payAmount)
.payMode(payMode) .payMode(payMode)
.startMode(dto.getStartMode()) .startMode(dto.getStartMode())
.acquirer(AcquirerEnum.LOCAL.getValue())
.build(); .build();
payOrderSuccessCallback(callbackDTO); payOrderSuccessCallback(callbackDTO);
} }
@@ -2826,6 +2829,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderInfo.setPayTime(new Date()); orderInfo.setPayTime(new Date());
this.updateOrderBasicInfo(orderInfo); 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; boolean sendStartCharging = true;
@@ -3046,6 +3059,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
.payAmount(chargeAmount) .payAmount(chargeAmount)
.payMode(dto.getPayMode()) .payMode(dto.getPayMode())
.startMode(dto.getStartMode()) .startMode(dto.getStartMode())
.acquirer(AcquirerEnum.LOCAL.getValue())
.build(); .build();
payOrderSuccessCallback(callbackDTO); payOrderSuccessCallback(callbackDTO);