Bläddra i källkod

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

zlisen 4 år sedan
förälder
incheckning
97a0049604

+ 15
- 1
src/main/java/com/shigongli/controller/TaHouseOrderController.java Visa fil

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.shigongli.common.BaseController;
7 7
 import com.shigongli.common.ResponseBean;
8
+import com.shigongli.constants.StatusConstant;
9
+import com.shigongli.entity.TaHouseSetting;
10
+import com.shigongli.service.ITaHouseSettingService;
8 11
 import io.swagger.annotations.Api;
9 12
 import io.swagger.annotations.ApiOperation;
10 13
 import io.swagger.annotations.ApiParam;
@@ -39,6 +42,9 @@ public class TaHouseOrderController extends BaseController {
39 42
     @Autowired
40 43
     public ITaHouseOrderService iTaHouseOrderService;
41 44
 
45
+    @Autowired
46
+    ITaHouseSettingService iTaHouseSettingService;
47
+
42 48
 
43 49
     /**
44 50
      * 分页查询列表
@@ -114,6 +120,14 @@ public class TaHouseOrderController extends BaseController {
114 120
     @RequestMapping(value="/ma/taHouseOrder/{id}",method= RequestMethod.GET)
115 121
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 122
     public ResponseBean taHouseOrderGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
117
-        return ResponseBean.success(iTaHouseOrderService.getById(id));
123
+        TaHouseOrder taHouseOrder = iTaHouseOrderService.getById(id);
124
+        if (null == taHouseOrder || StatusConstant.DELETE.equals(taHouseOrder.getStatus())) {
125
+            return ResponseBean.error("房源设置或订单不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
126
+        }
127
+
128
+        TaHouseSetting taHouseSetting = iTaHouseSettingService.getById(taHouseOrder.getSettingId());
129
+        taHouseOrder.setHouseSetting(taHouseSetting);
130
+
131
+        return ResponseBean.success(taHouseOrder);
118 132
     }
119 133
 }

+ 4
- 1
src/main/java/com/shigongli/entity/TaHouseOrder.java Visa fil

@@ -2,6 +2,8 @@ package com.shigongli.entity;
2 2
 
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import java.time.LocalDateTime;
5
+
6
+import com.baomidou.mybatisplus.annotation.TableField;
5 7
 import com.baomidou.mybatisplus.annotation.TableId;
6 8
 import java.io.Serializable;
7 9
 import io.swagger.annotations.ApiModel;
@@ -42,5 +44,6 @@ public class TaHouseOrder implements Serializable {
42 44
     @ApiModelProperty(value = "创建时间")
43 45
     private LocalDateTime createDate;
44 46
 
45
-
47
+    @TableField(exist = false)
48
+    private TaHouseSetting houseSetting;
46 49
 }