houweiyu пре 4 година
родитељ
комит
09a4e20707

+ 19 - 0
src/main/java/fcb/project/manager/base/entity/TmEstate.java

@@ -1,5 +1,6 @@
 package fcb.project.manager.base.entity;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -60,5 +61,23 @@ public class TmEstate implements Serializable {
     @TableField(value = "isDelete" , fill = FieldFill.INSERT)
     private Integer isDelete;
 
+    @ApiModelProperty(value = "房车宝楼盘ID")
+    private String fcbEstateId;
+
+    @ApiModelProperty(value = "交房时间")
+    private LocalDateTime earliestHandOver;
+
+    @ApiModelProperty(value = "最新开盘时间")
+    private LocalDateTime onSaleTime;
+
+    @ApiModelProperty(value = "楼盘经度")
+    private BigDecimal estateLongitude;
+
+    @ApiModelProperty(value = "楼盘纬度")
+    private BigDecimal estateLatitude;
+
+    @ApiModelProperty(value = "楼盘简介")
+    private String estateDesc;
+
 
 }

+ 34 - 13
src/main/java/fcb/project/manager/base/entity/TmFcbHouseInfo.java

@@ -22,6 +22,11 @@ public class TmFcbHouseInfo  implements Serializable {
     private static final long serialVersionUID=1L;
 
 
+    //房源信息
+
+    @ApiModelProperty(value = "房源ID")
+    private String fcbHouseId;
+
     @ApiModelProperty(value = "房源户型图链接")
     private String houseTypeImages;
 
@@ -34,13 +39,21 @@ public class TmFcbHouseInfo  implements Serializable {
     @ApiModelProperty(value = "房源标题")
     private String houseTitle;
 
+    @ApiModelProperty(value = "户型品鉴")
+    private String houseTypeShow;
+
+
+    //楼盘信息
+
+    @ApiModelProperty(value = "所属楼盘ID")
+    private String fcbEstateId;
+
     @ApiModelProperty(value = "交房时间")
-    private String earlistHandOver;
+    private String earliestHandOver;
 
     @ApiModelProperty(value = "最新开盘日期")
     private String onSaleTime;
 
-
     @ApiModelProperty(value = "楼盘照片集链接")
     private String estateImages;
 
@@ -50,6 +63,24 @@ public class TmFcbHouseInfo  implements Serializable {
     @ApiModelProperty(value = "楼盘纬度")
     private String estateLatitude;
 
+    @ApiModelProperty(value = "楼盘简介")
+    private String estateDesc;
+
+    @ApiModelProperty(value = "园林景观")
+    private String estatePanorama;
+
+
+    @ApiModelProperty(value = "楼盘全景")
+    private String landscape;
+
+
+    @ApiModelProperty(value = "场景码")
+    private String sceneNum;
+
+
+
+    //变动的信息: 经纪人、用户
+
     @ApiModelProperty(value = "经纪人唯一ID")
     private String agencyId;
 
@@ -57,7 +88,7 @@ public class TmFcbHouseInfo  implements Serializable {
     private String agencyName;
 
     @ApiModelProperty(value = "手机号码")
-    private String agnencyPhone;
+    private String agencyPhone;
 
     @ApiModelProperty(value = "头像照片地址")
     private String agencyAvatar;
@@ -69,16 +100,6 @@ public class TmFcbHouseInfo  implements Serializable {
     private String userName;
 
 
-    @ApiModelProperty(value = "楼盘简介")
-    private String estateDesc;
-
-    @ApiModelProperty(value = "场景码")
-    private String sceneNum;
 
-    @ApiModelProperty(value = "房源ID")
-    private String houseId;
-
-    @ApiModelProperty(value = "所属楼盘ID")
-    private String estateId;
 
 }

+ 17 - 1
src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -96,8 +96,24 @@ public class TmHouse implements Serializable {
     private String sceneNum;
 
     @ApiModelProperty(value = "房源ID")
-    private String houseId;
+    private String fcbHouseId;
 
 
+    @ApiModelProperty(value = "房源户型图链接")
+    private String houseTpeImages;
+
+
+    @ApiModelProperty(value = "建筑面积")
+    private String houseArea;
+
+    @ApiModelProperty(value = "朝向")
+    private String houseOrientation;
+
+
+    @ApiModelProperty(value = "园林景观")
+    private String estatePanorama;
+
+    @ApiModelProperty(value = "楼盘全景")
+    private String landscape;
 
 }

+ 1 - 1
src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -109,7 +109,7 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getSceneNum , sceneNum);
         lambdaQueryWrapper.eq(TmHouse::getEstateId  , projectId);
-        lambdaQueryWrapper.eq(TmHouse::getHouseId , houseId);
+        lambdaQueryWrapper.eq(TmHouse::getFcbHouseId , houseId);
         return getBaseMapper().selectOne(lambdaQueryWrapper);
     }