From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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
index 2ac811b..a98ea9b 100755
--- 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
@@ -23,6 +23,7 @@
 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;
@@ -126,6 +127,7 @@
             //鎻愪氦娴佺▼
             ContractDto tmpContractDto = BeanConvertUtil.covertBean(contractPo, ContractDto.class);
             tmpContractDto.setCurrentUserId(reqJson.getString("userId"));
+            tmpContractDto.setNextUserId(reqJson.getString("nextUserId"));
             contractApplyUserInnerServiceSMOImpl.startProcess(tmpContractDto);
         }
 
@@ -231,11 +233,12 @@
             }
 
             //琛ュ厖 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(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+            ownerRoomRelPo.setRelId(relId);
             ownerRoomRelPo.setRemark("绛捐鍚堝悓鑷姩缁戝畾");
             ownerRoomRelPo.setRoomId(contractRoomPo.getRoomId());
             ownerRoomRelPo.setState("2001");
@@ -248,11 +251,19 @@
             ownerRoomRelPo.setEndTime(contractPo.getEndTime());
             ownerRoomRelPo.setStartTime(contractPo.getStartTime());
             ownerRoomRelPo.setOwnerId(contractPo.getObjId());
-            ownerRoomRelPo.setRelId(ownerRoomRelPo.getRelId());
+            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();

--
Gitblit v1.8.0