Merge remote-tracking branch 'origin/xinghong-dev'

java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -70,6 +70,8 @@ public class RoomDto extends PageDto implements Serializable {
     private List<FeeDto> fees;
 
     private Date createTime;
+    private Date startTime;
+    private Date endTime;
 
 
     private String statusCd = "0";
@@ -364,5 +366,19 @@ public class RoomDto extends PageDto implements Serializable {
         this.roomSubTypeName = roomSubTypeName;
     }
 
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
 
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java

@@ -291,16 +291,6 @@ public class RoomBMOImpl extends ApiBaseBMO implements IRoomBMO {
      * @return 订单服务能够接受的报文
      */
     public void updateShellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-        //获取房屋状态
-        String state = paramInJson.getString("state");
-        if (!StringUtil.isEmpty(paramInJson.getString("startTime")) && !StringUtil.isEmpty(state) && state.equals("2006")) {
-            String startTime = paramInJson.getString("startTime");
-            paramInJson.put("startTime", startTime + " 00:00:00");
-        }
-        if (!StringUtil.isEmpty(paramInJson.getString("endTime")) && !StringUtil.isEmpty(state) && state.equals("2006")) {
-            String endTime = paramInJson.getString("endTime");
-            paramInJson.put("endTime", endTime + " 23:59:59");
-        }
         JSONObject businessUnit = new JSONObject();
         businessUnit.putAll(paramInJson);
         businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));

service-api/src/main/java/com/java110/api/listener/room/QueryRoomsListener.java

@@ -9,10 +9,12 @@ import com.java110.dto.FloorDto;
 import com.java110.dto.RoomDto;
 import com.java110.dto.basePrivilege.BasePrivilegeDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.intf.community.IFloorInnerServiceSMO;
 import com.java110.intf.community.IMenuInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.exception.SMOException;
@@ -49,6 +51,9 @@ public class QueryRoomsListener extends AbstractServiceApiDataFlowListener {
     @Autowired
     private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
     @Autowired
     private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
 
@@ -123,6 +128,17 @@ public class QueryRoomsListener extends AbstractServiceApiDataFlowListener {
                     roomDto.setIdCard(idCard);
                     roomDto.setLink(link);
                 }
+                //商铺类型查询起租时间
+                if (roomDto.getRoomType().equals(RoomDto.ROOM_TYPE_SHOPS)) {
+                    OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+                    ownerRoomRelDto.setRoomId(roomDto.getRoomId());
+                    ownerRoomRelDto.setStatusCd("0");
+                    List<OwnerRoomRelDto> ownerRoomRelDtoList = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+                    if (ownerRoomRelDtoList != null && ownerRoomRelDtoList.size() == 1) {
+                        roomDto.setStartTime(ownerRoomRelDtoList.get(0).getStartTime());
+                        roomDto.setEndTime(ownerRoomRelDtoList.get(0).getEndTime());
+                    }
+                }
             }
         }
     }

service-api/src/main/java/com/java110/api/listener/room/UpdateRoomListener.java

@@ -8,9 +8,14 @@ import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.dto.UnitDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomPo;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +45,9 @@ public class UpdateRoomListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IUnitInnerServiceSMO unitInnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
     @Override
     public String getServiceCode() {
         return ServiceCodeConstant.SERVICE_CODE_UPDATE_ROOMS;
@@ -99,6 +107,16 @@ public class UpdateRoomListener extends AbstractServiceApiPlusListener {
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
         roomBMOImpl.updateShellRoom(reqJson, context);
+        String state = reqJson.getString("state");
+        if (!StringUtil.isEmpty(state) && state.equals("2006")) { //已出租
+            OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+            ownerRoomRelDto.setRoomId(reqJson.getString("roomId"));
+            List<OwnerRoomRelDto> ownerRoomRelDtoList = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+            OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(ownerRoomRelDtoList.get(0), OwnerRoomRelPo.class);
+            ownerRoomRelPo.setStartTime(reqJson.getString("startTime"));
+            ownerRoomRelPo.setEndTime(reqJson.getString("endTime") + " 23:59:59");
+            ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+        }
 
         if (!reqJson.containsKey("attrs")) {
             return;

service-api/src/main/java/com/java110/api/listener/user/DeleteStaffServiceListener.java

@@ -1,13 +1,16 @@
 package com.java110.api.listener.user;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.repair.IRepairTypeUserBMO;
 import com.java110.api.bmo.user.IUserBMO;
 import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.factory.DataFlowFactory;
+import com.java110.dto.repair.RepairTypeUserDto;
 import com.java110.entity.center.AppService;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.intf.community.IRepairTypeUserInnerServiceSMO;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
@@ -18,6 +21,8 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.util.List;
+
 /**
  * 删除员工信息
  * Created by Administrator on 2019/4/4.
@@ -32,6 +37,13 @@ public class DeleteStaffServiceListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IUserBMO userBMOImpl;
 
+    @Autowired
+    private IRepairTypeUserBMO repairTypeUserBMOImpl;
+
+
+    @Autowired
+    private IRepairTypeUserInnerServiceSMO repairTypeUserInnerServiceSMOImpl;
+
     @Override
     public String getServiceCode() {
         return ServiceCodeConstant.SERVICE_CODE_USER_STAFF_DELETE;
@@ -57,6 +69,18 @@ public class DeleteStaffServiceListener extends AbstractServiceApiPlusListener {
         //删除用户
         userBMOImpl.deleteUser(reqJson, context);
 
+        //删除报修设置
+        RepairTypeUserDto repairTypeUserDto = new RepairTypeUserDto();
+        repairTypeUserDto.setStaffId(reqJson.getString("userId"));
+        repairTypeUserDto.setStatusCd("0");
+        List<RepairTypeUserDto> repairTypeUserDtoList = repairTypeUserInnerServiceSMOImpl.queryRepairTypeUsers(repairTypeUserDto);
+        if (repairTypeUserDtoList != null && repairTypeUserDtoList.size() > 0) {
+            for (RepairTypeUserDto repairTypeUserDto1 : repairTypeUserDtoList) {
+                JSONObject typeUserJson1= (JSONObject)JSONObject.toJSON(repairTypeUserDto1);
+                repairTypeUserBMOImpl.deleteRepairTypeUser(typeUserJson1, context);
+            }
+        }
+
         commit(context);
 
         //赋权