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/AccountApi.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/api/AccountApi.java b/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
index a6b2cb6..5734bed 100644
--- a/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
+++ b/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
@@ -4,15 +4,17 @@
import com.java110.acct.bmo.account.IGetAccountBMO;
import com.java110.acct.bmo.account.IOwnerPrestoreAccountBMO;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.accountDetail.AccountDetailDto;
+import com.java110.dto.account.AccountDetailDto;
+import com.java110.dto.contract.ContractDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
-import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.po.account.AccountDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,9 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+ @Autowired
+ private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
@@ -59,12 +64,17 @@
*/
@RequestMapping(value = "/queryAccount", method = RequestMethod.GET)
public ResponseEntity<String> queryAccount(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "shopId", required = false) String shopId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
AccountDto accountDto = new AccountDto();
accountDto.setPage(page);
accountDto.setRow(row);
- accountDto.setObjId(storeId);
+ if(!StringUtil.isEmpty(shopId)){
+ accountDto.setObjId(shopId);
+ }else {
+ accountDto.setObjId(storeId);
+ }
return getAccountBMOImpl.get(accountDto);
}
@@ -112,6 +122,12 @@
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
// Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富杞﹁締鍏崇郴琛ㄩ敊璇紒");
ownerId = ownerCarDtos.get(0).getOwnerId();
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(payerObjType)) {
+ ContractDto contractDto = new ContractDto();
+ contractDto.setContractId(payerObjId);
+ List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
+// Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富杞﹁締鍏崇郴琛ㄩ敊璇紒");
+ ownerId = contractDtos.get(0).getObjId();
} else {
ownerId = "-1";
}
@@ -193,6 +209,8 @@
Assert.hasKeyAndValue(reqJson, "ownerId", "涓氫富涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "amount", "閲戦涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "acctType", "璐︽埛绫诲瀷涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "primeRate", "鏈寘鍚敮浠樻柟寮�");
+
AccountDetailPo accountDetailPo = new AccountDetailPo();
accountDetailPo.setRemark(reqJson.getString("remark"));
accountDetailPo.setObjId(reqJson.getString("ownerId"));
--
Gitblit v1.8.0