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

update 订单分账

Browse Source
This commit is contained in:
Guoqs
2024-11-18 16:38:18 +08:00
parent 3b22644497
commit a40472e4ba
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java
View File

@@ -1008,8 +1008,8 @@ public class AdapayService {
} }
/** /**
* 创建交易确认请求/创建分账请求 * 创建交易确认请求/创建分账请求/分账主逻辑
* 这个方法只适用于多用户分账 * 这个方法支持多用户分账
*/ */
public PaymentConfirmResponse createPaymentConfirmRequest(PaymentConfirmParam param) { public PaymentConfirmResponse createPaymentConfirmRequest(PaymentConfirmParam param) {
String paymentId = param.getPaymentId(); // 支付对象id String paymentId = param.getPaymentId(); // 支付对象id

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

@@ -7,6 +7,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.adapay.common.DivMember; import com.jsowell.adapay.common.DivMember;
import com.jsowell.adapay.dto.PaymentConfirmParam;
import com.jsowell.adapay.dto.QueryConfirmReverseDTO; import com.jsowell.adapay.dto.QueryConfirmReverseDTO;
import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO;
import com.jsowell.adapay.operation.PaymentReverseOperation; import com.jsowell.adapay.operation.PaymentReverseOperation;
@@ -1409,9 +1410,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
String paymentId = vo.getPaymentId(); String paymentId = vo.getPaymentId();
BigDecimal deductionAmount = vo.getDeductionAmount(); BigDecimal deductionAmount = vo.getDeductionAmount();
PaymentConfirmParam param = PaymentConfirmParam.builder()
.paymentId(paymentId)
.divMemberList(divMemberList)
.confirmAmt(confirmAmt)
.orderCode(orderCode)
.wechatAppId(wechatAppId)
.build();
// 延时分账，使用确认交易API // 延时分账，使用确认交易API
PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequestMultiuser(paymentId, PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(param);
divMemberList, deductionAmount, orderCode, wechatAppId);
if (paymentConfirmResponse != null && paymentConfirmResponse.isNotFailed()) { if (paymentConfirmResponse != null && paymentConfirmResponse.isNotFailed()) {
confirmAmt = confirmAmt.add(new BigDecimal(paymentConfirmResponse.getConfirm_amt())); confirmAmt = confirmAmt.add(new BigDecimal(paymentConfirmResponse.getConfirm_amt()));
@@ -1612,9 +1620,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// 校验订单是否分账 状态为非交易完成的时候，进行分账处理 // 校验订单是否分账 状态为非交易完成的时候，进行分账处理
if (!AdapayStatusEnum.SUCCEEDED.getValue().equals(result.getStatus())) { if (!AdapayStatusEnum.SUCCEEDED.getValue().equals(result.getStatus())) {
PaymentConfirmParam param = PaymentConfirmParam.builder()
.paymentId(paymentId)
.divMemberList(divMemberList)
.confirmAmt(settleAmount)
.orderCode(orderCode)
.wechatAppId(wechatAppId)
.build();
// 调汇付的分账接口 确认交易 // 调汇付的分账接口 确认交易
PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequestMultiuser(paymentId, PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(param);
divMemberList, settleAmount, orderCode, wechatAppId);
// 分账接口返回的信息 // 分账接口返回的信息
result = new OrderSplitResult(); result = new OrderSplitResult();