From db4c051007e85c717a56121ee7d36f6c95726723 Mon Sep 17 00:00:00 2001
From: egzosn <egzosn@gmail.com>
Date: Tue, 23 Feb 2021 01:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/egzosn/pay/common/api/PayService.java | 13 +++++++-
 .../com/egzosn/pay/common/bean/BillType.java  | 33 +++++++++++++++++++
 .../com/egzosn/pay/common/util/DateUtils.java |  1 +
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java

diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
index 5fce5a9..fa8df25 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
 import java.util.Date;
 import java.util.Map;
 
+import com.egzosn.pay.common.bean.BillType;
 import com.egzosn.pay.common.bean.MethodType;
 import com.egzosn.pay.common.bean.PayMessage;
 import com.egzosn.pay.common.bean.PayOrder;
@@ -275,11 +276,21 @@ public interface PayService<PC extends PayConfigStorage> {
      * 下载对账单
      *
      * @param billDate 账单时间：日账单格式为yyyy-MM-dd，月账单格式为yyyy-MM。
-     * @param billType 账单类型，商户通过接口或商户经开放平台授权后其所属服务商通过接口可以获取以下账单类型：trade、signcustomer；trade指商户基于支付宝交易收单的业务账单；signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单；
+     * @param billType 账单类型
      * @return 返回支付方下载对账单的结果
      */
+    @Deprecated
     Map<String, Object> downloadbill(Date billDate, String billType);
 
+    /**
+     * 下载对账单
+     *
+     * @param billDate 账单时间：日账单格式为yyyy-MM-dd，月账单格式为yyyy-MM。
+     * @param billType 账单类型
+     * @return 返回支付方下载对账单的结果
+     */
+    Map<String, Object> downloadBill(Date billDate, BillType billType);
+
     /**
      * 下载对账单
      *
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java
new file mode 100644
index 0000000..793463a
--- /dev/null
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java
@@ -0,0 +1,33 @@
+package com.egzosn.pay.common.bean;
+
+/**
+ * 账单类型
+ * @author Egan
+ * @email egzosn@gmail.com
+ * @date 2021/2/22
+ */
+public interface BillType {
+    /**
+     * 获取类型名称
+     * @return 类型
+     */
+    String getType();
+
+    /**
+     * 获取类型对应的日期格式化表达式
+     * @return 日期格式化表达式
+     */
+    String getDatePattern();
+
+    /**
+     * 获取压缩类型
+     * @return 压缩类型
+     */
+    String getTarType();
+
+    /**
+     * 自定义属性
+     * @return 自定义属性
+     */
+    String getCustom();
+}
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java
index 63c2d64..fa6b4e6 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java
@@ -60,6 +60,7 @@ public final class DateUtils {
     public static final String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
     public static final String MMDD = "MMdd";
     public static final String YYYYMM = "yyyyMM";
+    public static final String YYYY_MM = "yyyy-MM";
 
 
     public static String formatDate(Date date, String pattern) {