diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml
index f31a779..f014c96 100644
--- a/pay-java-ali/pom.xml
+++ b/pay-java-ali/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
pay-java-ali
diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml
index 228a3d0..d336160 100644
--- a/pay-java-baidu/pom.xml
+++ b/pay-java-baidu/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
pay-java-baidu
diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml
index e0ad8d1..2ca60b8 100644
--- a/pay-java-common/pom.xml
+++ b/pay-java-common/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
jar
diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml
index 7c0de2a..6858975 100644
--- a/pay-java-demo/pom.xml
+++ b/pay-java-demo/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
war
diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml
index 6a834c7..52f09fc 100644
--- a/pay-java-fuiou/pom.xml
+++ b/pay-java-fuiou/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
pay-java-fuiou
diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml
index 9df1ded..d7e29fa 100644
--- a/pay-java-payoneer/pom.xml
+++ b/pay-java-payoneer/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
pay-java-payoneer
diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml
index 0abbb06..3886fb3 100644
--- a/pay-java-paypal/pom.xml
+++ b/pay-java-paypal/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml
index 6c539c1..a98787c 100644
--- a/pay-java-union/pom.xml
+++ b/pay-java-union/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
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 d1ef681..6e576fb 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
@@ -580,7 +580,7 @@ public class UnionPayService extends BasePayService {
* @param type UnionTransactionType.REFUND 或者UnionTransactionType.CONSUME_UNDO
* @return 返回支付方申请退款后的结果
*/
- public Map unionRefundOrConsumeUndo(String origQryId, String orderId, BigDecimal refundAmount, UnionTransactionType type) {
+ public UnionRefundResult unionRefundOrConsumeUndo(String origQryId, String orderId, BigDecimal refundAmount, UnionTransactionType type) {
return unionRefundOrConsumeUndo(new RefundOrder(orderId, origQryId, refundAmount), type);
}
diff --git a/pay-java-union/src/test/java/PayTest.java b/pay-java-union/src/test/java/PayTest.java
index 93ef3d5..659ea4c 100644
--- a/pay-java-union/src/test/java/PayTest.java
+++ b/pay-java-union/src/test/java/PayTest.java
@@ -1,18 +1,18 @@
-import com.egzosn.pay.common.bean.MethodType;
-import com.egzosn.pay.common.bean.PayOrder;
-import com.egzosn.pay.common.bean.RefundOrder;
-import com.egzosn.pay.union.api.UnionPayConfigStorage;
-import com.egzosn.pay.union.api.UnionPayService;
-import com.egzosn.pay.union.bean.UnionTransactionType;
-
import java.awt.image.BufferedImage;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
+import com.egzosn.pay.common.bean.MethodType;
+import com.egzosn.pay.common.bean.PayOrder;
+import com.egzosn.pay.common.bean.RefundOrder;
+import com.egzosn.pay.union.api.UnionPayConfigStorage;
+import com.egzosn.pay.union.api.UnionPayService;
+import com.egzosn.pay.union.bean.UnionRefundResult;
+import com.egzosn.pay.union.bean.UnionTransactionType;
+
/**
- *
* Descrption:银联支付测试
* Author:Actinia
* Date:2017/12/19 21:12
@@ -52,7 +52,7 @@ public class PayTest {
//支付服务
UnionPayService service = new UnionPayService(unionPayConfigStorage);
//支付订单基础信息
- PayOrder payOrder = new PayOrder("订单title", "摘要", BigDecimal.valueOf(0.01) , new SimpleDateFormat("yyyyMMddHHmmss").format(System.currentTimeMillis()));
+ PayOrder payOrder = new PayOrder("订单title", "摘要", BigDecimal.valueOf(0.01), new SimpleDateFormat("yyyyMMddHHmmss").format(System.currentTimeMillis()));
/*----------- 网页支付-------------------*/
@@ -79,34 +79,34 @@ public class PayTest {
/*-----------消费(被扫场景)待定------------------------------*/
payOrder.setTransactionType(UnionTransactionType.CONSUME);
payOrder.setAuthCode("C2B码(条码号),1-20位数字");
- params = service.microPay(payOrder);
+ params = service.microPay(payOrder);
/*-----------消费(被扫场景)------------------------------*/
// /*-----------消费撤销------------------------------*/
- params = service.unionRefundOrConsumeUndo(new RefundOrder( "订单号", "原交易查询流水号", new BigDecimal("退款金额" )),UnionTransactionType.CONSUME_UNDO);
+ UnionRefundResult refundResult = service.unionRefundOrConsumeUndo(new RefundOrder("订单号", "原交易查询流水号", new BigDecimal("退款金额")), UnionTransactionType.CONSUME_UNDO);
// /*-----------消费撤销------------------------------*/
/*-----------交易状态查询交易:只有同步应答------------------------------*/
payOrder.setTransactionType(UnionTransactionType.QUERY);
- params = service.query(null,"商户单号");
+ params = service.query(null, "商户单号");
/*-----------交易状态查询交易:只有同步应答------------------------------*/
/*-----------退货交易:后台资金类交易,有同步应答和后台通知应答------------------------------*/
payOrder.setTransactionType(UnionTransactionType.REFUND);
- params = service.refund(new RefundOrder("原交易查询流水号", "订单号", null, new BigDecimal("退款金额" )));
+ refundResult = service.refund(new RefundOrder("原交易查询流水号", "订单号", null, new BigDecimal("退款金额")));
/*-----------退货交易:后台资金类交易,有同步应答和后台通知应答------------------------------*/
/*-----------文件传输类接口:后台获取对账文件交易,只有同步应答 ------------------------------*/
- Map fileConten = service.downloadbill(new Date(),"文件类型,一般商户填写00即可"); /*-----------退货交易:后台资金类交易,有同步应答和后台通知应答------------------------------*/
+ Map fileConten = service.downloadbill(new Date(), "文件类型,一般商户填写00即可"); /*-----------退货交易:后台资金类交易,有同步应答和后台通知应答------------------------------*/
- /*-----------回调处理-------------------*/
+ /*-----------回调处理-------------------*/
// HttpServletRequest request
// params = service.getParameter2Map(request.getParameterMap(), request.getInputStream());
- if (service.verify(params)){
+ if (service.verify(params)) {
System.out.println("支付成功");
return;
}
diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml
index 2081227..c0db493 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.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
pay-java-wx-youdian
diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml
index dfe0e5d..b9d7a20 100644
--- a/pay-java-wx/pom.xml
+++ b/pay-java-wx/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
pay-java-wx
diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml
index 0a3ac4e..a03c038 100644
--- a/pay-java-yiji/pom.xml
+++ b/pay-java-yiji/pom.xml
@@ -5,7 +5,7 @@
pay-java-parent
com.egzosn
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.0.0
diff --git a/pom.xml b/pom.xml
index fc3322b..cfa1e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.egzosn
pay-java-parent
pom
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
Pay Java - Parent
Pay Java Parent
@@ -58,13 +58,13 @@
pay-java-paypal
pay-java-yiji
pay-java-baidu
- pay-java-demo
+
- 2.13.4-SNAPSHOT
+ 2.13.3-b1
4.5.4
1.2.17
1.2.73