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