diff --git a/README.md b/README.md index 6c1674a..0273a15 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ com.egzosn pay-java-common - 2.0.7-RELEASE + 2.0.8-RELEASE ``` @@ -45,7 +45,7 @@ com.egzosn {module-name} - 2.0.7-RELEASE + 2.0.8-RELEASE ``` @@ -65,6 +65,8 @@ * [友店微信](pay-java-wx-youdian?dir=1&filepath=pay-java-youdian) * [富友](pay-java-fuiou?dir=1&filepath=pay-java-fuiou) * [银联](pay-java-union?dir=1&filepath=pay-java-union) + * [payoneer](pay-java-payoneer?dir=1&filepath=pay-java-payoneer) + * [paypal](pay-java-paypal?dir=1&filepath=pay-java-paypal) 支付整合》服务端+网页端详细使用与简单教程请看 [pay-java-demo](pay-java-demo?dir=1&filepath=pay-java-demo) diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index f8d3e57..881d9fa 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 pay-java-ali diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index 10ce445..c86d418 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java index b42b72b..d911f32 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java @@ -72,7 +72,7 @@ public abstract class BasePayService implements PayService { /** - * Generate a Base64 encoded String from user & password + * Generate a Base64 encoded String from user , password * @param user 用户名 * @param password 密码 * @return authorizationString diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java index f4090a1..d444aa8 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java @@ -78,6 +78,7 @@ public class XML { * 解析xml并转化为Json值 * * @param content json字符串 + * @param clazz 需要转化的类 * @return Json值 */ public static T toBean(String content, Class clazz) { diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index ddfcf01..0c8bee1 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 war @@ -52,6 +52,11 @@ pay-java-paypal ${pay.version} + + com.egzosn + pay-java-union + ${pay.version} + @@ -89,16 +94,6 @@ jackson-databind 2.8.4 - - com.egzosn - pay-java-union - ${pay.version} - - - com.egzosn - pay-java-paypal - 2.0.8-SNAPSHOT - diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java index 70174f9..685179f 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java @@ -39,8 +39,8 @@ public class PayPalPayController { @PostConstruct public void init() { PayPalConfigStorage storage = new PayPalConfigStorage(); - storage.setClientID("AUWunqrIzeSLQTQqRp_gQwkt1vLRcVa5kJIO4mp0ZvQnTreLmxaji9bqOFpqz-0h8mdeQpYxix6g_PRD"); - storage.setClientSecret("EJFAZoD_ZG7PoRutRhX93TmeWs-DQ-PjdBkgr0j4GZA6lqAgmS2Z7yKQWqnTP5O74KqBaYOZnUEcq3Ug"); + storage.setClientID("商户id"); + storage.setClientSecret("商户密钥"); storage.setTest(true); //发起付款后的页面转跳地址 storage.setReturnUrl("http://127.0.0.1:8088/pay/success"); diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayoneerPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayoneerPayController.java index ca90e22..731ede6 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayoneerPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayoneerPayController.java @@ -38,6 +38,7 @@ public class PayoneerPayController { configStorage.setInputCharset("utf-8"); configStorage.setUserName("PayoneerPay 用户名"); configStorage.setApiPassword("PayoneerPay API password"); + // 是否为测试账号，沙箱环境 configStorage.setTest(true); service = new PayoneerPayService(configStorage); diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 5071180..539afd2 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/README.md b/pay-java-payoneer/README.md index d7d2856..bc3132a 100644 --- a/pay-java-payoneer/README.md +++ b/pay-java-payoneer/README.md @@ -6,26 +6,18 @@ ```java - PayoneerConfigStorage configStorage = new PayoneerConfigStorage(); - configStorage.setProgramId("商户id"); - configStorage.setMsgType(MsgType.json); - configStorage.setInputCharset("utf-8"); + PayoneerConfigStorage configStorage = new PayoneerConfigStorage(); + configStorage.setProgramId("商户id"); + configStorage.setMsgType(MsgType.json); + configStorage.setInputCharset("utf-8"); + configStorage.setUserName("PayoneerPay 用户名"); + configStorage.setApiPassword("PayoneerPay API password"); + configStorage.setTest(true); //是否为测试账号，沙箱环境 configStorage.setTest(true); -``` - -#### 网络请求配置 - -```java - - //Basic Auth - HttpConfigStorage httpConfigStorage = new HttpConfigStorage(); - httpConfigStorage.setAuthUsername("PayoneerPay 用户名"); - httpConfigStorage.setAuthPassword("PayoneerPay API password"); - ``` diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index 1c8b920..2f27c2f 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/README.md b/pay-java-paypal/README.md new file mode 100644 index 0000000..f4e5e45 --- /dev/null +++ b/pay-java-paypal/README.md @@ -0,0 +1,80 @@ + + +## paypal简单例子 + +#### 支付配置 + +```java + + PayPalConfigStorage storage = new PayPalConfigStorage(); + storage.setClientID("商户id"); + storage.setClientSecret("商户密钥"); + storage.setTest(true); + //发起付款后的页面转跳地址 + storage.setReturnUrl("http://127.0.0.1:8088/pay/success"); + //取消按钮转跳地址,这里用异步通知地址的兼容的做法 + storage.setNotifyUrl("http://127.0.0.1:8088/pay/cancel"); + + +``` + + + +#### 创建支付服务 + + +```java + //支付服务 + PayService service = new PayPalPayService(configStorage); + +``` + + +#### 创建支付订单信息 + +```java + + //支付订单基础信息 + PayOrder order = new PayOrder("Order_payment:", "Order payment", price, UUID.randomUUID().toString().replace("-", ""), PayPalTransactionType.sale); + +``` + +#### 网页支付 + +```java + + + //币种 + order.setCurType(CurType.USD); + Map orderInfo = service.orderInfo(order); + service.buildRequest(orderInfo, MethodType.POST); +``` + +#### 授权回调处理 + +```java + + /*-----------回调处理-------------------*/ + //HttpServletRequest request; + Map params = service.getParameter2Map(request.getParameterMap(), request.getInputStream()); + if (service.verify(params)){ + System.out.println("支付成功"); + return; + } + System.out.println("支付失败"); + + + /*-----------回调处理-------------------*/ + +``` + +#### 申请退款接口 + ```java + RefundOrder order = new RefundOrder(); + order.setCurType(CurType.USD); + order.setDescription(" description "); + order.setTradeNo("paypal 平台的单号"); + order.setRefundAmount(new BigDecimal(0.01)); + Map result = service.refund(order); + +``` diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index f728095..25300eb 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 diff --git a/pay-java-paypal/test/java/PayTest.java b/pay-java-paypal/test/java/PayTest.java deleted file mode 100644 index 6f339e3..0000000 --- a/pay-java-paypal/test/java/PayTest.java +++ /dev/null @@ -1,27 +0,0 @@ -import com.egzosn.pay.common.bean.PayOrder; -import com.egzosn.pay.paypal.api.PayPalConfigStorage; -import com.egzosn.pay.paypal.api.PayPalPayService; -import com.egzosn.pay.paypal.bean.PayPalTransactionType; - -import java.math.BigDecimal; -import java.util.Map; -import java.util.UUID; - -/** - * Created by egzosn on 2018/4/28. - */ -public class PayTest { - - public static void main(String[] args) { - PayPalConfigStorage storage = new PayPalConfigStorage(); - storage.setClientID("AUWunqrIzeSLQTQqRp_gQwkt1vLRcVa5kJIO4mp0ZvQnTreLmxaji9bqOFpqz-0h8mdeQpYxix6g_PRD"); - storage.setClientSecret("EJFAZoD_ZG7PoRutRhX93TmeWs-DQ-PjdBkgr0j4GZA6lqAgmS2Z7yKQWqnTP5O74KqBaYOZnUEcq3Ug"); - storage.setTest(true); - storage.setReturnUrl("http://127.0.0.1:8088/pay/success"); - PayPalPayService service = new PayPalPayService(storage); - PayOrder order = new PayOrder("订单title", "摘要", new BigDecimal(0.01) , UUID.randomUUID().toString().replace("-", ""), PayPalTransactionType.sale); - Map orderInfo = service.orderInfo(order); - System.out.println(orderInfo); - - } -} diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index 40a4c68..45552c9 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index 3e88c52..a6e925b 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.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index 0bd3c30..ff43786 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.0.0 pay-java-wx diff --git a/pom.xml b/pom.xml index dd09ef8..ae5f360 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.0.8-SNAPSHOT + 2.0.8-RELEASE Pay Java - Parent Pay Java Parent @@ -51,7 +51,7 @@ - 2.0.8-SNAPSHOT + 2.0.8-RELEASE 4.5.4 1.2.17 1.2.41 @@ -121,7 +121,7 @@ utf-8 -