From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
old mode 100644
new mode 100755
index 63c6e41..b2be937
--- a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
@@ -1,11 +1,13 @@
package com.java110.user.bmo.owner.impl;
-import com.java110.dto.RoomDto;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
@@ -16,6 +18,7 @@
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.user.bmo.owner.IComprehensiveQuery;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -63,6 +66,9 @@
@Autowired
private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+ @Autowired
+ private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
@Override
public ResponseEntity<String> query(String communityId, String searchValue, String searchType, String userId, String storeId) {
OwnerDto ownerDto = null;
@@ -98,6 +104,20 @@
ownerDto = queryByContract(communityId, searchValue, userId, storeId);
break;
}
+
+ if(ownerDto == null){
+ return ResultVo.createResponseEntity(1, 1, ownerDto);
+ }
+ //todo 鏌ヨ璐︽埛浣欓
+ AccountDto accountDto = new AccountDto();
+ accountDto.setObjId(ownerDto.getMemberId());
+ accountDto.setPartId(communityId);
+ accountDto.setAcctType(AccountDto.ACCT_TYPE_CASH);
+ List<AccountDto> accountDtos =accountInnerServiceSMOImpl.queryAccounts(accountDto);
+ if(!ListUtil.isNull(accountDtos)){
+ ownerDto.setAcctAmount(accountDtos.get(0).getAmount());
+ }
+
return ResultVo.createResponseEntity(1, 1, ownerDto);
}
@@ -112,7 +132,7 @@
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setIdCard(searchValue);
- ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
+ ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
@@ -144,7 +164,7 @@
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setLink(searchValue);
- ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
+ ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
@@ -177,9 +197,10 @@
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setName(searchValue);
- ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
+ ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
+ Assert.isNotNull(ownerDtos,"鏈壘鍒版垚鍛樹俊鎭紝璇锋崲鍏朵粬鏉′欢鏌ヨ");
+ //Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
@@ -449,7 +470,7 @@
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍟嗛摵 濡� 1-1");
}
- String[] values = searchValue.split("-");
+ String[] values = searchValue.split("-",3);
if (values.length != 2) {
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍟嗛摵 濡� 1-1");
@@ -509,7 +530,7 @@
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍗曞厓-鎴垮眿 濡� 1-1-1");
}
- String[] values = searchValue.split("-");
+ String[] values = searchValue.split("-",3);
if (values.length != 3) {
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍗曞厓-鎴垮眿 濡� 1-1-1");
@@ -522,26 +543,33 @@
roomDto.setCommunityId(communityId);
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos, "鏈壘鍒版埧灞嬩俊鎭�");
+ //Assert.listOnlyOne(roomDtos, "鏈壘鍒版埧灞嬩俊鎭�");
+ if(roomDtos == null || roomDtos.size() < 1){
+ throw new IllegalArgumentException("鏈壘鍒版埧灞嬩俊鎭�");
+ }
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setRoomId(roomDtos.get(0).getRoomId());
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭�");
+ //Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭�");
+ if(ownerDtos == null || ownerDtos.size() < 1){
+ throw new IllegalArgumentException("鏈壘鍒颁笟涓讳俊鎭�");
+ }
+
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
List<OwnerDto> ownerDtoList = new ArrayList<>();
for (OwnerDto owner : ownerDtos) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
String idCard = owner.getIdCard();
- if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ if (mark.size() == 0 && idCard != null && idCard.length() >= 16) {
idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
}
//瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
String link = owner.getLink();
- if (mark.size() == 0 && link != null && !link.equals("")) {
+ if (mark.size() == 0 && link != null && link.length() == 11) {
link = link.substring(0, 3) + "****" + link.substring(7);
}
owner.setIdCard(idCard);
@@ -572,19 +600,12 @@
List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
Assert.listOnlyOne(contractDtos, "鏈壘鍒板悎鍚屼俊鎭�");
- RoomDto roomDto = new RoomDto();
- roomDto.setRoomId(contractDtos.get(0).getObjId());
- roomDto.setCommunityId(communityId);
-
- List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos, "鏈壘鍒版埧灞嬩俊鎭�");
-
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
- ownerDto.setRoomId(roomDtos.get(0).getRoomId());
+ ownerDto.setMemberId(contractDtos.get(0).getObjId());
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭�");
+ Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
List<OwnerDto> ownerDtoList = new ArrayList<>();
@@ -603,11 +624,26 @@
owner.setLink(link);
ownerDtoList.add(owner);
}
-
OwnerDto resOwnerDto = ownerDtoList.get(0);
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setOwnerId(ownerDtoList.get(0).getOwnerId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ //娌℃湁鎴垮眿
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ return resOwnerDto;
+ }
+ List<String> roomIds = new ArrayList<>();
+ for (OwnerRoomRelDto tmpOwnerRoomRelDto : ownerRoomRelDtos) {
+ roomIds.add(tmpOwnerRoomRelDto.getRoomId());
+ }
+
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ roomDto.setCommunityId(communityId);
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
resOwnerDto.setRooms(roomDtos);
-
return resOwnerDto;
}
--
Gitblit v1.8.0