lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-06-05 08:00:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

paypal v1预设商户单号；v2 状态判断修复

Browse Source
This commit is contained in:
egan
2022-03-20 23:47:12 +08:00
parent a4140dab5c
commit be3b66e025
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java
View File

@@ -195,7 +195,7 @@ public class PayPalPayService extends BasePayService<PayPalConfigStorage> {
transaction.setDescription(order.getBody());
}
transaction.setAmount(amount);
transaction.setCustom(order.getOutTradeNo());
List<Transaction> transactions = new ArrayList<>();
transactions.add(transaction);

4
pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java
View File

@@ -297,7 +297,7 @@ public class PayPalPayService extends BasePayService<PayPalConfigStorage> implem
header.addHeader(new BasicHeader("prefer", "return=representation"));
entity.setHeaders(header);
JSONObject resp = getHttpRequestTemplate().postForObject(getReqUrl(order.getTransactionType()), entity, JSONObject.class);
if ("created".equalsIgnoreCase(resp.getString("state")) && StringUtils.isNotEmpty(resp.getString("id"))) {
if ("created".equalsIgnoreCase(resp.getString("status")) && StringUtils.isNotEmpty(resp.getString("id"))) {
order.setTradeNo(resp.getString("id"));
}
return preOrderHandler(resp, order);
@@ -390,7 +390,7 @@ public class PayPalPayService extends BasePayService<PayPalConfigStorage> implem
*/
@Override
public Map<String, Object> ordersCapture(String tradeNo) {
JSONObject ordersCaptureInfo = getHttpRequestTemplate().getForObject(getReqUrl(PayPalTransactionType.ORDERS_CAPTURE), authHeader(), JSONObject.class, tradeNo);
JSONObject ordersCaptureInfo = getHttpRequestTemplate().postForObject(getReqUrl(PayPalTransactionType.ORDERS_CAPTURE), authHeader(), JSONObject.class, tradeNo);
// String captureId = ordersCaptureInfo.getJSONArray("purchaseUnits").getJSONObject(0).getJSONObject("payments").getJSONArray("captures").getJSONObject(0).getString("id");
return ordersCaptureInfo;
}