From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java | 145 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 133 insertions(+), 12 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
old mode 100644
new mode 100755
index aef1786..aa3178d
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
@@ -4,24 +4,28 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
import com.java110.dto.contract.ContractDto;
-import com.java110.dto.contractType.ContractTypeDto;
+import com.java110.dto.contract.ContractTypeDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.rentingPool.RentingPoolDto;
import com.java110.dto.store.StoreDto;
-import com.java110.intf.IContractRoomInnerServiceSMO;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
-import com.java110.intf.store.IContractAttrInnerServiceSMO;
-import com.java110.intf.store.IContractFileInnerServiceSMO;
-import com.java110.intf.store.IContractInnerServiceSMO;
-import com.java110.intf.store.IContractTypeInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.store.*;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
import com.java110.po.contractFile.ContractFilePo;
import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.po.owner.OwnerRoomRelPo;
import com.java110.po.rentingPool.RentingPoolPo;
+import com.java110.po.room.RoomPo;
import com.java110.store.bmo.contract.ISaveContractBMO;
+import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -56,6 +60,15 @@
@Autowired
private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -72,6 +85,8 @@
List<ContractTypeDto> contractTypeDtos = contractTypeInnerServiceSMOImpl.queryContractTypes(contractTypeDto);
Assert.listOnlyOne(contractTypeDtos, "鏌ヨ鍚堝悓绫诲瀷澶辫触");
+
+ validateRoom(contractPo, reqJson);
String audit = contractTypeDtos.get(0).getAudit();
@@ -101,18 +116,21 @@
}
}
- contractPo.setContractId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractId));
if (flag < 0) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
}
saveContractRoomRel(reqJson, contractPo);
+ //闇�瑕佸鏍告椂鎵嶅啓 宸ヤ綔娴�
+ if (!ContractTypeDto.NO_AUDIT.equals(audit)) {
+ //鎻愪氦娴佺▼
+ ContractDto tmpContractDto = BeanConvertUtil.covertBean(contractPo, ContractDto.class);
+ tmpContractDto.setCurrentUserId(reqJson.getString("userId"));
+ tmpContractDto.setNextUserId(reqJson.getString("nextUserId"));
+ contractApplyUserInnerServiceSMOImpl.startProcess(tmpContractDto);
+ }
- //鎻愪氦娴佺▼
- ContractDto tmpContractDto = BeanConvertUtil.covertBean(contractPo, ContractDto.class);
- tmpContractDto.setCurrentUserId(reqJson.getString("userId"));
- contractApplyUserInnerServiceSMOImpl.startProcess(tmpContractDto);
if (StoreDto.STORE_ADMIN.equals(contractPo.getStoreId())) {
noticeRentUpdateState(contractPo, audit);
@@ -138,6 +156,53 @@
}
+ /**
+ * 鎴垮眿鏄惁娆犺垂鏍￠獙
+ *
+ * @param contractPo
+ * @param reqJson
+ */
+ private void validateRoom(ContractPo contractPo, JSONObject reqJson) {
+ //鏍￠獙 鎴垮眿涓婃槸鍚︽湁璐圭敤瀛樺湪
+ if (!reqJson.containsKey("rooms")) {
+ return;
+ }
+ JSONArray rooms = reqJson.getJSONArray("rooms");
+ for (int conFileIndex = 0; conFileIndex < rooms.size(); conFileIndex++) {
+ JSONObject roomObj = rooms.getJSONObject(conFileIndex);
+
+ //鍒ゆ柇鎴垮眿鏄惁瀛樺湪
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(roomObj.getString("roomId"));
+ roomDto.setCommunityId(reqJson.getString("communityId"));
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ Assert.listOnlyOne(roomDtos, "鎴垮眿涓嶅瓨鍦�");
+
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(roomObj.getString("roomId"));
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ //涓嶅瓨鍦ㄥ叧绯�
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() == 0) { // 璇存槑涓氫富娌℃湁鍙戠敓鍙樺寲锛屽悗缁伐浣滀笉鍋氬鐞�
+ continue;
+ }
+ //瀛樺湪鍏崇郴 骞朵笖鏄粬鑷繁
+ if (contractPo.getObjId().equals(ownerRoomRelDtos.get(0).getOwnerId())) {
+ continue;
+ }
+
+ //鏌ヨ鎴垮眿鏃跺�欐湁娆犺垂
+ FeeDto feeDto = new FeeDto();
+ feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ feeDto.setPayerObjId(roomObj.getString("roomId"));
+ feeDto.setState(FeeDto.STATE_DOING);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ if (feeDtos != null && feeDtos.size() > 0) {
+ throw new IllegalArgumentException(roomDtos.get(0).getRoomNum() + "鎴垮眿瀛樺湪鏈粨鏉熺殑璐圭敤 璇峰厛澶勭悊");
+ }
+ }
+ }
+
private void saveContractRoomRel(JSONObject reqJson, ContractPo contractPo) {
//淇濆瓨鍏宠仈鎴垮眿
@@ -150,12 +215,68 @@
ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(resourceStore, ContractRoomPo.class);
contractRoomPo.setCrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_crId));
contractRoomPo.setContractId(contractPo.getContractId());
+ contractRoomPo.setStoreId(contractPo.getStoreId());
contractRoomPo.setRoomName(
resourceStore.getString("floorNum") + "-"
+ resourceStore.getString("unitNum") + "-" + resourceStore.getString("roomNum"));
contractRoomInnerServiceSMOImpl.saveContractRoom(contractRoomPo);
+
+ //鍒蜂笟涓�
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(contractRoomPo.getRoomId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) { // 璇存槑涓氫富娌℃湁鍙戠敓鍙樺寲锛屽悗缁伐浣滀笉鍋氬鐞�
+ if (contractPo.getObjId().equals(ownerRoomRelDtos.get(0).getOwnerId())) {
+ continue;
+ }
+ }
+
+ //琛ュ厖 B杩囩▼鏁版嵁 ADD
+ String relId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId);
+ OwnerRoomRelPo ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setEndTime(contractPo.getEndTime());
+ ownerRoomRelPo.setStartTime(contractPo.getStartTime());
+ ownerRoomRelPo.setOwnerId(contractPo.getObjId());
+ ownerRoomRelPo.setRelId(relId);
+ ownerRoomRelPo.setRemark("绛捐鍚堝悓鑷姩缁戝畾");
+ ownerRoomRelPo.setRoomId(contractRoomPo.getRoomId());
+ ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setUserId("-1");
+ ownerRoomRelPo.setOperate("ADD");
+ ownerRoomRelPo.setbId("-1");
+ ownerRoomRelInnerServiceSMOImpl.saveBusinessOwnerRoomRels(ownerRoomRelPo);
+
+ ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setEndTime(contractPo.getEndTime());
+ ownerRoomRelPo.setStartTime(contractPo.getStartTime());
+ ownerRoomRelPo.setOwnerId(contractPo.getObjId());
+ ownerRoomRelPo.setRelId(relId);
+ ownerRoomRelPo.setRemark("绛捐鍚堝悓鑷姩缁戝畾");
+ ownerRoomRelPo.setRoomId(contractRoomPo.getRoomId());
+ ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setUserId("-1");
+ ownerRoomRelInnerServiceSMOImpl.saveOwnerRoomRels(ownerRoomRelPo);
+
+ //淇敼鎴垮眿鐘舵��
+ RoomPo roomPo = new RoomPo();
+ roomPo.setRoomId(contractRoomPo.getRoomId());
+ roomPo.setState(RoomDto.STATE_SELL);
+ roomPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
+ roomInnerServiceSMOImpl.updateRooms(roomPo);
+ //鍒犻櫎鑰佺殑
+ if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
+ ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+ ownerRoomRelPo.setRelId(ownerRoomRelDtos.get(0).getRelId());
+ ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+ ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtos.get(0), OwnerRoomRelPo.class);
+ ownerRoomRelPo.setbId("-1");
+ ownerRoomRelPo.setOperate("DEL");
+ ownerRoomRelInnerServiceSMOImpl.saveBusinessOwnerRoomRels(ownerRoomRelPo);
+ }
}
- //鍒蜂笟涓�
+
}
/**
--
Gitblit v1.8.0