From 8f61316069a6ffffb0998ed3f498bd4e3acc77e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:36:15 +0800
Subject: [PATCH] 优化 费用
---
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..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,9 +40,10 @@
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);
}
/**
@@ -55,8 +56,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涓嶈兘涓虹┖");
@@ -96,14 +95,30 @@
public ResponseEntity<String> queryAccountWithdrawalApply(@RequestParam(value = "page") int page,
@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