From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/room/BindingAddRoomBindingListener.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/room/BindingAddRoomBindingListener.java b/service-api/src/main/java/com/java110/api/listener/room/BindingAddRoomBindingListener.java
index 40d85a9..4962f20 100755
--- a/service-api/src/main/java/com/java110/api/listener/room/BindingAddRoomBindingListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/room/BindingAddRoomBindingListener.java
@@ -119,7 +119,7 @@
floorDto.setCommunityId(communityId);
int floorCount = floorInnerServiceSMOImpl.queryFloorsCount(floorDto);
if (floorCount > 0) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "妤兼爧缂栧彿宸茬粡瀛樺湪");
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "妤兼爧宸茬粡瀛樺湪");
}
viewFloorInfo.put("floorId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_floorId));
viewFloorInfo.put("userId", context.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
@@ -127,22 +127,48 @@
roomBMOImpl.addCommunityMember(viewFloorInfo, context);
}
if (!hasKey(viewUnitInfo, "unitId")) {
+ if (viewFloorInfo.containsKey("floorId") && !StringUtil.isEmpty(viewFloorInfo.getString("floorId"))) { //濡傛灉鍓嶇閫夋嫨鐨勬ゼ鏍嬶紝鑰屼笉鏄柊澧炴ゼ鏍嬶紝灏卞垽鏂妤兼爧涓嬪崟鍏冩槸鍚﹂噸澶�
+ //鑾峰彇妤兼爧id
+ String floorId1 = viewFloorInfo.getString("floorId");
+ //鑾峰彇灏忓尯id
+ String communityId = viewUnitInfo.getString("communityId");
+ //鑾峰彇鍗曞厓缂栧彿
+ String unitNum = viewUnitInfo.getString("unitNum");
+ UnitDto unitDto = new UnitDto();
+ unitDto.setFloorId(floorId1);
+ unitDto.setCommunityId(communityId);
+ unitDto.setUnitNum(unitNum);
+ int unitCount = unitInnerServiceSMOImpl.queryUnitsCount(unitDto);
+ if (unitCount > 0) {
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鍗曞厓宸茬粡瀛樺湪");
+ }
+ }
viewUnitInfo.put("unitId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_unitId));
viewUnitInfo.put("userId", context.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
viewUnitInfo.put("floorId", viewFloorInfo.getString("floorId"));
roomBMOImpl.addBusinessUnit(viewUnitInfo, context);
}
if (!hasKey(addRoomView, "roomId")) {
+ if (viewUnitInfo.containsKey("unitId") && !StringUtil.isEmpty(viewUnitInfo.getString("unitId"))) { //濡傛灉鍓嶇閫夋嫨鐨勫崟鍏冿紝鑰屼笉鏄坊鍔犵殑锛屽氨鍒ゆ柇璇ユゼ鏍嬪崟鍏冧笅鎴垮眿鏄惁閲嶅
+ //鑾峰彇鍗曞厓id
+ String unitId1 = viewUnitInfo.getString("unitId");
+ RoomDto roomDto = new RoomDto();
+ roomDto.setUnitId(unitId1);
+ roomDto.setRoomNum(addRoomView.getString("roomNum"));
+ roomDto.setCommunityId(addRoomView.getString("communityId"));
+ int roomCount = roomInnerServiceSMOImpl.queryRoomsCount(roomDto);
+ if (roomCount > 0) {
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鎴垮眿宸茬粡瀛樺湪");
+ }
+ }
addRoomView.put("roomId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
addRoomView.put("userId", context.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
addRoomView.put("unitId", viewUnitInfo.getString("unitId"));
addRoomView.put("roomType", RoomDto.ROOM_TYPE_ROOM);
-
roomBMOImpl.addBusinessRoom(addRoomView, context);
//澶勭悊鎴垮眿灞炴��
dealRoomAttr(addRoomView, context);
}
-
commit(context);
--
Gitblit v1.8.0