Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/controller/TaHouseOrderController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaHouseSetting;
+import com.shigongli.service.ITaHouseSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
     @Autowired
     public ITaHouseOrderService iTaHouseOrderService;
 
+    @Autowired
+    ITaHouseSettingService iTaHouseSettingService;
+
 
     /**
      * 分页查询列表
     @RequestMapping(value="/ma/taHouseOrder/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taHouseOrderGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaHouseOrderService.getById(id));
+        TaHouseOrder taHouseOrder = iTaHouseOrderService.getById(id);
+        if (null == taHouseOrder || StatusConstant.DELETE.equals(taHouseOrder.getStatus())) {
+            return ResponseBean.error("房源设置或订单不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaHouseSetting taHouseSetting = iTaHouseSettingService.getById(taHouseOrder.getSettingId());
+        taHouseOrder.setHouseSetting(taHouseSetting);
+
+        return ResponseBean.success(taHouseOrder);
     }
 }

src/main/java/com/shigongli/entity/TaHouseOrder.java

 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    private TaHouseSetting houseSetting;
 }