From 1af4e76f8440b1efbbce3689fdcc16f4a4f2c6c3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 18 六月 2021 00:01:42 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java b/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java
index 35955bc..4d1aad6 100644
--- a/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java
+++ b/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java
@@ -55,8 +55,6 @@
@RequestMapping(value = "/upAccountWithdrawalApply", method = RequestMethod.POST)
public ResponseEntity<String> updateAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "acctId", "璇锋眰鎶ユ枃涓湭鍖呭惈acctId");
- Assert.hasKeyAndValue(reqJson, "amount", "璇锋眰鎶ユ枃涓湭鍖呭惈amount");
Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
Assert.hasKeyAndValue(reqJson, "applyId", "applyId涓嶈兘涓虹┖");
@@ -103,7 +101,19 @@
accountWithdrawalApplyDto.setRow(row);
accountWithdrawalApplyDto.setApplyUserName(applyUserName);
accountWithdrawalApplyDto.setApplyUserTel(applyUserTel);
+ if(null == state || "".equals( state )){
+ state = "";
+ }
accountWithdrawalApplyDto.setState(state);
return getAccountWithdrawalApplyBMOImpl.get(accountWithdrawalApplyDto);
}
+
+
+ @RequestMapping(value = "/listStateWithdrawalApplys", method = RequestMethod.GET)
+ public ResponseEntity<String> listStateWithdrawalApplys(@RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "state") String state) {
+ String [] states = state.split( "," );
+ return getAccountWithdrawalApplyBMOImpl.listStateWithdrawalApplys( states, page,row);
+ }
}
--
Gitblit v1.8.0