From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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..981b3f8 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
@@ -40,26 +40,22 @@
Assert.hasKeyAndValue(reqJson, "acctId", "璇锋眰鎶ユ枃涓湭鍖呭惈acctId");
Assert.hasKeyAndValue(reqJson, "amount", "璇锋眰鎶ユ枃涓湭鍖呭惈amount");
+ Assert.hasKeyAndValue(reqJson, "bankId", "璇锋眰鎶ユ枃涓湭鍖呭惈bankId");
AccountWithdrawalApplyPo accountWithdrawalApplyPo = BeanConvertUtil.covertBean(reqJson, AccountWithdrawalApplyPo.class);
- return saveAccountWithdrawalApplyBMOImpl.save(accountWithdrawalApplyPo,userId);
+ return saveAccountWithdrawalApplyBMOImpl.save(accountWithdrawalApplyPo,userId,reqJson);
}
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @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 +73,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 +84,41 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @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 = "bankCode",required = false) String bankCode,
+ @RequestParam(value = "applyUserTel",required = false) String applyUserTel,
+ @RequestParam(value = "objId",required = false) String objId,
+ @RequestParam(value = "state",required = false) String state) {
AccountWithdrawalApplyDto accountWithdrawalApplyDto = new AccountWithdrawalApplyDto();
accountWithdrawalApplyDto.setPage(page);
accountWithdrawalApplyDto.setRow(row);
+ accountWithdrawalApplyDto.setApplyUserName(applyUserName);
+ accountWithdrawalApplyDto.setApplyUserTel(applyUserTel);
+ accountWithdrawalApplyDto.setBankCode(bankCode);
+ accountWithdrawalApplyDto.setObjId( objId );
+ 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