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 { /** *
* 字段名:商户提现单号
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 {
/**
*
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 {
/**
*
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 {
/**
*
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;
/**
*
@@ -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);
}
}