From b69b050fbcf2ab38ee95957c34a872dbfda2367e Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 2 Nov 2017 23:23:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=BE=AE=E4=BF=A1=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AE=B2=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2fa0bf6..53250b7 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ ######单一支付教程 - [支付宝](pay-java-ali?dir=1&filepath=pay-java-ali) - [微信](pay-java-wx?dir=1&filepath=pay-java-wx) + [基础模块支付宝微信讲解](pay-java-parent/wikis/Home) + [友店微信](pay-java-wx-youdian?dir=1&filepath=pay-java-youdian) [富友](pay-java-fuiou?dir=1&filepath=pay-java-fuiou) From d84db989486d50e801bfbf4bfcc38dc61caddbce Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 2 Nov 2017 23:24:15 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=BE=AE=E4=BF=A1=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AE=B2=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 53250b7..e9f84ff 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ 开发版 https://git.oschina.net/egzosn/pay-java-parent/tree/develop +详细文档请看 [wiki](wikis/Home)。 + ###特性 From 623ba461986e018a6ca32708557856454a93803e Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 2 Nov 2017 23:24:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=BE=AE=E4=BF=A1=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AE=B2=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9f84ff..fc44c95 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ ######单一支付教程 - [基础模块支付宝微信讲解](pay-java-parent/wikis/Home) + [基础模块支付宝微信讲解](wikis/Home) [友店微信](pay-java-wx-youdian?dir=1&filepath=pay-java-youdian) [富友](pay-java-fuiou?dir=1&filepath=pay-java-fuiou) From 04215636675be1b92c2e85991054488ca9b049fc Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 2 Nov 2017 23:25:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=BE=AE=E4=BF=A1=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AE=B2=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fc44c95..d1c7ddc 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ 开发版 https://git.oschina.net/egzosn/pay-java-parent/tree/develop -详细文档请看 [wiki](wikis/Home)。 +详细文档请看 [wiki](/wikis/Home)。 ###特性 @@ -59,7 +59,7 @@ ######单一支付教程 - [基础模块支付宝微信讲解](wikis/Home) + [基础模块支付宝微信讲解](/wikis/Home) [友店微信](pay-java-wx-youdian?dir=1&filepath=pay-java-youdian) [富友](pay-java-fuiou?dir=1&filepath=pay-java-fuiou) From dcf445876e6ce84aadadcf326073b3a05c192d99 Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 2 Nov 2017 23:26:17 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=BE=AE=E4=BF=A1=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AE=B2=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d1c7ddc..ed12358 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ 开发版 https://git.oschina.net/egzosn/pay-java-parent/tree/develop -详细文档请看 [wiki](/wikis/Home)。 +详细文档请看 [wiki](https://gitee.com/egzosn/pay-java-parent/wikis/Home)。 ###特性 @@ -59,7 +59,7 @@ ######单一支付教程 - [基础模块支付宝微信讲解](/wikis/Home) + [基础模块支付宝微信讲解](https://gitee.com/egzosn/pay-java-parent/wikis/Home) [友店微信](pay-java-wx-youdian?dir=1&filepath=pay-java-youdian) [富友](pay-java-fuiou?dir=1&filepath=pay-java-fuiou) From bcda184f943e35cf5c1581c91afdd88df764f49c Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 2 Nov 2017 23:27:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=BE=AE=E4=BF=A1=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=AE=B2=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ed12358..a31cf77 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ 开发版 https://git.oschina.net/egzosn/pay-java-parent/tree/develop -详细文档请看 [wiki](https://gitee.com/egzosn/pay-java-parent/wikis/Home)。 +##### 详细文档请看 [wiki](https://gitee.com/egzosn/pay-java-parent/wikis/Home)。 -###特性 +### 特性 @@ -21,12 +21,12 @@ 6. 简单快速完成支付模块的开发 7. 支持多种支付类型多支付账户扩展（目前已支持微信支付，支付宝支付，友店支付） -###本项目包含 3 个部分： +### 本项目包含 3 个部分： 1. pay-java-common 公共lib,支付核心与规范定义 2. pay-java-demo 具体的支付demo 3. pay-java-* 具体的支付实现库 -###Maven配置 +### Maven配置 支付核心模块 ```xml @@ -52,12 +52,12 @@ -###使用 +### 使用 这里不多说直接上代码 集群的话,友店可能会有bug。 测试链接 ： http://pay.egzosn.com/index.html -######单一支付教程 +###### 单一支付教程 [基础模块支付宝微信讲解](https://gitee.com/egzosn/pay-java-parent/wikis/Home) @@ -69,7 +69,7 @@ android 例子 [pay-java-android](http://git.oschina.net/egzosn/pay-java-android) -##交流 +## 交流 很希望更多志同道合友友一起扩展新的的支付接口。 这里感谢[ouyangxiangshao](https://github.com/ouyangxiangshao),[ZhuangXiong](https://github.com/ZhuangXiong) 与[Actinian](http://git.oschina.net/Actinia517) 所提交的安卓例子或者分支 From 3cd5ea5eae3ab4d281d8d8f7356bd8c9c7e71771 Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 9 Nov 2017 15:39:18 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/egzosn/pay/wx/api/WxPayService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 8264e88..64d124d 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 @@ -213,8 +213,6 @@ public class WxPayService extends BasePayService { SortedMap params = new TreeMap(); - - params.put("partnerid", payConfigStorage.getPid()); params.put("package", "prepay_id=" + result.get("prepay_id")); if (WxTransactionType.JSAPI == order.getTransactionType()) { params.put("signType", payConfigStorage.getSignType()); @@ -223,6 +221,7 @@ public class WxPayService extends BasePayService { params.put("timeStamp", System.currentTimeMillis() / 1000); params.put("nonceStr", result.get("nonce_str")); } else if (WxTransactionType.APP == order.getTransactionType()) { + params.put("partnerid", payConfigStorage.getPid()); params.put("appid", payConfigStorage.getAppid()); params.put("prepayid", result.get("prepay_id")); params.put("timestamp", System.currentTimeMillis() / 1000); From de937ecc59bf5d22e0609cd02e8e5e7fa40e76a3 Mon Sep 17 00:00:00 2001 From: egzosn Date: Thu, 9 Nov 2017 15:43:05 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/egzosn/pay/wx/api/WxPayService.java | 1 - 1 file changed, 1 deletion(-) 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 64d124d..671ceb2 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 @@ -217,7 +217,6 @@ public class WxPayService extends BasePayService { if (WxTransactionType.JSAPI == order.getTransactionType()) { params.put("signType", payConfigStorage.getSignType()); params.put("appId", payConfigStorage.getAppid()); - params.put("prepayid", result.get("prepay_id")); params.put("timeStamp", System.currentTimeMillis() / 1000); params.put("nonceStr", result.get("nonce_str")); } else if (WxTransactionType.APP == order.getTransactionType()) {