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-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 57987c7..cd83c9b 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
@@ -264,7 +264,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());
@@ -272,7 +272,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;
@@ -310,4 +310,6 @@ public class PayPalPayService extends BasePayService{
public Map secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) {
return Collections.emptyMap();
}
+
+
}
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..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
@@ -604,7 +604,7 @@ 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())){
@@ -613,7 +613,9 @@ public class WxPayService extends BasePayService {
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);
}
@@ -636,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");
//当存在时候 校验收款用户真实姓名
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("签名方式");
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