From 55b3a6280b96638c00c0bb9d66b2e2fec1342b96 Mon Sep 17 00:00:00 2001 From: egzosn Date: Fri, 22 Feb 2019 10:17:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=BD=AC=E8=B4=A6?= =?UTF-8?q?=E5=88=B0=E4=BD=99=E9=A2=9D=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-ali/pom.xml | 2 +- pay-java-common/pom.xml | 2 +- .../com/egzosn/pay/common/bean/TransferOrder.java | 13 +++++++++++++ pay-java-demo/pom.xml | 2 +- pay-java-fuiou/pom.xml | 2 +- pay-java-payoneer/pom.xml | 2 +- pay-java-paypal/pom.xml | 2 +- pay-java-union/pom.xml | 2 +- pay-java-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- .../java/com/egzosn/pay/wx/api/WxPayService.java | 2 ++ pom.xml | 4 ++-- 12 files changed, 26 insertions(+), 11 deletions(-) diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index 71ecd45..1e4d3b7 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 pay-java-ali diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index d5bf681..8d56620 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java index 16ee000..826f4a7 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransferOrder.java @@ -55,6 +55,11 @@ public class TransferOrder { */ private TransferType transferType; + /** + * 操作者ip，根据支付平台所需进行设置 + */ + private String ip; + public String getOutNo() { return outNo; } @@ -126,4 +131,12 @@ public class TransferOrder { public void setTransferType(TransferType transferType) { this.transferType = transferType; } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } } diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index dcb9ed4..28b1968 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 war diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 6a1dd2d..47c8c94 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index 12c760a..33dbf41 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index c1aa1e0..94cfb71 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index c8476c5..8a5fe3e 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index 5a41758..a116b35 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index f8930da..e7bf24e 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.6 + 2.12.7-SNAPSHOT 4.0.0 pay-java-wx diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index a571620..31bed50 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -610,6 +610,7 @@ public class WxPayService extends BasePayService { if (!StringUtils.isEmpty(order.getRemark())){ parameters.put("desc", order.getRemark()); } + parameters.put("nonce_str", SignUtils.randomStr()); if (null != order.getTransferType() && TRANSFERS == order.getTransferType()){ transfers(parameters, order); @@ -636,6 +637,7 @@ public class WxPayService extends BasePayService { //转账到余额, 申请商户号的appid或商户号绑定的appid parameters.put("mch_appid", payConfigStorage.getAppid()); parameters.put("openid", order.getPayeeAccount()); + parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getIp()) ? "192.168.1.150" : order.getIp()); //默认不校验真实姓名 parameters.put("check_name", "NO_CHECK"); //当存在时候 校验收款用户真实姓名 diff --git a/pom.xml b/pom.xml index 1f8180f..643fa99 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.12.6 + 2.12.7-SNAPSHOT Pay Java - Parent Pay Java Parent @@ -56,7 +56,7 @@ - 2.12.6 + 2.12.7-SNAPSHOT 4.5.4 1.2.17 1.2.41 From fb47dedb1ad82fd5e5e769dc76fe95ab8b75ffb0 Mon Sep 17 00:00:00 2001 From: egzosn Date: Tue, 12 Mar 2019 12:51:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BB=98=E6=AC=BEapi?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6=E5=88=B0=E9=9B=B6=E9=92=B1=20=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=8F=B7=E5=8F=82=E6=95=B0=E5=90=8D=E5=A4=9A=E4=BA=86?= =?UTF-8?q?=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/egzosn/pay/wx/api/WxPayService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 31bed50..0449f26 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -604,17 +604,18 @@ public class WxPayService extends BasePayService { public Map transfer(TransferOrder order) { Map parameters = new TreeMap(); - parameters.put("mch_id", payConfigStorage.getPid()); + parameters.put("partner_trade_no", order.getOutNo()); parameters.put("amount", Util.conversionCentAmount(order.getAmount())); if (!StringUtils.isEmpty(order.getRemark())){ parameters.put("desc", order.getRemark()); } - parameters.put("nonce_str", SignUtils.randomStr()); if (null != order.getTransferType() && TRANSFERS == order.getTransferType()){ transfers(parameters, order); + parameters.put("mchid", payConfigStorage.getPid()); }else { + parameters.put("mch_id", payConfigStorage.getPid()); order.setTransferType(WxTransferType.PAY_BANK); payBank(parameters, order); } @@ -637,7 +638,6 @@ public class WxPayService extends BasePayService { //转账到余额, 申请商户号的appid或商户号绑定的appid parameters.put("mch_appid", payConfigStorage.getAppid()); parameters.put("openid", order.getPayeeAccount()); - parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getIp()) ? "192.168.1.150" : order.getIp()); //默认不校验真实姓名 parameters.put("check_name", "NO_CHECK"); //当存在时候 校验收款用户真实姓名 From 017a843145c22bf9413385e18abc2b999dec28d3 Mon Sep 17 00:00:00 2001 From: egzosn Date: Tue, 12 Mar 2019 12:55:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=BD=AC=E8=B4=A6?= =?UTF-8?q?=E5=88=B0=E4=BD=99=E9=A2=9D=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/egzosn/pay/wx/api/WxPayService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 0449f26..abc52f0 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -638,6 +638,7 @@ public class WxPayService extends BasePayService { //转账到余额, 申请商户号的appid或商户号绑定的appid parameters.put("mch_appid", payConfigStorage.getAppid()); parameters.put("openid", order.getPayeeAccount()); + parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getIp()) ? "192.168.1.150" : order.getIp()); //默认不校验真实姓名 parameters.put("check_name", "NO_CHECK"); //当存在时候 校验收款用户真实姓名 From 9ec058c1febde771acefc5a6de9638e9ccdca090 Mon Sep 17 00:00:00 2001 From: egzosn Date: Fri, 15 Mar 2019 17:21:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-wx/src/test/java/PayTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pay-java-wx/src/test/java/PayTest.java b/pay-java-wx/src/test/java/PayTest.java index b0b8dd4..d793613 100644 --- a/pay-java-wx/src/test/java/PayTest.java +++ b/pay-java-wx/src/test/java/PayTest.java @@ -23,10 +23,15 @@ public class PayTest { public static void main(String[] args) { WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage(); + wxPayConfigStorage.setAppid("公众账号ID"); + wxPayConfigStorage.setMchId("合作者id（商户号）"); - wxPayConfigStorage.setAppid("应用id"); - wxPayConfigStorage.setKeyPublic("密钥"); - wxPayConfigStorage.setKeyPrivate("密钥"); + //以下两个参数在 服务商版模式中必填-------- +// wxPayConfigStorage.setSubAppid("子商户公众账号ID "); +// wxPayConfigStorage.setSubMchId("微信支付分配的子商户号 "); + //----------------------------------------------- + wxPayConfigStorage.setKeyPublic("转账公钥，转账时必填"); + wxPayConfigStorage.setSecretKey("密钥"); wxPayConfigStorage.setNotifyUrl("异步回调地址"); wxPayConfigStorage.setReturnUrl("同步回调地址"); wxPayConfigStorage.setSignType("签名方式"); From 3514c93f357bf9449415959f00c68c6df58b9138 Mon Sep 17 00:00:00 2001 From: egzosn Date: Wed, 20 Mar 2019 09:53:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=9D=E5=AE=9D=E6=94=AF=E4=BB=98=20payp?= =?UTF-8?q?al=E9=80=80=E6=AC=BE=E9=81=97=E6=BC=8F=EF=BC=8Cjson=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/egzosn/pay/paypal/api/PayPalPayService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java index 19c2332..e5114b8 100644 --- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java +++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java @@ -261,7 +261,7 @@ public class PayPalPayService extends BasePayService{ public Map refund(RefundOrder refundOrder) { JSONObject request = new JSONObject(); - if (null != refundOrder.getRefundAmount() && BigDecimal.ZERO.compareTo( refundOrder.getRefundAmount()) > 0){ + if (null != refundOrder.getRefundAmount() && BigDecimal.ZERO.compareTo( refundOrder.getRefundAmount()) == -1){ Amount amount = new Amount(); amount.setCurrency(refundOrder.getCurType().name()); amount.setTotal(Util.conversionAmount(refundOrder.getRefundAmount()).toString()); @@ -269,7 +269,7 @@ public class PayPalPayService extends BasePayService{ request.put("description", refundOrder.getDescription()); } - HttpStringEntity httpEntity = new HttpStringEntity(request, ContentType.APPLICATION_JSON); + HttpStringEntity httpEntity = new HttpStringEntity(request.toJSONString(), ContentType.APPLICATION_JSON); httpEntity.setHeaders(authHeader()); JSONObject resp = getHttpRequestTemplate().postForObject(getReqUrl(PayPalTransactionType.REFUND), httpEntity, JSONObject.class, refundOrder.getTradeNo()); return resp; @@ -307,4 +307,6 @@ public class PayPalPayService extends BasePayService{ public Map secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) { return Collections.emptyMap(); } + + }