From c93a86960454d18c0e4cb61b65df651849fe50e9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 三月 2024 09:35:53 +0800
Subject: [PATCH] 优化业主端逻辑
---
service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java
index 2714f6e..f98c833 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java
@@ -14,10 +14,14 @@
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmsInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
@@ -67,6 +71,12 @@
@Autowired
private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@Override
@@ -177,6 +187,8 @@
ownerAppUserPo.setRemark("娉ㄥ唽鑷姩鍏宠仈");
ownerAppUserPo.setUserId(userPo.getUserId());
ownerAppUserPo.setAppType(appType);
+ ownerAppUserPo.setOwnerTypeCd(tmpOwnerDto.getOwnerTypeCd());
+ queryOwnerRoom(tmpOwnerDto, ownerAppUserPo);
flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
if (flag < 1) {
throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
@@ -186,46 +198,28 @@
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
- private void addOwnerAppUser(JSONObject paramInJson, List<OwnerDto> ownerDtos) {
- List<CommunityDto> communityDtos = null;
- CommunityDto tmpCommunityDto = null;
- String communityName = "鏃�";
+ private void queryOwnerRoom(OwnerDto ownerDto, OwnerAppUserPo ownerAppUserPo) {
- if (ownerDtos == null || ownerDtos.size() < 1) {
- CommunityDto communityDto = new CommunityDto();
- communityDto.setState("1100");
- communityDto.setCommunityId(paramInJson.getString("defaultCommunityId"));
- communityDto.setPage(1);
- communityDto.setRow(1);
- communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- if (communityDtos != null && communityDtos.size() > 0) {
- communityName = communityDtos.get(0).getName();
- }
- OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(paramInJson, OwnerAppUserPo.class);
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState("12000");
- ownerAppUserPo.setAppTypeCd("10010");
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
- ownerAppUserPo.setMemberId("-1");
- ownerAppUserPo.setCommunityName(communityName);
- ownerAppUserPo.setCommunityId(paramInJson.getString("defaultCommunityId"));
- ownerAppUserPo.setAppUserName("娓稿");
- ownerAppUserPo.setIdCard("鏃�");
- int flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- if (flag < 1) {
- throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
- }
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setOwnerId(ownerDto.getOwnerId());
+
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
return;
}
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(ownerRoomRelDtos.get(0).getRoomId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ if (ListUtil.isNull(roomDtos)) {
+ return;
+ }
+ ownerAppUserPo.setRoomId(roomDtos.get(0).getRoomId());
+ ownerAppUserPo.setRoomName(roomDtos.get(0).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum());
}
- /**
- * 娉ㄥ唽鐢ㄦ埛
- *
- * @param paramObj
- */
}
--
Gitblit v1.8.0