From f7299db116bf10c34e6bf82f27ae76c6359c9879 Mon Sep 17 00:00:00 2001 From: egzosn Date: Wed, 31 Jan 2018 18:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-fuiou/pom.xml | 2 +- .../egzosn/pay/fuiou/api/FuiouPayService.java | 114 ++---------------- 2 files changed, 14 insertions(+), 102 deletions(-) diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 2845640..70cf625 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.6-SNAPSHOT + 2.0.7-SNAPSHOT 4.0.0 pay-java-fuiou diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java index 77776b9..90f4c51 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java @@ -286,14 +286,9 @@ public class FuiouPayService extends BasePayService { for (String key : param.keySet()) { Object o = param.get(key); - - formHtml.append(""); } - - //submit按钮控件请不要含有name属性 -// formHtml.append(""); formHtml.append(""); return formHtml.toString(); @@ -310,18 +305,7 @@ public class FuiouPayService extends BasePayService { return null; } - /** - * 交易查询接口 - * - * @param tradeNo 支付平台订单号 - * @param outTradeNo 商户单号 - * @param callback 处理器 - * @return 空 - */ - @Override - public T query (String tradeNo, String outTradeNo, Callback callback) { - return null; - } + /** * 交易关闭接口 @@ -334,18 +318,7 @@ public class FuiouPayService extends BasePayService { return null; } - /** - * 交易关闭接口 - * - * @param tradeNo 支付平台订单号 - * @param outTradeNo 商户单号 - * @param callback 处理器 - * @return 空 - */ - @Override - public T close (String tradeNo, String outTradeNo, Callback callback) { - return null; - } + /** * 申请退款接口 @@ -358,28 +331,10 @@ public class FuiouPayService extends BasePayService { */ @Override public Map refund (String tradeNo, String outTradeNo, BigDecimal refundAmount, BigDecimal totalAmount) { - return refund(tradeNo, outTradeNo, refundAmount, totalAmount, new Callback>() { - @Override - public Map perform(Map map) { - return map; - } - }); + return refund(new RefundOrder(tradeNo, outTradeNo, refundAmount, totalAmount)); } - /** - * 申请退款接口 - * - * @param tradeNo 支付平台订单号 - * @param outTradeNo 商户单号 - * @param refundAmount 退款金额 - * @param totalAmount 总金额 - * @param callback 处理器 - * @return 空 - */ - @Override - public T refund (String tradeNo, String outTradeNo, BigDecimal refundAmount, BigDecimal totalAmount, Callback callback) { - return refund(new RefundOrder(tradeNo, outTradeNo, refundAmount, totalAmount), callback); - } + /** @@ -390,23 +345,6 @@ public class FuiouPayService extends BasePayService { */ @Override public Map refund (RefundOrder refundOrder) { - return refund(refundOrder, new Callback>() { - @Override - public Map perform(Map map) { - return map; - } - }); - } - - /** - * 申请退款接口 - * - * @param refundOrder 退款订单信息 - * @param callback 处理器 - * @return 空 - */ - @Override - public T refund(RefundOrder refundOrder, Callback callback) { Map params = new HashMap<>(); params.put("mchnt_cd",payConfigStorage.getPid());//商户代码 DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -417,8 +355,7 @@ public class FuiouPayService extends BasePayService { params.put("rem","");//备注 params.put("md5",createSign(SignUtils.parameters2MD5Str(params,"|"),payConfigStorage.getInputCharset())); JSONObject resultJson = getHttpRequestTemplate().postForObject(getReqUrl() + URL_FuiouSmpRefundGate,params,JSONObject.class); - //5341标识退款成功 - return callback.perform(params); + return resultJson; } @@ -436,18 +373,6 @@ public class FuiouPayService extends BasePayService { return null; } - /** - * 查询退款 - * - * @param tradeNo 支付平台订单号 - * @param outTradeNo 商户单号 - * @param callback 处理器 - * @return　空 - */ - @Override - public T refundquery (String tradeNo, String outTradeNo, Callback callback) { - return null; - } /** * 下载对账单 @@ -456,36 +381,23 @@ public class FuiouPayService extends BasePayService { * @return 空 */ @Override - public Object downloadbill(Date billDate, String billType) { + public Map downloadbill(Date billDate, String billType) { return null; } /** - * 下载对账单 - * - * @param billDate 账单时间：具体请查看对应支付平台 - * @param billType 账单类型，具体请查看对应支付平台 - * @param callback 处理器 - * @return 空 - */ - @Override - public T downloadbill (Date billDate, String billType, Callback callback) { - return null; - } - - - /** - * 通用查询接口 - * - * @param tradeNoOrBillDate 支付平台订单号或者账单日期， 具体请 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link PayErrorException} + * @param tradeNoOrBillDate 支付平台订单号或者账单类型， 具体请 + * 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link PayErrorException} * @param outTradeNoBillType 商户单号或者 账单类型 * @param transactionType 交易类型 - * @param callback 处理器 - * @return 空 + * + * @return 返回支付方对应接口的结果 */ @Override - public T secondaryInterface (Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType, Callback callback) { + public Map secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) { return null; } + + }