{
params.put("refund_amt", Util.conversionCentAmount(refundOrder.getRefundAmount()));
//备注
params.put("rem", "");
+ params.putAll(refundOrder.getAttrs());
params.put("md5", createSign(SignUtils.parameters2MD5Str(params, "|"), payConfigStorage.getInputCharset()));
JSONObject resultJson = getHttpRequestTemplate().postForObject(getReqUrl() + URL_FuiouSmpRefundGate, params, JSONObject.class);
return resultJson;
diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml
index 2f48989..7a79e0c 100644
--- a/pay-java-payoneer/pom.xml
+++ b/pay-java-payoneer/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.2
+ 2.13.3-SNAPSHOT
4.0.0
pay-java-payoneer
diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml
index 69a23cb..0fba2f8 100644
--- a/pay-java-paypal/pom.xml
+++ b/pay-java-paypal/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.2
+ 2.13.3-SNAPSHOT
4.0.0
diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml
index 6f98cb3..abff084 100644
--- a/pay-java-union/pom.xml
+++ b/pay-java-union/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.2
+ 2.13.3-SNAPSHOT
4.0.0
diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java
index 419beb0..24d64da 100644
--- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java
+++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java
@@ -34,7 +34,7 @@ import java.util.*;
/**
* @author Actinia
- *
+ *
* email hayesfu@qq.com
* create 2017 2017/11/5
*
@@ -62,6 +62,7 @@ public class UnionPayService extends BasePayService {
* 证书解释器
*/
private CertDescriptor certDescriptor;
+
/**
* 构造函数
*
@@ -100,6 +101,7 @@ public class UnionPayService extends BasePayService {
return this;
}
+
/**
* 获取支付请求地址
*
@@ -110,6 +112,7 @@ public class UnionPayService extends BasePayService {
public String getReqUrl(TransactionType transactionType) {
return (payConfigStorage.isTest() ? TEST_BASE_DOMAIN : RELEASE_BASE_DOMAIN);
}
+
/**
* 根据是否为沙箱环境进行获取请求地址
*
@@ -227,6 +230,7 @@ public class UnionPayService extends BasePayService {
* 超过此时间后，除网银交易外，其他交易银联系统会拒绝受理，提示超时。 跳转银行网银交易如果超时后交易成功，会自动退款，大约5个工作日金额返还到持卡人账户。
* 此时间建议取支付时的北京时间加15分钟。
* 超过超时时间调查询接口应答origRespCode不是A6或者00的就可以判断为失败。
+ *
* @param expirationTime 超时时间
* @return 具体的时间字符串
*/
@@ -237,6 +241,7 @@ public class UnionPayService extends BasePayService {
}
return DateUtils.formatDate(new Timestamp(System.currentTimeMillis() + 30 * 60 * 1000), DateUtils.YYYYMMDDHHMMSS);
}
+
/**
* 返回创建的订单信息
*
@@ -256,7 +261,7 @@ public class UnionPayService extends BasePayService {
params.put(SDKConstants.param_orderId, order.getOutTradeNo());
- if (StringUtils.isNotEmpty(order.getAddition())){
+ if (StringUtils.isNotEmpty(order.getAddition())) {
params.put(SDKConstants.param_reqReserved, order.getAddition());
}
switch (type) {
@@ -286,7 +291,7 @@ public class UnionPayService extends BasePayService {
params.put("orderDesc", order.getSubject());
}
params.putAll(order.getAttrs());
- params = preOrderHandler(params, order);
+ params = preOrderHandler(params, order);
return setSign(params);
}
@@ -362,7 +367,8 @@ public class UnionPayService extends BasePayService {
CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
- /*PKIXCertPathBuilderResult result = (PKIXCertPathBuilderResult)*/ builder.build(pkixParams);
+ /*PKIXCertPathBuilderResult result = (PKIXCertPathBuilderResult)*/
+ builder.build(pkixParams);
return cert;
} catch (java.security.cert.CertPathBuilderException e) {
LOG.error("verify certificate chain fail.", e);
@@ -384,7 +390,7 @@ public class UnionPayService extends BasePayService {
public JSONObject postOrder(PayOrder order) {
Map params = orderInfo(order);
String responseStr = getHttpRequestTemplate().postForObject(this.getBackTransUrl(), params, String.class);
- JSONObject response = UriVariables.getParametersToMap(responseStr);
+ JSONObject response = UriVariables.getParametersToMap(responseStr);
if (response.isEmpty()) {
throw new PayErrorException(new PayException("failure", "响应内容有误!", responseStr));
}
@@ -394,9 +400,9 @@ public class UnionPayService extends BasePayService {
@Override
public String toPay(PayOrder order) {
- if (null == order.getTransactionType()){
+ if (null == order.getTransactionType()) {
order.setTransactionType(UnionTransactionType.WEB);
- }else if (UnionTransactionType.WEB != order.getTransactionType() && UnionTransactionType.WAP != order.getTransactionType() && UnionTransactionType.B2B != order.getTransactionType()){
+ } else if (UnionTransactionType.WEB != order.getTransactionType() && UnionTransactionType.WAP != order.getTransactionType() && UnionTransactionType.B2B != order.getTransactionType()) {
throw new PayErrorException(new PayException("-1", "错误的交易类型:" + order.getTransactionType()));
}
@@ -511,12 +517,13 @@ public class UnionPayService extends BasePayService {
/**
* 功能：将订单信息进行签名并提交请求
* 业务范围：手机支付控件（含安卓Pay）
- * @param order 订单信息
- * @return 成功：返回支付结果 失败：返回
+ *
+ * @param order 订单信息
+ * @return 成功：返回支付结果 失败：返回
*/
@Override
- public Map app(PayOrder order){
- if (null == order.getTransactionType()){
+ public Map app(PayOrder order) {
+ if (null == order.getTransactionType()) {
order.setTransactionType(UnionTransactionType.APP);
}
JSONObject response = postOrder(order);
@@ -590,6 +597,7 @@ public class UnionPayService extends BasePayService {
params.put(SDKConstants.param_orderId, refundOrder.getRefundNo());
params.put(SDKConstants.param_txnAmt, Util.conversionCentAmount(refundOrder.getRefundAmount()));
params.put(SDKConstants.param_origQryId, refundOrder.getTradeNo());
+ params.putAll(refundOrder.getAttrs());
this.setSign(params);
String responseStr = getHttpRequestTemplate().postForObject(this.getBackTransUrl(), params, String.class);
JSONObject response = UriVariables.getParametersToMap(responseStr);
diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml
index 0adb30f..d43cfda 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.13.2
+ 2.13.3-SNAPSHOT
4.0.0
pay-java-wx-youdian
diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml
index 696288d..f2dca76 100644
--- a/pay-java-wx/pom.xml
+++ b/pay-java-wx/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.2
+ 2.13.3-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 f6bb106..b91cbaf 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
@@ -499,6 +499,8 @@ public class WxPayService extends BasePayService implements
parameters.put("refund_fee_type", refundOrder.getCurType().getType());
}
setParameters(parameters, "refund_desc", refundOrder.getDescription());
+ //附加参数，这里可进行覆盖前面所有参数
+ parameters.putAll(refundOrder.getAttrs());
//设置签名
setSign(parameters);
return requestTemplate.postForObject(getReqUrl(WxTransactionType.REFUND), XML.getMap2Xml(parameters), JSONObject.class);
diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml
index 40a4186..45ce907 100644
--- a/pay-java-yiji/pom.xml
+++ b/pay-java-yiji/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.2
+ 2.13.3-SNAPSHOT
4.0.0
diff --git a/pom.xml b/pom.xml
index b6e033c..952c79d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.egzosn
pay-java-parent
pom
- 2.13.2
+ 2.13.3-SNAPSHOT
Pay Java - Parent
Pay Java Parent
@@ -64,7 +64,7 @@
- 2.13.2
+ 2.13.3-SNAPSHOT
4.5.4
1.2.17
1.2.58