Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-03 2b919980a8c70554a64cb3d03cc95679af4d817f

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

@@ -5,7 +5,7 @@
import com.java110.api.bmo.room.IRoomBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerRoomRelDto;
@@ -30,7 +30,6 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -291,16 +290,6 @@
     * @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));