From 919e2989808dd97ba32b4478dbe95851c70fbce5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 05 十二月 2024 12:01:21 +0800
Subject: [PATCH] 账户功能优化 支持 按物业费和水电费扣费
---
service-acct/src/main/java/com/java110/acct/api/AccountApi.java | 80 ----------------------------------------
1 files changed, 0 insertions(+), 80 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 82e5a75..dbbec67 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
@@ -85,86 +85,6 @@
}
/**
- * 鏌ヨ涓氫富璐︽埛
- *
- * @param communityId 灏忓尯ID
- * @return
- * @serviceCode /account/queryOwnerAccount
- * @path /app/account/queryOwnerAccount
- */
- @RequestMapping(value = "/queryOwnerAccount", method = RequestMethod.GET)
- public ResponseEntity<String> queryOwnerAccount(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "ownerId", required = false) String ownerId,
- @RequestParam(value = "ownerName", required = false) String ownerName,
- @RequestParam(value = "feeId", required = false) String feeId,
- @RequestParam(value = "link", required = false) String link,
- @RequestParam(value = "idCard", required = false) String idCard,
- @RequestParam(value = "acctType", required = false) String acctType,
- @RequestParam(value = "acctTypes", required = false) String[] acctTypes,
- @RequestParam(value = "acctId", required = false) String acctId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row,
- @RequestHeader(value = "user-id") String userId,
- @RequestHeader(value = "app-id") String appId) {
- AccountDto accountDto = new AccountDto();
- accountDto.setPage(page);
- accountDto.setRow(row);
- if (!StringUtil.isEmpty(feeId)) {
- FeeDto feeDto = new FeeDto();
- feeDto.setFeeId(feeId);
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- Assert.listOnlyOne(feeDtos, "鏌ヨ璐圭敤淇℃伅閿欒锛�");
- //鑾峰彇浠樿垂瀵硅薄绫诲瀷(3333 鎴垮眿 6666 鏄溅浣�)
- String payerObjType = feeDtos.get(0).getPayerObjType();
- //鑾峰彇浠樿垂瀵硅薄id
- String payerObjId = feeDtos.get(0).getPayerObjId();
- if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(payerObjType)) { //鎴垮眿
- OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setRoomId(payerObjId);
- List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- Assert.listOnlyOne(ownerRoomRelDtos, "鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
- ownerId = ownerRoomRelDtos.get(0).getOwnerId();
- } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(payerObjType)) {
- OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setCarId(payerObjId);
- 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";
- }
- accountDto.setObjId(ownerId);
- } else {
- accountDto.setObjId(ownerId);
- }
- accountDto.setObjType(AccountDto.OBJ_TYPE_PERSON);
- accountDto.setAcctName(ownerName);
- accountDto.setPartId(communityId);
- accountDto.setAcctType(acctType);
- if(!StringUtil.isNullOrNone(acctTypes)){
- accountDto.setAcctTypes(acctTypes);
- }
- accountDto.setLink(link);
- accountDto.setAcctId(acctId);
-
- //todo 涓氫富璐︽埛瀹夊叏鎬ф牎楠�
- ownerGetDataCheckImpl.checkOwnerAccount(appId, userId, BeanConvertUtil.beanCovertJson(accountDto));
-
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setOwnerId(ownerId);
- ownerDto.setCommunityId(communityId);
- ownerDto.setLink(link);
- ownerDto.setIdCard(idCard);
- return getAccountBMOImpl.queryOwnerAccount(accountDto, ownerDto);
- }
-
- /**
* 鏌ヨ涓氫富璐︽埛鏄庣粏
*
* @param objId 灏忓尯ID
--
Gitblit v1.8.0