From b9c6a82a373e06dd0b9f0def65a4efa7a72194ed Mon Sep 17 00:00:00 2001 From: egan Date: Wed, 17 Apr 2019 20:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E6=B3=A8=E9=87=8A=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egzosn/pay/common/bean/CountryCode.java | 2 +- .../pay/common/bean/DefaultCountryCode.java | 2 +- .../pay/common/http/HttpConfigStorage.java | 1 + .../java/com/egzosn/pay/common/util/XML.java | 4 +- .../pay/common/util/sign/CertDescriptor.java | 1 - .../pay/demo/controller/AliPayController.java | 10 +++-- .../pay/demo/controller/PayController.java | 40 ++++++++++++------- .../demo/controller/PayPalPayController.java | 13 +++--- .../controller/PayoneerPayController.java | 17 ++++---- .../demo/controller/UnionPayController.java | 17 ++++---- .../pay/demo/controller/WxPayController.java | 25 +++++++----- .../pay/demo/dao/ApyAccountRepository.java | 6 +-- .../egzosn/pay/demo/entity/ApyAccount.java | 4 +- .../egzosn/pay/demo/request/QueryOrder.java | 4 +- .../pay/demo/service/ApyAccountService.java | 6 +-- .../egzosn/pay/demo/service/PayResponse.java | 4 +- .../handler/FuiouPayMessageHandler.java | 2 +- .../handler/PayoneerMessageHandler.java | 6 +-- .../handler/UnionPayMessageHandler.java | 2 +- .../handler/YouDianPayMessageHandler.java | 2 +- .../interceptor/AliPayMessageInterceptor.java | 3 +- .../YoudianPayMessageInterceptor.java | 3 +- pom.xml | 4 +- 23 files changed, 102 insertions(+), 76 deletions(-) diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CountryCode.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CountryCode.java index 443a0da..6806e7a 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CountryCode.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CountryCode.java @@ -16,7 +16,7 @@ public interface CountryCode { /** * 获取国家名称 - * @return + * @return 国家名称 */ String getName(); } diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/DefaultCountryCode.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/DefaultCountryCode.java index 39e5184..63abfc2 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/DefaultCountryCode.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/DefaultCountryCode.java @@ -38,7 +38,7 @@ public enum DefaultCountryCode implements CountryCode{ /** * 获取国家名称 * - * @return + * @return 国家名称 */ @Override public String getName() { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java index 4006a8a..5f6e39f 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java @@ -120,6 +120,7 @@ public class HttpConfigStorage { /** * 获取证书信息 * @return 证书信息 根据 {@link #getCertStoreType()}进行区别地址与信息串 + * @throws IOException 找不到文件异常 */ public InputStream getKeystoreInputStream() throws IOException { if (null == keystore) { 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 9e89e74..2410653 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 @@ -79,6 +79,7 @@ public class XML { * 解析xml并转化为Json值 * * @param content json字符串 + * @param charset 字符编码 * @return Json值 */ public static JSONObject toJSONObject(String content, Charset charset) { @@ -264,6 +265,7 @@ public class XML { * * @param data Map类型数据 * @param rootElementName 最外层节点名称 + * @param encoding 字符编码 * @return XML格式的字符串 */ public static String getMap2Xml(Map data, String rootElementName, String encoding) { @@ -312,7 +314,7 @@ public class XML { * * @param data Map类型数据 * @param document 文档 - * @return XML格式的字符串 + * @param element 节点 */ public static void map2Xml(Map data, Document document, org.w3c.dom.Element element) { for (Map.Entry entry : data.entrySet()) { diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java index f16c7d3..9d1e75d 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java @@ -214,7 +214,6 @@ public class CertDescriptor { * @param keyPwd 证书密码 * @param type 证书类型 * @return 证书对象 - * @throws IOException */ public KeyStore getKeyInfo(InputStream fxKeyFile, String keyPwd, String type) { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java index 25ab40f..625afa4 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java @@ -33,8 +33,8 @@ import java.util.UUID; * 发起支付入口 * * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 0:25 + * email egzosn@gmail.com + * date 2016/11/18 0:25 */ @RestController @RequestMapping("ali") @@ -118,6 +118,7 @@ public class AliPayController { * 二维码支付 * @param price 金额 * @return 二维码图像 + * @throws IOException IOException */ @RequestMapping(value = "toQrPay.jpg", produces = "image/jpeg;charset=UTF-8") public byte[] toWxQrPay( BigDecimal price) throws IOException { @@ -135,7 +136,7 @@ public class AliPayController { * @return 支付结果 */ @RequestMapping(value = "microPay") - public Map microPay(BigDecimal price, String authCode) throws IOException { + public Map microPay(BigDecimal price, String authCode) { //获取对应的支付账户操作工具（可根据账户id） //条码付 PayOrder order = new PayOrder("egan order", "egan order", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", ""), AliTransactionType.BAR_CODE); @@ -167,6 +168,7 @@ public class AliPayController { * * @return 返回对应的响应码 * @see #payBack(HttpServletRequest) + * @throws IOException IOException */ @Deprecated @RequestMapping(value = "payBackBefore.json") @@ -197,7 +199,7 @@ public class AliPayController { * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link com.egzosn.pay.common.api.PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} * * 如果未设置 {@link com.egzosn.pay.common.api.PayMessageHandler} 那么会使用默认的 {@link com.egzosn.pay.common.api.DefaultPayMessageHandler} - * + * @throws IOException IOException */ @RequestMapping(value = "payBack.json") public String payBack(HttpServletRequest request) throws IOException { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java index f8ac067..95fa828 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java @@ -39,8 +39,8 @@ import static com.egzosn.pay.demo.dao.ApyAccountRepository.apyAccounts; * 发起支付入口 * * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 0:25 + * email egzosn@gmail.com + * date 2016/11/18 0:25 */ @RestController @RequestMapping @@ -58,7 +58,7 @@ public class PayController { /** * 这里模拟账户信息增加 * - * @param account + * @param account 支付账户信息 * @return 支付账户信息 */ @RequestMapping("add") @@ -76,6 +76,7 @@ public class PayController { * 跳到支付页面 * 针对实时支付,即时付款 * + * @param request 请求 * @param payId 账户id * @param transactionType 交易类型， 这个针对于每一个 支付类型的对应的几种交易方式 * @param bankType 针对刷卡支付，卡的类型，类型值 @@ -114,7 +115,7 @@ public class PayController { /** * 跳到支付页面 * 针对实时支付,即时付款 - * + * @param request 请求 * @return 跳到支付页面 */ @RequestMapping(value = "toWxPay.html", produces = "text/html;charset=UTF-8") @@ -169,7 +170,7 @@ public class PayController { * @return 支付结果 */ @RequestMapping(value = "microPay") - public Map microPay(Integer payId, String transactionType, BigDecimal price, String authCode) throws IOException { + public Map microPay(Integer payId, String transactionType, BigDecimal price, String authCode) { //获取对应的支付账户操作工具（可根据账户id） PayResponse payResponse = service.getPayResponse(payId); @@ -196,7 +197,9 @@ public class PayController { * @param payId 账户id * @param transactionType 交易类型， 这个针对于每一个 支付类型的对应的几种交易方式 * @param price 金额 + * * @return 二维码图像 + * @throws IOException IOException */ @RequestMapping(value = "toQrPay.jpg", produces = "image/jpeg;charset=UTF-8") public byte[] toWxQrPay(Integer payId, String transactionType, BigDecimal price) throws IOException { @@ -215,7 +218,9 @@ public class PayController { * @param wxPayId 微信账户id * @param aliPayId 支付宝id * @param price 金额 + * @param request 请求 * @return 二维码图像 + * @throws IOException IOException */ @RequestMapping(value = "toWxAliQrPay.jpg", produces = "image/jpeg;charset=UTF-8") public byte[] toWxAliQrPay(Integer wxPayId, Integer aliPayId, BigDecimal price, HttpServletRequest request) throws IOException { @@ -243,7 +248,9 @@ public class PayController { * @param wxPayId 微信账户id * @param aliPayId 支付宝id * @param price 金额 + * @param request 请求 * @return 支付宝与微信平台的判断 + * @throws IOException IOException */ @RequestMapping(value = "toWxAliPay.html", produces = "text/html;charset=UTF-8") public String toWxAliPay(Integer wxPayId, Integer aliPayId, BigDecimal price, HttpServletRequest request) throws IOException { @@ -276,6 +283,7 @@ public class PayController { * * @param payId 支付账户id * @param transactionType 交易类型 + * @param price 金额 * @return 支付预订单信息 */ @RequestMapping("getOrderInfo") @@ -295,9 +303,10 @@ public class PayController { *

* 方式二，{@link #payBack(HttpServletRequest, Integer)} 是属于简化方式， 试用与简单的业务场景 * - * @param request - * @param payId + * @param request 请求 + * @param payId 账户id * @return 支付是否成功 + * @throws IOException IOException */ @RequestMapping(value = "payBackOne{payId}.json") public String payBackOne(HttpServletRequest request, @PathVariable Integer payId) throws IOException { @@ -327,11 +336,14 @@ public class PayController { * 支付回调地址 * 方式二 * - * @param request - * @return 拦截器相关增加， 详情查看{@link com.egzosn.pay.common.api.PayService#addPayMessageInterceptor(PayMessageInterceptor)} - *

- * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link com.egzosn.pay.common.api.PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} + * @param request 请求 + * @param payId 账户id + * @return 支付是否成功 + * @throws IOException IOException + * 拦截器相关增加， 详情查看{@link com.egzosn.pay.common.api.PayService#addPayMessageInterceptor(PayMessageInterceptor)} *

+ * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link com.egzosn.pay.common.api.PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} + *

* 如果未设置 {@link com.egzosn.pay.common.api.PayMessageHandler} 那么会使用默认的 {@link com.egzosn.pay.common.api.DefaultPayMessageHandler} */ @RequestMapping(value = "payBack{payId}.json") @@ -381,7 +393,7 @@ public class PayController { /** * 申请退款接口 - * + * @param payId 账户id * @param order 订单的请求体 * @return 返回支付方申请退款后的结果 */ @@ -435,7 +447,7 @@ public class PayController { /** * 转账 - * + * @param payId 账户id * @param order 转账订单 * @return 对应的转账结果 */ @@ -447,7 +459,7 @@ public class PayController { /** * 转账查询 - * + * @param payId 账户id * @param outNo 商户转账订单号 * @param tradeNo 支付平台转账订单号 * @return 对应的转账订单 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 15735ee..c2bee1a 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 @@ -23,8 +23,8 @@ import java.util.UUID; * 发起支付入口 * * @author: egan - * @email egzosn@gmail.com - * @date 2018/05/06 10:30 + * email egzosn@gmail.com + * date 2018/05/06 10:30 */ @RestController @RequestMapping("payPal") @@ -99,8 +99,9 @@ public class PayPalPayController { * return url * PayPal确认付款调用的接口 * 用户确认付款后，paypal调用的这个方法执行付款 - * + * @param request 请求 * @return 付款成功信息 + * @throws IOException IOException */ @GetMapping(value = "payBackBefore.json") public String payBackBefore(HttpServletRequest request) throws IOException { @@ -117,10 +118,10 @@ public class PayPalPayController { /** * 支付回调地址 * - * @param request - * - * @return + * @param request 请求 * + * @return 结果 + * @throws IOException IOException * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link com.egzosn.pay.common.api.PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} * * 如果未设置 {@link com.egzosn.pay.common.api.PayMessageHandler} 那么会使用默认的 {@link com.egzosn.pay.common.api.DefaultPayMessageHandler} 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 b0afb01..0fca69d 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 @@ -20,8 +20,8 @@ import java.util.UUID; /** * @author egan - * @email egzosn@gmail.com - * @date 2018/2/5 + * email egzosn@gmail.com + * date 2018/2/5 */ @RestController @RequestMapping("payoneer") @@ -63,8 +63,8 @@ public class PayoneerPayController { /** * 获取授权页面 - * @param payeeId - * @return + * @param payeeId 用户id + * @return 获取授权页面 */ @RequestMapping("getAuthorizationPage.json") public Map getAuthorizationPage( String payeeId ){ @@ -78,7 +78,7 @@ public class PayoneerPayController { /** * 获取授权用户信息，包含用户状态，注册时间，联系人信息，地址信息等等 * @param payeeId 用户id - * @return + * @return 获取授权用户信息 */ @RequestMapping("getAuthorizationUser.json") public Map getAuthorizationUser( String payeeId ){ @@ -98,7 +98,7 @@ public class PayoneerPayController { */ @ResponseBody @RequestMapping(value = "microPay.json") - public Map microPay(BigDecimal price, String userId) throws IOException { + public Map microPay(BigDecimal price, String userId){ PayOrder order = new PayOrder("Order_payment:", "Order payment", price, UUID.randomUUID().toString().replace("-", ""), PayoneerTransactionType.CHARGE); //币种 @@ -120,9 +120,10 @@ public class PayoneerPayController { /** * 用户授权回调地址 * - * @param request + * @param request 请求 * - * @return + * @return 是否成功 + * @throws IOException IOException */ @RequestMapping(value = "payBack.json") public String payBack(HttpServletRequest request) throws IOException { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java index e1955a8..77d1eb2 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java @@ -32,8 +32,8 @@ import static com.egzosn.pay.union.bean.UnionTransactionType.WEB; * 银联相关 * * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 0:25 + * email egzosn@gmail.com + * date 2016/11/18 0:25 */ @RestController @RequestMapping("union") @@ -148,6 +148,7 @@ public class UnionPayController { * 二维码支付 * @param price 金额 * @return 二维码图像 + * @throws IOException IOException */ @RequestMapping(value = "toQrPay.jpg", produces = "image/jpeg;charset=UTF-8") public byte[] toWxQrPay( BigDecimal price) throws IOException { @@ -165,7 +166,7 @@ public class UnionPayController { * @return 支付结果 */ @RequestMapping(value = "microPay") - public Map microPay(BigDecimal price, String authCode) throws IOException { + public Map microPay(BigDecimal price, String authCode) { //获取对应的支付账户操作工具（可根据账户id） //条码付 PayOrder order = new PayOrder("egan order", "egan order", null == price ? new BigDecimal(0.01) : price, SignUtils.randomStr(), UnionTransactionType.CONSUME); @@ -190,10 +191,11 @@ public class UnionPayController { * * 方式二，{@link #payBack(HttpServletRequest)} 是属于简化方式， 试用与简单的业务场景 * - * @param request + * @param request 请求 * - * @return + * @return 是否成功 * @see #payBack(HttpServletRequest) + * @throws IOException IOException */ @Deprecated @RequestMapping(value = "payBackBefore.json") @@ -217,13 +219,14 @@ public class UnionPayController { /** * 支付回调地址 * - * @param request + * @param request 请求 * - * @return + * @return 是否成功 * * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} * * 如果未设置 {@link com.egzosn.pay.common.api.PayMessageHandler} 那么会使用默认的 {@link com.egzosn.pay.common.api.DefaultPayMessageHandler} + * @throws IOException IOException * */ @RequestMapping(value = "payBack.json") diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java index c50cd70..abb6ea6 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java @@ -36,8 +36,8 @@ import java.util.UUID; * 发起支付入口 * * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 0:25 + * email egzosn@gmail.com + * date 2016/11/18 0:25 */ @RestController @RequestMapping("wx") @@ -102,6 +102,7 @@ public class WxPayController { * 跳到支付页面 * 针对实时支付 * + * @param request 请求 * @param price 金额 * @return 跳到支付页面 */ @@ -163,6 +164,7 @@ public class WxPayController { * 二维码支付 * @param price 金额 * @return 二维码图像 + * @throws IOException IOException */ @RequestMapping(value = "toQrPay.jpg", produces = "image/jpeg;charset=UTF-8") public byte[] toWxQrPay( BigDecimal price) throws IOException { @@ -180,7 +182,7 @@ public class WxPayController { * @return 支付结果 */ @RequestMapping(value = "microPay") - public Map microPay( BigDecimal price, String authCode) throws IOException { + public Map microPay( BigDecimal price, String authCode) { //获取对应的支付账户操作工具（可根据账户id） //条码付 PayOrder order = new PayOrder("egan order", "egan order", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", ""), WxTransactionType.MICROPAY); @@ -208,7 +210,7 @@ public class WxPayController { * @return 支付结果 */ @RequestMapping(value = "facePay") - public Map facePay(BigDecimal price, String authCode, String openid) throws IOException { + public Map facePay(BigDecimal price, String authCode, String openid) { //获取对应的支付账户操作工具（可根据账户id） PayOrder order = new PayOrder("egan order", "egan order", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", ""), WxTransactionType.FACEPAY); //设置人脸凭证 @@ -233,9 +235,10 @@ public class WxPayController { * * 方式二，{@link #payBack(HttpServletRequest)} 是属于简化方式， 试用与简单的业务场景 * - * @param request + * @param request 请求 * - * @return + * @return 是否成功 + * @throws IOException IOException * @see #payBack(HttpServletRequest) */ @Deprecated @@ -260,14 +263,14 @@ public class WxPayController { /** * 支付回调地址 * - * @param request + * @param request 请求 * - * @return + * @return 是否成功 * * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link com.egzosn.pay.common.api.PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} * * 如果未设置 {@link com.egzosn.pay.common.api.PayMessageHandler} 那么会使用默认的 {@link com.egzosn.pay.common.api.DefaultPayMessageHandler} - * + * @throws IOException IOException */ @RequestMapping(value = "payBack.json") public String payBack(HttpServletRequest request) throws IOException { @@ -403,10 +406,10 @@ public class WxPayController { * {@link com.egzosn.pay.wx.bean.WxTransferType#QUERY_BANK} * {@link com.egzosn.pay.wx.bean.WxTransferType#GETTRANSFERINFO} * - *
+ *

* 企业付款到零钱 * 商户企业付款到银行卡 - *
+ *

* @return 对应的转账订单 */ @RequestMapping("transferQuery") diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java index 42bc52b..e2176b5 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java @@ -14,8 +14,8 @@ import java.util.Map; /** * 账户 * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 1:21 + * email egzosn@gmail.com + * date 2016/11/18 1:21 */ //@Repository public class ApyAccountRepository { @@ -126,7 +126,7 @@ public class ApyAccountRepository { /** * 根据id获取对应的账户信息 * @param payId 账户id - * @return + * @return 账户信息 */ public ApyAccount findByPayId(Integer payId){ // TODO 2016/11/18 1:23 author: egan 这里简单模拟 具体实现 略。。 diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java index 71e4794..2ac2dd6 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java @@ -9,8 +9,8 @@ import com.egzosn.pay.common.bean.MsgType; /** * 支付账户 * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 0:36 + * email egzosn@gmail.com + * date 2016/11/18 0:36 */ //@Table(name = "apy_account") //@Entity diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java index e9e7631..38d814d 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java @@ -6,8 +6,8 @@ import java.util.Date; /** * 订单辅助接口 * @author: egan - * @email egzosn@gmail.com - * @date 2017/3/12 14:50 + * email egzosn@gmail.com + * date 2017/3/12 14:50 */ public class QueryOrder { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java index 496d52c..a55bde1 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java @@ -11,8 +11,8 @@ import java.util.Map; /** * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 1:11 + * email egzosn@gmail.com + * date 2016/11/18 1:11 */ @Service public class ApyAccountService { @@ -40,7 +40,7 @@ public class ApyAccountService { /** * 获取支付响应 * @param id 账户id - * @return + * @return 支付响应 */ public PayResponse getPayResponse(Integer id) { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java index f0fc931..1ebfbaf 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java @@ -18,8 +18,8 @@ import javax.annotation.Resource; /** * 支付响应对象 * @author: egan - * @email egzosn@gmail.com - * @date 2016/11/18 0:34 + * email egzosn@gmail.com + * date 2016/11/18 0:34 */ public class PayResponse { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java index a027c07..3513c41 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java @@ -9,7 +9,7 @@ import java.util.Map; /** * @author Fuzx - * @create 2017 2017/1/24 0024 + * create 2017 2017/1/24 0024 */ public class FuiouPayMessageHandler extends BasePayMessageHandler { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/PayoneerMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/PayoneerMessageHandler.java index d1ee66c..f788387 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/PayoneerMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/PayoneerMessageHandler.java @@ -9,10 +9,10 @@ import com.egzosn.pay.payoneer.api.PayoneerPayService; import java.util.Map; /** - * @descrption * @author Actinia - * @email hayesfu@qq.com - * @date 2018-01-19 + * email hayesfu@qq.com + * date 2018-01-19 + * */ public class PayoneerMessageHandler extends BasePayMessageHandler { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/UnionPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/UnionPayMessageHandler.java index 00a25b4..e088054 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/UnionPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/UnionPayMessageHandler.java @@ -10,7 +10,7 @@ import java.util.Map; /** * @author Actinia - * @email hayesfu@qq.com + * email hayesfu@qq.com * 
  * create 2017 2017/11/4 0004
  *
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java index 3270f0d..578d3b8 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java @@ -10,7 +10,7 @@ import java.util.Map; /** * @author Fuzx - * @create 2017 2017/1/24 0024 + * create 2017 2017/1/24 0024 */ public class YouDianPayMessageHandler extends BasePayMessageHandler { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java index 3308ad6..b8e9635 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java @@ -22,9 +22,10 @@ public class AliPayMessageInterceptor implements PayMessageInterceptor { * * @param payMessage 支付回调消息 * @param context 上下文，如果handler或interceptor之间有信息要传递，可以用这个 - * @param payService + * @param payService 支付服务 * @return true代表OK，false代表不OK并直接中断对应的支付处理器 * @see PayMessageHandler 支付处理器 + * @throws PayErrorException PayErrorException* */ @Override public boolean intercept(PayMessage payMessage, Map context, PayService payService) throws PayErrorException { diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java index 0387ecf..58f9317 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java @@ -25,9 +25,10 @@ public class YoudianPayMessageInterceptor implements PayMessageInterceptor { * * @param payMessage 支付回调消息 * @param context 上下文，如果handler或interceptor之间有信息要传递，可以用这个 - * @param payService + * @param payService 支付服务 * @return true代表OK，false代表不OK并直接中断对应的支付处理器 * @see PayMessageHandler 支付处理器 + * @throws PayErrorException PayErrorException */ @Override public boolean intercept(PayMessage payMessage, Map context, PayService payService) throws PayErrorException { diff --git a/pom.xml b/pom.xml index 24786e4..7193d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ utf-8 -