From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 8ccdf12..2b3df10 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
@@ -5,8 +5,8 @@
import com.java110.acct.bmo.accountWithdrawalApply.IGetAccountWithdrawalApplyBMO;
import com.java110.acct.bmo.accountWithdrawalApply.ISaveAccountWithdrawalApplyBMO;
import com.java110.acct.bmo.accountWithdrawalApply.IUpdateAccountWithdrawalApplyBMO;
-import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
-import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import com.java110.dto.account.AccountWithdrawalApplyDto;
+import com.java110.po.account.AccountWithdrawalApplyPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -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,13 +95,17 @@
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 = "";
}
@@ -114,8 +117,8 @@
@RequestMapping(value = "/listStateWithdrawalApplys", method = RequestMethod.GET)
public ResponseEntity<String> listStateWithdrawalApplys(@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
- @RequestParam(value = "state",required = false) String [] state) {
-
- return getAccountWithdrawalApplyBMOImpl.listStateWithdrawalApplys( state, page,row);
+ @RequestParam(value = "state") String state) {
+ String [] states = state.split( "," );
+ return getAccountWithdrawalApplyBMOImpl.listStateWithdrawalApplys( states, page,row);
}
}
--
Gitblit v1.8.0