Commit d0a8b244 by 咸鱼

修复NumberFormatException,混合支付退款金额去settlementAmount

parent b3b0fa53
...@@ -76,7 +76,7 @@ public class PaymentSdkAdapter { ...@@ -76,7 +76,7 @@ public class PaymentSdkAdapter {
multiQueryRequest.setPartnerId(partnerId); multiQueryRequest.setPartnerId(partnerId);
multiQueryRequest.setStoreId(storeCode); multiQueryRequest.setStoreId(storeCode);
multiQueryRequest.setFmId(""); multiQueryRequest.setFmId("");
multiQueryRequest.setRefundAmount(Long.valueOf(String.valueOf(refundAmount))); multiQueryRequest.setRefundAmount(refundAmount.longValue());
multiQueryRequest.setRefundTradeNo(String.valueOf(getRefundSerialNo())); multiQueryRequest.setRefundTradeNo(String.valueOf(getRefundSerialNo()));
multiQueryRequest.setNotifyUrl(refundNotifyCallback); multiQueryRequest.setNotifyUrl(refundNotifyCallback);
multiQueryRequest.setVer("V1"); multiQueryRequest.setVer("V1");
......
...@@ -140,7 +140,7 @@ public class PaymentHandle { ...@@ -140,7 +140,7 @@ public class PaymentHandle {
public PayRefundResponse getCommonPayRefundResponse(OrderInfoReqs order, String reason) { public PayRefundResponse getCommonPayRefundResponse(OrderInfoReqs order, String reason) {
PayRefundResponse refundResponse; PayRefundResponse refundResponse;
try { try {
BigDecimal refundAmount = getRefundAmount(order.getPartnerId(), order.getActualPayAmount(), order.getOrderCode()); BigDecimal refundAmount = getRefundAmount(order.getPartnerId(), order.getSettlementAmount(), order.getOrderCode());
if (CollectionUtils.isNotEmpty(order.getOrderPayItemCreateReqList())) { if (CollectionUtils.isNotEmpty(order.getOrderPayItemCreateReqList())) {
// payment/application/refund // payment/application/refund
refundResponse = this.multiRefund(order.getPartnerId(), order.getStoreId(), order.getOrderCode(), refundAmount); refundResponse = this.multiRefund(order.getPartnerId(), order.getStoreId(), order.getOrderCode(), refundAmount);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment