diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java index b2b9831..d8c4182 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java @@ -627,26 +627,7 @@ public class UnionPayService extends BasePayService { * @return 返回fileContent 请自行将数据落地 */ @Override - public String downloadbill (Date billDate, String billType) { - return downloadbill(billDate, billType, new Callback() { - @Override - public String perform(Map response) { - return response.get(SDKConstants.param_fileContent).toString(); - } - }); - } - - - /** - * 下载对账单 - * - * @param billDate 账单时间:具体请查看对应支付平台 - * @param billType 账单类型,具体请查看对应支付平台 - * @param callback 处理器 - * @return 返回支付方下载对账单的结果 - */ - @Override - public T downloadbill (Date billDate, String billType, Callback callback) { + public Map downloadbill (Date billDate, String billType) { Map params = this.getCommonParam(); UnionTransactionType.FILE_TRANSFER.convertMap(params); DateFormat df = new SimpleDateFormat("MMdd"); @@ -659,26 +640,26 @@ public class UnionPayService extends BasePayService { JSONObject response = UriVariables.getParametersToMap(responseStr); if(this.verify(response)){ if(SDKConstants.OK_RESP_CODE.equals(response.get(SDKConstants.param_respCode))){ - return callback.perform(response); + return response; } - throw new PayErrorException(new PayException(response.get(SDKConstants.param_respCode).toString(), response.get(SDKConstants.param_respMsg).toString(), response.toString())); + throw new PayErrorException(new PayException(response.get(SDKConstants.param_respCode).toString(), response.get(SDKConstants.param_respMsg).toString(), response.toString())); } - throw new PayErrorException(new PayException("failure", "验证签名失败", response.toString())); + throw new PayErrorException(new PayException("failure", "验证签名失败", response.toString())); } + /** - * 通用查询接口 - * - * @param tradeNoOrBillDate 支付平台订单号或者账单日期, 具体请 类型为{@link String }或者 {@link Date },类型须强制限制,类型不对应则抛出异常{@link PayErrorException} + * @param tradeNoOrBillDate 支付平台订单号或者账单类型, 具体请 + * 类型为{@link String }或者 {@link Date },类型须强制限制,类型不对应则抛出异常{@link PayErrorException} * @param outTradeNoBillType 商户单号或者 账单类型 * @param transactionType 交易类型 - * @param callback 处理器 + * * @return 返回支付方对应接口的结果 */ @Override - public T secondaryInterface (Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType, Callback callback) { + public Map secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) { return null; } diff --git a/pay-java-union/src/test/java/PayTest.java b/pay-java-union/src/test/java/PayTest.java index 731d621..8c98c1b 100644 --- a/pay-java-union/src/test/java/PayTest.java +++ b/pay-java-union/src/test/java/PayTest.java @@ -85,7 +85,7 @@ public class PayTest { /*-----------文件传输类接口:后台获取对账文件交易,只有同步应答 ------------------------------*/ - String fileConten = service.downloadbill(new Date(),"文件类型,一般商户填写00即可"); /*-----------退货交易:后台资金类交易,有同步应答和后台通知应答------------------------------*/ + Map fileConten = service.downloadbill(new Date(),"文件类型,一般商户填写00即可"); /*-----------退货交易:后台资金类交易,有同步应答和后台通知应答------------------------------*/ /*-----------回调处理-------------------*/ diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java index 1d0b27d..aeb4dfd 100644 --- a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java +++ b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java @@ -387,65 +387,53 @@ public class WxYouDianPayService extends BasePayService { return null; } - @Override - public T query(String tradeNo, String outTradeNo, Callback callback) { - return null; - } @Override public Map close(String tradeNo, String outTradeNo) { return null; } - @Override - public T close(String tradeNo, String outTradeNo, Callback callback) { - return null; - } @Override public Map refund(String tradeNo, String outTradeNo, BigDecimal refundAmount, BigDecimal totalAmount) { return null; } - @Override - public T refund(String tradeNo, String outTradeNo, BigDecimal refundAmount, BigDecimal totalAmount, Callback callback) { - return null; - } + @Override public Map refund(RefundOrder refundOrder) { return null; } - @Override - public T refund(RefundOrder refundOrder, Callback callback) { - return null; - } @Override public Map refundquery(String tradeNo, String outTradeNo) { return null; } + + @Override - public T refundquery(String tradeNo, String outTradeNo, Callback callback) { + public Map downloadbill(Date billDate, String billType) { return null; } + + /** + * @param tradeNoOrBillDate 支付平台订单号或者账单类型, 具体请 + * 类型为{@link String }或者 {@link Date },类型须强制限制,类型不对应则抛出异常{@link PayErrorException} + * @param outTradeNoBillType 商户单号或者 账单类型 + * @param transactionType 交易类型 + * + * @return 返回支付方对应接口的结果 + */ @Override - public Object downloadbill(Date billDate, String billType) { + public Map secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) { return null; } - @Override - public T downloadbill(Date billDate, String billType, Callback callback) { - return null; - } - @Override - public T secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType, Callback callback) { - return null; - } public WxYouDianPayService(PayConfigStorage payConfigStorage) { super(payConfigStorage);