From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java
index fe64295..42a69c2 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java
@@ -16,21 +16,27 @@
package com.java110.user.smo.impl;
-import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
+import com.java110.dto.owner.OwnerSettledRoomsDto;
+import com.java110.dto.owner.OwnerSettledSettingDto;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledRoomsV1InnerServiceSMO;
import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
+import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomPo;
import com.java110.user.dao.IOwnerSettledApplyV1ServiceDao;
import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
-import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+import com.java110.dto.owner.OwnerSettledApplyDto;
import com.java110.po.ownerSettledApply.OwnerSettledApplyPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -50,6 +56,16 @@
@Autowired
private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
+ @Autowired
+ private IOwnerSettledRoomsV1InnerServiceSMO ownerSettledRoomsV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+
@Override
public int saveOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
@@ -60,6 +76,56 @@
@Override
public int updateOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
int saveFlag = ownerSettledApplyV1ServiceDaoImpl.updateOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
+
+ if(saveFlag < 1 || !OwnerSettledApplyDto.STATE_COMPLETE.equals(ownerSettledApplyPo.getState())){
+ return saveFlag;
+ }
+
+ OwnerSettledApplyDto ownerSettledApplyDto = new OwnerSettledApplyDto();
+ ownerSettledApplyDto.setApplyId(ownerSettledApplyPo.getApplyId());
+ List<OwnerSettledApplyDto> ownerSettledApplyDtos = queryOwnerSettledApplys(ownerSettledApplyDto);
+
+ if(ownerSettledApplyDtos == null || ownerSettledApplyDtos.size()<1){
+ return saveFlag;
+ }
+
+ OwnerSettledRoomsDto ownerSettledRoomsDto = new OwnerSettledRoomsDto();
+ ownerSettledRoomsDto.setApplyId(ownerSettledApplyPo.getApplyId());
+ List<OwnerSettledRoomsDto> ownerSettledRoomsDtos = ownerSettledRoomsV1InnerServiceSMOImpl.queryOwnerSettledRoomss(ownerSettledRoomsDto);
+
+ if(ownerSettledRoomsDtos == null || ownerSettledRoomsDtos.size() < 1){
+ return saveFlag;
+ }
+ List<RoomDto> roomDtos = null;
+ OwnerRoomRelPo ownerRoomRelPo = null;
+ RoomPo roomPo = null;
+ for(OwnerSettledRoomsDto tmpOwnerSettledRoomsDto:ownerSettledRoomsDtos){
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(tmpOwnerSettledRoomsDto.getRoomId());
+ roomDto.setCommunityId(tmpOwnerSettledRoomsDto.getCommunityId());
+ roomDto.setState(RoomDto.STATE_FREE);
+ roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
+ if(roomDtos == null || roomDtos.size() < 1){
+ continue;
+ }
+
+ ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setOwnerId(ownerSettledApplyDtos.get(0).getOwnerId());
+ ownerRoomRelPo.setRemark("瀹℃牳鍏ラ┗");
+ ownerRoomRelPo.setRoomId(tmpOwnerSettledRoomsDto.getRoomId());
+ ownerRoomRelPo.setRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+ ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setStartTime(tmpOwnerSettledRoomsDto.getStartTime());
+ ownerRoomRelPo.setEndTime(tmpOwnerSettledRoomsDto.getEndTime());
+ ownerRoomRelPo.setUserId("-1");
+ ownerRoomRelV1InnerServiceSMOImpl.saveOwnerRoomRel(ownerRoomRelPo);
+
+ roomPo = new RoomPo();
+ roomPo.setRoomId(tmpOwnerSettledRoomsDto.getRoomId());
+ roomPo.setState(RoomDto.STATE_SELL);
+ roomV1InnerServiceSMOImpl.updateRoom(roomPo);
+ }
+
return saveFlag;
}
@@ -95,7 +161,10 @@
}
for(OwnerSettledApplyDto tmpOwnerSettledApplyDto: ownerSettledApplys){
- BeanConvertUtil.covertBean(settings.get(0),tmpOwnerSettledApplyDto);
+ settings.get(0).setRemark("");
+ tmpOwnerSettledApplyDto.setFlowId(settings.get(0).getFlowId());
+ tmpOwnerSettledApplyDto.setFlowName(settings.get(0).getFlowName());
+ tmpOwnerSettledApplyDto.setAuditWay(settings.get(0).getAuditWay());
}
return ownerSettledApplys;
--
Gitblit v1.8.0