From 203790064d78fcebda46b4c09e0357fa5eb4fc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=B5=A9?= <epdcgsi@dingtalk.com>
Date: Mon, 21 Sep 2020 10:51:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...thdrawRequest.java => SpWithdrawRequest.java} |  2 +-
 ...WithdrawResult.java => SpWithdrawResult.java} |  2 +-
 ...hdrawRequest.java => SubWithdrawRequest.java} |  2 +-
 ...ithdrawResult.java => SubWithdrawResult.java} |  2 +-
 .../wxpay/service/EcommerceService.java          |  4 ++--
 .../wxpay/service/impl/EcommerceServiceImpl.java |  8 ++++----
 .../service/impl/EcommerceServiceImplTest.java   | 16 ++++++++++++++--
 7 files changed, 24 insertions(+), 12 deletions(-)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/{MerchantWithdrawRequest.java => SpWithdrawRequest.java} (96%)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/{MerchantWithdrawResult.java => SpWithdrawResult.java} (94%)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/{EcommerceWithdrawRequest.java => SubWithdrawRequest.java} (96%)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/{EcommerceWithdrawResult.java => SubWithdrawResult.java} (95%)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/MerchantWithdrawRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawRequest.java
similarity index 96%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/MerchantWithdrawRequest.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawRequest.java
index 14b10b497..0b836366d 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/MerchantWithdrawRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawRequest.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @NoArgsConstructor
-public class MerchantWithdrawRequest implements Serializable {
+public class SpWithdrawRequest implements Serializable {
   /**
    * <pre>
    * 字段名：商户提现单号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/MerchantWithdrawResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawResult.java
similarity index 94%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/MerchantWithdrawResult.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawResult.java
index 8b6ac2e79..b18e24667 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/MerchantWithdrawResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawResult.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @NoArgsConstructor
-public class MerchantWithdrawResult implements Serializable {
+public class SpWithdrawResult implements Serializable {
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/EcommerceWithdrawRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawRequest.java
similarity index 96%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/EcommerceWithdrawRequest.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawRequest.java
index 8fdc31719..3c74db24c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/EcommerceWithdrawRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawRequest.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @NoArgsConstructor
-public class EcommerceWithdrawRequest implements Serializable {
+public class SubWithdrawRequest implements Serializable {
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/EcommerceWithdrawResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawResult.java
similarity index 95%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/EcommerceWithdrawResult.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawResult.java
index 6d98b933a..21213dd42 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/EcommerceWithdrawResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawResult.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @NoArgsConstructor
-public class EcommerceWithdrawResult implements Serializable {
+public class SubWithdrawResult implements Serializable {
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
index d0b941ca8..262a233ac 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
@@ -271,7 +271,7 @@ public interface EcommerceService {
    * @return 返回数据 return withdraw result
    * @throws WxPayException the wx pay exception
    */
-  EcommerceWithdrawResult withdraw(EcommerceWithdrawRequest request) throws WxPayException;
+  SubWithdrawResult subWithdraw(SubWithdrawRequest request) throws WxPayException;
 
   /**
    * <pre>
@@ -283,5 +283,5 @@ public interface EcommerceService {
    * @return 返回数据 return withdraw result
    * @throws WxPayException the wx pay exception
    */
-  MerchantWithdrawResult withdraw(MerchantWithdrawRequest request) throws WxPayException;
+  SpWithdrawResult spWithdraw(SpWithdrawRequest request) throws WxPayException;
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
index 31af7c15f..1ed6e0fe4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
@@ -203,17 +203,17 @@ public class EcommerceServiceImpl implements EcommerceService {
   }
 
   @Override
-  public EcommerceWithdrawResult withdraw(EcommerceWithdrawRequest request) throws WxPayException {
+  public SubWithdrawResult subWithdraw(SubWithdrawRequest request) throws WxPayException {
     String url = String.format("%s/v3/ecommerce/fund/withdraw", this.payService.getPayBaseUrl());
     String response = this.payService.postV3(url, GSON.toJson(request));
-    return GSON.fromJson(response, EcommerceWithdrawResult.class);
+    return GSON.fromJson(response, SubWithdrawResult.class);
   }
 
   @Override
-  public MerchantWithdrawResult withdraw(MerchantWithdrawRequest request) throws WxPayException {
+  public SpWithdrawResult spWithdraw(SpWithdrawRequest request) throws WxPayException {
     String url = String.format("%s/v3/merchant/fund/withdraw", this.payService.getPayBaseUrl());
     String response = this.payService.postV3(url, GSON.toJson(request));
-    return GSON.fromJson(response, MerchantWithdrawResult.class);
+    return GSON.fromJson(response, SpWithdrawResult.class);
   }
 
   /**
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImplTest.java
index 4f8f06321..b56084466 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImplTest.java
@@ -59,8 +59,20 @@ public class EcommerceServiceImplTest {
     //商户订单号
     request.setOutTradeNo("");
     //微信订单号
-    request.setTransactionId("4200000703202009180239466769");
-    PartnerTransactionsResult result = wxPayService.getEcommerceService().queryPartnerTransactions(request);
+    request.setTransactionId("");
+    wxPayService.getEcommerceService().queryPartnerTransactions(request);
+  }
 
+  @Test
+  public void testSubNowBalance() throws WxPayException {
+    String subMchid = "";
+    wxPayService.getEcommerceService().subNowBalance(subMchid);
+  }
+
+  @Test
+  public void testSubDayEndBalance() throws WxPayException {
+    String subMchid = "";
+    String date = "";
+    wxPayService.getEcommerceService().subDayEndBalance(subMchid,date);
   }
 }