8000 fix:命名统一调整 · Dream2Land/WxJava@2037900 · GitHub
[go: up one dir, main page]

Skip to content

Commit 2037900

Browse files
author
曾浩
committed
fix:命名统一调整
1 parent 00bc965 commit 2037900

File tree

7 files changed

+24
-12
lines changed

7 files changed

+24
-12
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
@Data
1616
@NoArgsConstructor
17-
public class MerchantWithdrawRequest implements Serializable {
17+
public class SpWithdrawRequest implements Serializable {
1818
/**
1919
* <pre>
2020
* 字段名:商户提现单号
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
@Data
1616
@NoArgsConstructor
17-
public class MerchantWithdrawResult implements Serializable {
17+
public class SpWithdrawResult implements Serializable {
1818

1919
/**
2020
* <pre>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
@Data
1616
@NoArgsConstructor
17-
public class EcommerceWithdrawRequest implements Serializab 10000 le {
17+
public class SubWithdrawRequest implements Serializable {
1818

1919
/**
2020
* <pre>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
@Data
1616
@NoArgsConstructor
17-
public class EcommerceWithdrawResult implements Serializable {
17+
public class SubWithdrawResult implements Serializable {
1818

1919
/**
2020
* <pre>

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public interface EcommerceService {
271271
* @return 返回数据 return withdraw result
272272
* @throws WxPayException the wx pay exception
273273
*/
274-
EcommerceWithdrawResult withdraw(EcommerceWithdrawRequest request) throws WxPayException;
274+
SubWithdrawResult subWithdraw(SubWithdrawRequest request) throws WxPayException;
275275

276276
/**
277277
* <pre>
@@ -283,5 +283,5 @@ public interface EcommerceService {
283283
* @return 返回数据 return withdraw result
284284
* @throws WxPayException the wx pay exception
285285
*/
286-
MerchantWithdrawResult withdraw(MerchantWithdrawRequest request) throws WxPayException;
286+
SpWithdrawResult spWithdraw(SpWithdrawRequest request) throws WxPayException;
287287
}

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,17 @@ public RefundsResult refunds(RefundsRequest request) throws WxPayException {
203203
}
204204

205205
@Override
206-
public EcommerceWithdrawResult withdraw(EcommerceWithdrawRequest request) throws WxPayException {
206+
public SubWithdrawResult subWithdraw(SubWithdrawRequest request) throws WxPayException {
207207
String url = String.format("%s/v3/ecommerce/fund/withdraw", this.payService.getPayBaseUrl());
208208
String response = this.payService.postV3(url, GSON.toJson(request));
209-
return GSON.fromJson(response, EcommerceWithdrawResult.class);
209+
return GSON.fromJson(response, SubWithdrawResult.class);
210210
}
211211

212212
@Override
213-
public MerchantWithdrawResult withdraw(MerchantWithdrawRequest request) throws WxPayException {
213+
public SpWithdrawResult spWithdraw(SpWithdrawRequest request) throws WxPayException {
214214
String url = String.format("%s/v3/merchant/fund/withdraw", this.payService.getPayBaseUrl());
215215
String response = this.payService.postV3(url, GSON.toJson(request));
216-
return GSON.fromJson(response, MerchantWithdrawResult.class);
216+
return GSON.fromJson(response, SpWithdrawResult.class);
217217
}
218218

219219
/**

weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImplTest.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,20 @@ public void testQueryPartnerTransactions() throws WxPayException {
5959
//商户订单号
6060
request.setOutTradeNo("");
6161
//微信订单号
62-
request.setTransactionId("4200000703202009180239466769");
63-
PartnerTransactionsResult result = wxPayService.getEcommerceService().queryPartnerTransactions(request);
62+
request.setTransactionId("");
63+
wxPayService.getEcommerceService().queryPartnerTransactions(request);
64+
}
6465

66+
@Test
67+
public void testSubNowBalance() throws WxPayException {
68+
String subMchid = "";
69+
wxPayService.getEcommerceService().subNowBalance(subMchid);
70+
}
71+
72+
@Test
73+
public void testSubDayEndBalance() throws WxPayException {
74+
String subMchid = "";
75+
String date = "";
76+
wxPayService.getEcommerceService().subDayEndBalance(subMchid,date);
6577
}
6678
}

0 commit comments

Comments
 (0)
0