From cc6380635377f2667aae33061a4357c39a6bdddc Mon Sep 17 00:00:00 2001 From: hocgin Date: Sun, 24 Nov 2019 16:42:13 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E7=AD=BE=E5=90=8D=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-baidu/pom.xml | 5 ++++ .../pay/baidu/api/BaiduPayConfigStorage.java | 0 .../egzosn/pay/baidu/api/BaiduPayService.java | 23 +++++++++++------- .../egzosn/pay/baidu/bean/BaiduPayOrder.java | 0 .../pay/baidu/bean/BaiduRefundOrder.java | 0 .../pay/baidu/bean/BaiduTransactionType.java | 0 .../pay/baidu/bean/type/AuditStatus.java | 0 .../com/egzosn/pay/baidu/package-info.java | 0 .../com/egzosn/pay/baidu/util/Asserts.java | 0 .../com/egzosn/pay/baidu/util/NoNullMap.java | 0 .../pay/baidu/api/BaiduPayServiceTest.java | 24 +++++++++++++++++++ pom.xml | 7 ++++++ 12 files changed, 50 insertions(+), 9 deletions(-) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/api/BaiduPayService.java (97%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/bean/BaiduPayOrder.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/bean/BaiduTransactionType.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/bean/type/AuditStatus.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/package-info.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/util/Asserts.java (100%) rename pay-java-baidu/src/{ => main/java}/com/egzosn/pay/baidu/util/NoNullMap.java (100%) create mode 100644 pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml index 2aa2bda..ea4e52a 100644 --- a/pay-java-baidu/pom.xml +++ b/pay-java-baidu/pom.xml @@ -17,6 +17,11 @@ pay-java-common + + org.junit.jupiter + junit-jupiter + test + diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java similarity index 97% rename from pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java index 3826166..47a7c8b 100644 --- a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java +++ b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java @@ -2,12 +2,6 @@ package com.egzosn.pay.baidu.api; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.egzosn.pay.baidu.bean.BaiduPayOrder; -import com.egzosn.pay.baidu.bean.BaiduRefundOrder; -import com.egzosn.pay.baidu.bean.BaiduTransactionType; -import com.egzosn.pay.baidu.bean.type.AuditStatus; -import com.egzosn.pay.baidu.util.Asserts; -import com.egzosn.pay.baidu.util.NoNullMap; import com.egzosn.pay.common.api.BasePayService; import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.http.HttpConfigStorage; @@ -15,6 +9,12 @@ import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.DateUtils; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; +import com.egzosn.pay.baidu.bean.BaiduPayOrder; +import com.egzosn.pay.baidu.bean.BaiduRefundOrder; +import com.egzosn.pay.baidu.bean.BaiduTransactionType; +import com.egzosn.pay.baidu.bean.type.AuditStatus; +import com.egzosn.pay.baidu.util.Asserts; +import com.egzosn.pay.baidu.util.NoNullMap; import java.math.BigDecimal; import java.util.Date; @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -public class BaiduPayService extends BasePayService { +public class BaiduPayService extends BasePayService { public static final String APP_KEY = "appKey"; public static final String APP_ID = "appId"; public static final String DEAL_ID = "dealId"; @@ -43,11 +43,11 @@ public class BaiduPayService extends BasePayService { public static final String RESPONSE_STATUS = "status"; - public BaiduPayService(BaiduPayConfigStorage payConfigStorage) { + public BaiduPayService(com.egzosn.pay.baidu.api.BaiduPayConfigStorage payConfigStorage) { super(payConfigStorage); } - public BaiduPayService(BaiduPayConfigStorage payConfigStorage, + public BaiduPayService(com.egzosn.pay.baidu.api.BaiduPayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } @@ -226,17 +226,20 @@ public class BaiduPayService extends BasePayService { } @Override + @Deprecated public String buildRequest(Map orderInfo, MethodType method) { throw new UnsupportedOperationException("百度不支持PC支付"); } @Override + @Deprecated public String getQrPay(PayOrder order) { throw new UnsupportedOperationException("百度不支持扫码付"); } @Override + @Deprecated public Map microPay(PayOrder order) { throw new UnsupportedOperationException("百度不支持刷卡付"); } @@ -247,6 +250,7 @@ public class BaiduPayService extends BasePayService { } @Override + @Deprecated public Map close(String tradeNo, String outTradeNo) { throw new UnsupportedOperationException("不支持该操作"); } @@ -269,6 +273,7 @@ public class BaiduPayService extends BasePayService { } @Override + @Deprecated public Map refund(RefundOrder refundOrder) { throw new UnsupportedOperationException("请使用 " + getClass().getName() + "#refundUseBaidu"); } diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduPayOrder.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduPayOrder.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduPayOrder.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduPayOrder.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduTransactionType.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduTransactionType.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduTransactionType.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduTransactionType.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/type/AuditStatus.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/type/AuditStatus.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/type/AuditStatus.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/type/AuditStatus.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/package-info.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/package-info.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/package-info.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/package-info.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/util/Asserts.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/Asserts.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/util/Asserts.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/Asserts.java diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/util/NoNullMap.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/NoNullMap.java similarity index 100% rename from pay-java-baidu/src/com/egzosn/pay/baidu/util/NoNullMap.java rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/NoNullMap.java diff --git a/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java b/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java new file mode 100644 index 0000000..6f9b5c2 --- /dev/null +++ b/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java @@ -0,0 +1,24 @@ +package com.egzosn.pay.baidu.api; + +import org.junit.jupiter.api.Test; + +/** + * Created by hocgin on 2019/11/24. + * email: hocgin@gmail.com + * + * @author hocgin + */ +public class BaiduPayServiceTest { + + @Test + public void orderInfo() { + BaiduPayConfigStorage configStorage = new BaiduPayConfigStorage(); + configStorage.setAppid("APP ID"); + configStorage.setAppKey("APP KEY"); + configStorage.setDealId("DEAL ID"); + configStorage.setKeyPublic("KEY PUBLIC"); + + BaiduPayService payService = new BaiduPayService(configStorage); + // payService.refund() + } +} diff --git a/pom.xml b/pom.xml index 5ae16b1..76479a2 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ 1.2.17 1.2.58 3.3.1 + 5.5.1 @@ -105,6 +106,12 @@ ${zxing.version} + + org.junit.jupiter + junit-jupiter + ${junit.version} + +