Skip to content

Commit

Permalink
🆕 #1885 【微信支付】电商收付通增加资金账单下载的接口
Browse files Browse the repository at this point in the history
  • Loading branch information
@f00lish
f00lish committed Nov 24, 2020
1 parent 57ab245 commit b4da5c9
Show file tree
Hide file tree
Showing 9 changed files with 283 additions and 22 deletions.
79 changes: 79 additions & 0 deletions ...in-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package com.github.binarywang.wxpay.bean.ecommerce;

import com.google.gson.annotations.SerializedName;
import lombok.*;

/**
* 资金账单请求
* @author: f00lish
* @date: 2020/09/28
*/
@Data
@Builder
@ToString
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class FundBillRequest {

/**
* <pre>
* 字段名：账单日期
* 变量名：bill_date
* 是否必填：是
* 类型：string（10）
* 描述：
* 格式YYYY-MM-DD
* 仅支持三个月内的账单下载申请。
* 示例值：2019-06-11
* </pre>
*/
@SerializedName(value = "bill_date")
private String billDate;


/**
* <pre>
* 字段名：资金账户类型
* 变量名：account_type
* 是否必填：是
* 类型：string（32）
* 描述：
* 枚举值：
* ALL：所有账户
* 示例值：ALL
* </pre>
*/
@SerializedName(value = "account_type")
private String accountType;

/**
* <pre>
* 字段名：压缩类型
* 变量名：tar_type
* 是否必填：否
* 类型：string（32）
* 描述：
* 不填则以不压缩的方式返回数据流
* 枚举值：
* GZIP：返回格式为.gzip的压缩包账单
* 示例值：GZIP
* </pre>
*/
@SerializedName(value = "tar_type")
private String tarType;

/**
* <pre>
* 字段名：加密算法
* 变量名：algorithm
* 是否必填：是
* 类型：string（32）
* 描述：
* 枚举值：
* AEAD_AES_256_GCM：AEAD_AES_256_GCM加密算法
* 示例值：AEAD_AES_256_GCM
* </pre>
*/
@SerializedName(value = "algorithm")
private String algorithm;
}
139 changes: 139 additions & 0 deletions weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
package com.github.binarywang.wxpay.bean.ecommerce;

import com.google.gson.annotations.SerializedName;
import lombok.*;

/**
* 资金账单结果
* @author: f00lish
* @date: 2020/09/28
*/
@Data
@Builder
@ToString
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class FundBillResult {

/**
* <pre>
* 字段名：下载信息总数
* 变量名：download_bill_count
* 是否必填：是
* 类型：int
* 描述：
* 下载信息总数
* 示例值：1
* </pre>
*/
@SerializedName(value = "download_bill_count")
private int downloadBillCount;



/**
* <pre>
* 字段名：下载信息明细
* 变量名：download_bill_list
* 是否必填：否
* 类型：array
* 描述：
* 下载信息明细
* </pre>
*/
@SerializedName(value = "download_bill_list")
private FundBill[] downloadBillList;

@Data
public static class FundBill {

/**
* <pre>
* 字段名：账单文件序号
* 变量名：bill_sequence
* 是否必填：是
* 类型：int
* 描述：
* 商户将多个文件按账单文件序号的顺序合并为完整的资金账单文件，起始值为1
* 示例值：1
* </pre>
*/
@SerializedName(value = "bill_sequence")
private String billSequence;

/**
* <pre>
* 字段名：哈希类型
* 变量名：hash_type
* 是否必填：是
* 类型：string（32）
* 描述：
* 枚举值：
* SHA1：SHA1值
* 示例值：SHA1
* </pre>
*/
@SerializedName(value = "hash_type")
private String hashType;

/**
* <pre>
* 字段名：哈希值
* 变量名：hash_value
* 是否必填：是
* 类型：string（1024）
* 描述：
* 原始账单（gzip需要解压缩）的摘要值，用于校验文件的完整性。
* 示例值：79bb0f45fc4c42234a918000b2668d689e2bde04
* </pre>
*/
@SerializedName(value = "hash_value")
private String hashValue;

/**
* <pre>
* 字段名：账单下载地址
* 变量名：download_url
* 是否必填：是
* 类型：string（2048）
* 描述：
* 供下一步请求账单文件的下载地址，该地址30s内有效。
* 示例值：https://api.mch.weixin.qq.com/v3/billdownload/file?token=xxx
* </pre>
*/
@SerializedName(value = "download_url")
private String downloadUrl;


/**
* <pre>
* 字段名：加密密钥
* 变量名：encrypt_key
* 是否必填：是
* 类型：string（512）
* 描述：
* 加密账单文件使用的加密密钥。密钥用商户证书的公钥进行加密，然后进行Base64编码
* 示例值：YpkbxSne+mDwyXq//xYPmtr9eQ5LsH7zLMZSs+GSEcY4wjhlsfioS4n9X6q1ZBL0wM1v5qd7KhWuj0rFJ4N1FidP7Q8KDy25QDTt46wiKnsPKSCAXWRFNw1D2JmJBqZsc9y5g0DupONWKYB2GfRigRDEBVszj67uOIILPdxOKX1w3N4jvu0U9IFanJa7ldm70KVvYrMWVgQFDPbgjh1gVDbuTAjmPN88AobLdkiegnBUS2woDZW+PfhPo13kweOiR3h1gXIKRlnKnN3Jkkwpna/AFFijXrFphO3voSuiV0CfptfzTtcae4X3DYG3RSroKqmpa+5tuy2aU2VJUSIuFQ==
* </pre>
*/
@SerializedName(value = "encrypt_key")
private String encryptKey;

/**
* <pre>
* 字段名：随机字符串
* 变量名：nonce
* 是否必填：是
* 类型：string（16）
* 描述：
* 加密账单文件使用的随机字符串
* 示例值：a8607ef79034c49c
* </pre>
*/
@SerializedName(value = "nonce")
private String nonce;


}

}
4 changes: 2 additions & 2 deletions ...ang/wxpay/bean/ecommerce/BillRequest.java → ...xpay/bean/ecommerce/TradeBillRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import lombok.*;

/**
* 账单请求
* 交易账单请求
* @author: f00lish
* @date: 2020/09/28
*/
Expand All @@ -13,7 +13,7 @@
@ToString
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class BillRequest {
public class TradeBillRequest {

/**
* <pre>
Expand Down
4 changes: 2 additions & 2 deletions ...wang/wxpay/bean/ecommerce/BillResult.java → ...wxpay/bean/ecommerce/TradeBillResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import lombok.*;

/**
* 账单结果
* 交易账单结果
* @author: f00lish
* @date: 2020/09/28
*/
Expand All @@ -13,7 +13,7 @@
@ToString
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class BillResult {
public class TradeBillResult {

/**
* <pre>
Expand Down
11 changes: 5 additions & 6 deletions ...ay/bean/ecommerce/enums/BillTypeEnum.java → ...ean/ecommerce/enums/FundBillTypeEnum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@
*/
@Getter
@AllArgsConstructor
public enum BillTypeEnum {
public enum FundBillTypeEnum {

/**
* 交易账单
* 资金账单
*/
TRADE_BILL("%s/v3/bill/tradebill?%s"),
FUND_FLOW_BILL("%s/v3/bill/fundflowbill?%s"),
/**
* 资金账单
* 二级商户资金账单
*/
FUND_FLOW_BILL("%s/v3/bill/fundflowbill?%s");

SUB_FUND_FLOW_BILL("%s/v3/ecommerce/bill/fundflowbill?%s");

/**
* url
Expand Down
20 changes: 16 additions & 4 deletions weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.binarywang.wxpay.service;

import com.github.binarywang.wxpay.bean.ecommerce.*;
import com.github.binarywang.wxpay.bean.ecommerce.enums.BillTypeEnum;
import com.github.binarywang.wxpay.bean.ecommerce.enums.FundBillTypeEnum;
import com.github.binarywang.wxpay.bean.ecommerce.enums.SpAccountTypeEnum;
import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
import com.github.binarywang.wxpay.exception.WxPayException;
Expand Down Expand Up @@ -394,12 +394,24 @@ public interface EcommerceService {
* 文档地址: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/bill.shtml
* </pre>
*
* @param request 请求信息。
* @return 返回数据 return trade bill result
* @throws WxPayException the wx pay exception
*/
TradeBillResult applyBill(TradeBillRequest request) throws WxPayException;

/**
* <pre>
* 申请资金账单API
* 文档地址: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/bill/chapter3_2.shtml
* </pre>
*
* @param billType 账单类型。
* @param request 二级商户号。
* @return 返回数据 return bill result
* @param request 请求信息。
* @return 返回数据 return fund bill result
* @throws WxPayException the wx pay exception
*/
BillResult applyBill(BillTypeEnum billType, BillRequest request) throws WxPayException;
FundBillResult applyFundBill(FundBillTypeEnum billType, FundBillRequest request) throws WxPayException;

/**
* <pre>
Expand Down
13 changes: 10 additions & 3 deletions ...java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.binarywang.wxpay.service.impl;

import com.github.binarywang.wxpay.bean.ecommerce.*;
import com.github.binarywang.wxpay.bean.ecommerce.enums.BillTypeEnum;
import com.github.binarywang.wxpay.bean.ecommerce.enums.FundBillTypeEnum;
import com.github.binarywang.wxpay.bean.ecommerce.enums.SpAccountTypeEnum;
import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
import com.github.binarywang.wxpay.exception.WxPayException;
Expand Down Expand Up @@ -295,10 +295,17 @@ public SettlementResult querySettlement(String subMchid) throws WxPayException {
}

@Override
public BillResult applyBill(BillTypeEnum billType, BillRequest request) throws WxPayException {
public TradeBillResult applyBill(TradeBillRequest request) throws WxPayException {
String url = String.format("%s/v3/bill/tradebill?%s", this.payService.getPayBaseUrl(), this.parseURLPair(request));
String response = this.payService.getV3(URI.create(url));
return GSON.fromJson(response, TradeBillResult.class);
}

@Override
public FundBillResult applyFundBill(FundBillTypeEnum billType, FundBillRequest request) throws WxPayException {
String url = String.format(billType.getUrl(), this.payService.getPayBaseUrl(), this.parseURLPair(request));
String response = this.payService.getV3(URI.create(url));
return GSON.fromJson(response, BillResult.class);
return GSON.fromJson(response, FundBillResult.class);
}

@Override
Expand Down
Loading

0 comments on commit b4da5c9

Please sign in to comment.