diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayApplyFundFlowBillV3Request.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayApplyFundFlowBillV3Request.java index 251465e72..4da2c9b55 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayApplyFundFlowBillV3Request.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayApplyFundFlowBillV3Request.java @@ -16,6 +16,25 @@ import java.io.Serializable; @Data @NoArgsConstructor public class WxPayApplyFundFlowBillV3Request implements Serializable { + /** + * 账户类型 + */ + public static class AccountType { + /** + * BASIC:基本账户 + */ + public static final String BASIC = "BASIC"; + /** + * OPERATION:运营账户 + */ + public static final String OPERATION = "OPERATION"; + /** + * FEES:手续费账户 + */ + public static final String FEES = "FEES"; + } + + private static final long serialVersionUID = 1L; /** *
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadFundFlowRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadFundFlowRequest.java
index efb14fc7c..5a75b1e48 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadFundFlowRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadFundFlowRequest.java
@@ -1,6 +1,5 @@
package com.github.binarywang.wxpay.bean.request;
-import com.github.binarywang.wxpay.constant.WxPayConstants.AccountType;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.*;
@@ -26,6 +25,27 @@ import java.util.Map;
@AllArgsConstructor
@XStreamAlias("xml")
public class WxPayDownloadFundFlowRequest extends BaseWxPayRequest {
+
+ /**
+ * 账户类型
+ */
+ public static class AccountType {
+ /**
+ * BASIC:基本账户
+ */
+ public static final String BASIC = "Basic";
+ /**
+ * OPERATION:运营账户
+ */
+ public static final String OPERATION = "Operation";
+ /**
+ * FEES:手续费账户
+ */
+ public static final String FEES = "Fees";
+ }
+
+ private static final long serialVersionUID = -8352717499328292952L;
+
private static final String[] ACCOUNT_TYPES = new String[]{AccountType.BASIC, AccountType.OPERATION, AccountType.FEES};
private static final String SIGN_TYPE_HMAC_SHA256 = "HMAC-SHA256";
private static final String TAR_TYPE_GZIP = "GZIP";
@@ -83,8 +103,9 @@ public class WxPayDownloadFundFlowRequest extends BaseWxPayRequest {
throw new WxPayException(String.format("account_type必须为%s其中之一,实际值:%s",
Arrays.toString(ACCOUNT_TYPES), this.getAccountType()));
}
- /**
- * 目前仅支持HMAC-SHA256
+
+ /*
+ 目前仅支持HMAC-SHA256
*/
this.setSignType(SIGN_TYPE_HMAC_SHA256);
}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
index 60a56d100..819cdfe73 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
@@ -170,24 +170,6 @@ public class WxPayConstants {
}
}
- /**
- * 账户类型
- */
- public static class AccountType {
- /**
- * BASIC:基本账户
- */
- public static final String BASIC = "BASIC";
- /**
- * OPERATION:运营账户
- */
- public static final String OPERATION = "OPERATION";
- /**
- * FEES:手续费账户
- */
- public static final String FEES = "FEES";
- }
-
/**
* 签名类型.
*/
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 121fd5ae0..8466a5e91 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -971,7 +971,6 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
@Override
public WxPayFundFlowResult downloadFundFlow(String billDate, String accountType, String tarType) throws WxPayException {
-
WxPayDownloadFundFlowRequest request = new WxPayDownloadFundFlowRequest();
request.setBillDate(billDate);
request.setAccountType(accountType);
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index e04f146c5..3990f5b61 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -11,7 +11,7 @@ import com.github.binarywang.wxpay.bean.result.*;
import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.constant.WxPayConstants.AccountType;
+import com.github.binarywang.wxpay.bean.request.WxPayDownloadFundFlowRequest.AccountType;
import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;