diff --git a/pay-java-ali/README.md b/pay-java-ali/README.md index 166131d..d48313c 100644 --- a/pay-java-ali/README.md +++ b/pay-java-ali/README.md @@ -269,7 +269,14 @@ #### 查询退款 ```java - Map result = service.refundquery("支付宝单号", "我方系统单号"); + RefundOrder order = new RefundOrder(); + order.setOutTradeNo("我方系统商户单号"); + order.setTradeNo("支付宝单号"); + //退款金额 + order.setRefundAmount(new BigDecimal(1)); + order.setRefundNo("退款单号"); + order.setDescription(""); + Map result = service.refundquery(); ``` @@ -282,15 +289,17 @@ #### 转账 ```java - TransferOrder order = new TransferOrder(); - order.setOutNo("商户转账订单号"); - order.setPayeeAccount("收款方账户,支付宝登录号,支持邮箱和手机号格式"); - order.setAmount(new BigDecimal(10)); - order.setPayerName("付款方姓名, 非必填"); - order.setPayeeName("收款方真实姓名, 非必填"); + order.setOutBizNo("转账单号"); + order.setTransAmount(new BigDecimal(10)); + order.setOrderTitle("转账业务的标题"); + order.setIdentity("参与方的唯一标识"); + order.setIdentityType("参与方的标识类型,目前支持如下类型:"); + order.setName("参与方真实姓名"); order.setRemark("转账备注, 非必填"); - //收款方账户类型 ,默认值 ALIPAY_LOGONID:支付宝登录号,支持邮箱和手机号格式。 - order.setTransferType(AliTransferType.ALIPAY_LOGONID); + //单笔无密转账到支付宝账户 + order.setTransferType(AliTransferType.TRANS_ACCOUNT_NO_PWD); + //单笔无密转账到银行卡 +// order.setTransferType(AliTransferType.TRANS_BANKCARD_NO_PWD); Map result = service.transfer(order); ``` diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 274ef1d..c80b21b 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -587,7 +587,11 @@ public class AliPayService extends BasePayService { if (!StringUtils.isEmpty(refundOrder.getRefundNo())) { bizContent.put("out_request_no", refundOrder.getRefundNo()); } - bizContent.putAll(refundOrder.getAttrs()); + OrderParaStructure.loadParameters(parameters, "biz_type", refundOrder); + OrderParaStructure.loadParameters(parameters, "refund_reason", refundOrder.getDescription()); + OrderParaStructure.loadParameters(parameters, "store_id", refundOrder); + OrderParaStructure.loadParameters(parameters, "terminal_id", refundOrder); +// bizContent.putAll(refundOrder.getAttrs()); //设置请求参数的集合 parameters.put(BIZ_CONTENT, JSON.toJSONString(bizContent)); //设置签名 diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/RefundOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/RefundOrder.java index f3cb108..4bc0fa9 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/RefundOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/RefundOrder.java @@ -44,6 +44,10 @@ public class RefundOrder extends AssistOrder { */ private String userId; + /** + * 退款URL + */ + private String refundUrl; public String getRefundNo() { return refundNo; @@ -125,4 +129,11 @@ public class RefundOrder extends AssistOrder { this.totalAmount = totalAmount; } + public String getRefundUrl() { + return refundUrl; + } + + public void setRefundUrl(String refundUrl) { + this.refundUrl = refundUrl; + } } diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java index df8f2e6..f88f71a 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java @@ -340,11 +340,17 @@ public class AliPayController { /** * 查询退款 * - * @param order 订单的请求体 * @return 返回支付方查询退款后的结果 */ @RequestMapping("refundquery") - public Map refundquery(RefundOrder order) { + public Map refundquery() { + RefundOrder order = new RefundOrder(); + order.setOutTradeNo("我方系统商户单号"); + order.setTradeNo("支付宝单号"); + //退款金额 + order.setRefundAmount(new BigDecimal(1)); + order.setRefundNo("退款单号"); + order.setDescription(""); return service.refundquery(order); }