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 | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 e349633..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
@@ -47,19 +47,14 @@
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /accountWithdrawalApply/updateAccountWithdrawalApply
- * @path /app/accountWithdrawalApply/updateAccountWithdrawalApply
+ * @serviceCode /accountWithdrawalApply/upAccountWithdrawalApply
+ * @path /app/accountWithdrawalApply/upAccountWithdrawalApply
* @param reqJson
* @return
*/
- @RequestMapping(value = "/updateAccountWithdrawalApply", method = RequestMethod.POST)
+ @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, "applyUserId", "璇锋眰鎶ユ枃涓湭鍖呭惈applyUserId");
- Assert.hasKeyAndValue(reqJson, "applyUserName", "璇锋眰鎶ユ枃涓湭鍖呭惈applyUserName");
- Assert.hasKeyAndValue(reqJson, "applyUserTel", "璇锋眰鎶ユ枃涓湭鍖呭惈applyUserTel");
Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
Assert.hasKeyAndValue(reqJson, "applyId", "applyId涓嶈兘涓虹┖");
@@ -77,7 +72,7 @@
*/
@RequestMapping(value = "/deleteAccountWithdrawalApply", method = RequestMethod.POST)
public ResponseEntity<String> deleteAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "acctId", "璐︽埛ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "applyId", "applyId涓嶈兘涓虹┖");
@@ -88,17 +83,37 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /accountWithdrawalApply/queryAccountWithdrawalApply
- * @path /app/accountWithdrawalApply/queryAccountWithdrawalApply
- * @param
+ * @serviceCode /accountWithdrawalApply/listAccountWithdrawalApply
+ * @path /app/accountWithdrawalApply/listAccountWithdrawalApply
+ * @param applyUserName: '',
+ * applyUserTel: '',
+ * state: '486'
* @return
*/
- @RequestMapping(value = "/queryAccountWithdrawalApply", method = RequestMethod.GET)
+ @RequestMapping(value = "/listAccountWithdrawalApply", method = RequestMethod.GET)
public ResponseEntity<String> queryAccountWithdrawalApply(@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "applyUserName",required = false) String applyUserName,
+ @RequestParam(value = "applyUserTel",required = false) String applyUserTel,
+ @RequestParam(value = "state",required = false) String state) {
AccountWithdrawalApplyDto accountWithdrawalApplyDto = new AccountWithdrawalApplyDto();
accountWithdrawalApplyDto.setPage(page);
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