Browse Source

新需求

傅行帆 5 years ago
parent
commit
f315a0fd39

+ 142
- 0
src/main/java/com/huiju/estateagents/controller/TaMiniappIconController.java View File

@@ -0,0 +1,142 @@
1
+package com.huiju.estateagents.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.entity.TaMiniappIcon;
10
+import com.huiju.estateagents.service.ITaMiniappIconService;
11
+import org.slf4j.Logger;
12
+import org.slf4j.LoggerFactory;
13
+import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.web.bind.annotation.*;
15
+
16
+import java.util.List;
17
+
18
+/**
19
+ * <p>
20
+    * 小程序图标表  前端控制器
21
+    * </p>
22
+ *
23
+ * @author jobob
24
+ * @since 2020-02-03
25
+ */
26
+@RestController
27
+@RequestMapping("/api")
28
+public class TaMiniappIconController extends BaseController {
29
+
30
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappIconController.class);
31
+
32
+    @Autowired
33
+    public ITaMiniappIconService iTaMiniappIconService;
34
+
35
+
36
+    /**
37
+     * 查询列表
38
+     * @return
39
+     */
40
+    @RequestMapping(value="/admin/taMiniappIcon",method= RequestMethod.GET)
41
+    public ResponseBean taMiniappIconList(){
42
+        ResponseBean responseBean = new ResponseBean();
43
+        try {
44
+            QueryWrapper<TaMiniappIcon> queryWrapper = new QueryWrapper<>();
45
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
46
+            queryWrapper.orderByDesc("create_date");
47
+
48
+            List<TaMiniappIcon> list = iTaMiniappIconService.list(queryWrapper);
49
+            responseBean.addSuccess(list);
50
+        }catch (Exception e){
51
+            e.printStackTrace();
52
+            logger.error("taMiniappIconList -=- {}",e.toString());
53
+            responseBean.addError(e.getMessage());
54
+        }
55
+        return responseBean;
56
+    }
57
+
58
+    /**
59
+     * 保存对象
60
+     * @param taMiniappIcon 实体对象
61
+     * @return
62
+     */
63
+    @RequestMapping(value="/taMiniappIcon",method= RequestMethod.POST)
64
+    public ResponseBean taMiniappIconAdd(@RequestBody TaMiniappIcon taMiniappIcon){
65
+        ResponseBean responseBean = new ResponseBean();
66
+        try {
67
+            if (iTaMiniappIconService.save(taMiniappIcon)){
68
+                responseBean.addSuccess(taMiniappIcon);
69
+            }else {
70
+                responseBean.addError("fail");
71
+            }
72
+        }catch (Exception e){
73
+            e.printStackTrace();
74
+            logger.error("taMiniappIconAdd -=- {}",e.toString());
75
+            responseBean.addError(e.getMessage());
76
+        }
77
+        return responseBean;
78
+    }
79
+
80
+    /**
81
+     * 根据id删除对象
82
+     * @param id  实体ID
83
+     */
84
+    @ResponseBody
85
+    @RequestMapping(value="/taMiniappIcon/{id}", method= RequestMethod.DELETE)
86
+    public ResponseBean taMiniappIconDelete(@PathVariable Integer id){
87
+        ResponseBean responseBean = new ResponseBean();
88
+        try {
89
+            if(iTaMiniappIconService.removeById(id)){
90
+                responseBean.addSuccess("success");
91
+            }else {
92
+                responseBean.addError("fail");
93
+            }
94
+        }catch (Exception e){
95
+            e.printStackTrace();
96
+            logger.error("taMiniappIconDelete -=- {}",e.toString());
97
+            responseBean.addError(e.getMessage());
98
+        }
99
+        return responseBean;
100
+    }
101
+
102
+    /**
103
+     * 修改对象
104
+     * @param id  实体ID
105
+     * @param taMiniappIcon 实体对象
106
+     * @return
107
+     */
108
+    @RequestMapping(value="/taMiniappIcon/{id}",method= RequestMethod.PUT)
109
+    public ResponseBean taMiniappIconUpdate(@PathVariable Integer id,
110
+                                        @RequestBody TaMiniappIcon taMiniappIcon){
111
+        ResponseBean responseBean = new ResponseBean();
112
+        try {
113
+            if (iTaMiniappIconService.updateById(taMiniappIcon)){
114
+                responseBean.addSuccess(taMiniappIcon);
115
+            }else {
116
+                responseBean.addError("fail");
117
+            }
118
+        }catch (Exception e){
119
+            e.printStackTrace();
120
+            logger.error("taMiniappIconUpdate -=- {}",e.toString());
121
+            responseBean.addError(e.getMessage());
122
+        }
123
+        return responseBean;
124
+    }
125
+
126
+    /**
127
+     * 根据id查询对象
128
+     * @param id  实体ID
129
+     */
130
+    @RequestMapping(value="/taMiniappIcon/{id}",method= RequestMethod.GET)
131
+    public ResponseBean taMiniappIconGet(@PathVariable Integer id){
132
+        ResponseBean responseBean = new ResponseBean();
133
+        try {
134
+            responseBean.addSuccess(iTaMiniappIconService.getById(id));
135
+        }catch (Exception e){
136
+            e.printStackTrace();
137
+            logger.error("taMiniappIconDelete -=- {}",e.toString());
138
+            responseBean.addError(e.getMessage());
139
+        }
140
+        return responseBean;
141
+    }
142
+}

+ 143
- 0
src/main/java/com/huiju/estateagents/controller/TaMiniappOrgIconController.java View File

@@ -0,0 +1,143 @@
1
+package com.huiju.estateagents.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
9
+import com.huiju.estateagents.service.ITaMiniappOrgIconService;
10
+import org.slf4j.Logger;
11
+import org.slf4j.LoggerFactory;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.web.bind.annotation.*;
14
+
15
+import javax.servlet.http.HttpServletRequest;
16
+import java.util.List;
17
+
18
+/**
19
+ * <p>
20
+    * 小程序导航表  前端控制器
21
+    * </p>
22
+ *
23
+ * @author jobob
24
+ * @since 2020-02-03
25
+ */
26
+@RestController
27
+@RequestMapping("/api")
28
+public class TaMiniappOrgIconController extends BaseController {
29
+
30
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappOrgIconController.class);
31
+
32
+    @Autowired
33
+    public ITaMiniappOrgIconService iTaMiniappOrgIconService;
34
+
35
+
36
+    /**
37
+     * 查询列表
38
+     * @return
39
+     */
40
+    @RequestMapping(value="/wx/taMiniappOrgIcon",method= RequestMethod.GET)
41
+    public ResponseBean taMiniappOrgIconList(HttpServletRequest request){
42
+        ResponseBean responseBean = new ResponseBean();
43
+        try {
44
+            QueryWrapper<TaMiniappOrgIcon> queryWrapper = new QueryWrapper<>();
45
+            queryWrapper.eq("org_id",getOpenId(request));
46
+            queryWrapper.orderByDesc("sort");
47
+            queryWrapper.orderByDesc("create_date");
48
+
49
+            List<TaMiniappOrgIcon> list = iTaMiniappOrgIconService.list(queryWrapper);
50
+            responseBean.addSuccess(list);
51
+        }catch (Exception e){
52
+            e.printStackTrace();
53
+            logger.error("taMiniappOrgIconList -=- {}",e.toString());
54
+            responseBean.addError(e.getMessage());
55
+        }
56
+        return responseBean;
57
+    }
58
+
59
+    /**
60
+     * 保存对象
61
+     * @param taMiniappOrgIcon 实体对象
62
+     * @return
63
+     */
64
+    @RequestMapping(value="/taMiniappOrgIcon",method= RequestMethod.POST)
65
+    public ResponseBean taMiniappOrgIconAdd(@RequestBody TaMiniappOrgIcon taMiniappOrgIcon){
66
+        ResponseBean responseBean = new ResponseBean();
67
+        try {
68
+            if (iTaMiniappOrgIconService.save(taMiniappOrgIcon)){
69
+                responseBean.addSuccess(taMiniappOrgIcon);
70
+            }else {
71
+                responseBean.addError("fail");
72
+            }
73
+        }catch (Exception e){
74
+            e.printStackTrace();
75
+            logger.error("taMiniappOrgIconAdd -=- {}",e.toString());
76
+            responseBean.addError(e.getMessage());
77
+        }
78
+        return responseBean;
79
+    }
80
+
81
+    /**
82
+     * 根据id删除对象
83
+     * @param id  实体ID
84
+     */
85
+    @ResponseBody
86
+    @RequestMapping(value="/taMiniappOrgIcon/{id}", method= RequestMethod.DELETE)
87
+    public ResponseBean taMiniappOrgIconDelete(@PathVariable Integer id){
88
+        ResponseBean responseBean = new ResponseBean();
89
+        try {
90
+            if(iTaMiniappOrgIconService.removeById(id)){
91
+                responseBean.addSuccess("success");
92
+            }else {
93
+                responseBean.addError("fail");
94
+            }
95
+        }catch (Exception e){
96
+            e.printStackTrace();
97
+            logger.error("taMiniappOrgIconDelete -=- {}",e.toString());
98
+            responseBean.addError(e.getMessage());
99
+        }
100
+        return responseBean;
101
+    }
102
+
103
+    /**
104
+     * 修改对象
105
+     * @param id  实体ID
106
+     * @param taMiniappOrgIcon 实体对象
107
+     * @return
108
+     */
109
+    @RequestMapping(value="/taMiniappOrgIcon/{id}",method= RequestMethod.PUT)
110
+    public ResponseBean taMiniappOrgIconUpdate(@PathVariable Integer id,
111
+                                        @RequestBody TaMiniappOrgIcon taMiniappOrgIcon){
112
+        ResponseBean responseBean = new ResponseBean();
113
+        try {
114
+            if (iTaMiniappOrgIconService.updateById(taMiniappOrgIcon)){
115
+                responseBean.addSuccess(taMiniappOrgIcon);
116
+            }else {
117
+                responseBean.addError("fail");
118
+            }
119
+        }catch (Exception e){
120
+            e.printStackTrace();
121
+            logger.error("taMiniappOrgIconUpdate -=- {}",e.toString());
122
+            responseBean.addError(e.getMessage());
123
+        }
124
+        return responseBean;
125
+    }
126
+
127
+    /**
128
+     * 根据id查询对象
129
+     * @param id  实体ID
130
+     */
131
+    @RequestMapping(value="/taMiniappOrgIcon/{id}",method= RequestMethod.GET)
132
+    public ResponseBean taMiniappOrgIconGet(@PathVariable Integer id){
133
+        ResponseBean responseBean = new ResponseBean();
134
+        try {
135
+            responseBean.addSuccess(iTaMiniappOrgIconService.getById(id));
136
+        }catch (Exception e){
137
+            e.printStackTrace();
138
+            logger.error("taMiniappOrgIconDelete -=- {}",e.toString());
139
+            responseBean.addError(e.getMessage());
140
+        }
141
+        return responseBean;
142
+    }
143
+}

+ 0
- 26
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java View File

@@ -375,32 +375,6 @@ public class TaPersonVisitRecordController extends BaseController {
375 375
                     e.setNewsNum(shareNum);
376 376
                     break;
377 377
                 case CommConstant.FAVOR_PROJECT:
378
-                    //获取项目类型里的价格
379
-                    QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
380
-                    projectTypeQueryWrapper.eq("building_id",e.getTargetId());
381
-                    projectTypeQueryWrapper.eq("building_type_id",e.getBuildingTypeId());
382
-                    TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
383
-                    //价格相同显示一个否则显示区间
384
-                    if (null != taBuildingProjectType){
385
-                        Integer startPrice = taBuildingProjectType.getStartPrice();
386
-                        Integer endPrice = taBuildingProjectType.getEndPrice();
387
-                        if (null != startPrice && null == endPrice){
388
-                            e.setPrice(String.valueOf(startPrice));
389
-                        }else if (null == startPrice && null != endPrice){
390
-                            e.setPrice(String.valueOf(endPrice));
391
-                        }else if(null != startPrice && null != endPrice){
392
-                            if (startPrice.equals(endPrice)){
393
-                                e.setPrice(String.valueOf(startPrice));
394
-                            }else{
395
-                                e.setPrice(startPrice + "--" + endPrice);
396
-                            }
397
-                        }else{
398
-                            e.setPrice(null);
399
-                        }
400
-                        e.setPriceType(taBuildingProjectType.getPriceType());
401
-                    } else {
402
-                        e.setPrice(null);
403
-                    }
404 378
                     e.setBuildingNum(shareNum);
405 379
                     break;
406 380
                 case CommConstant.EVENT_H5:

+ 15
- 0
src/main/java/com/huiju/estateagents/entity/TaBuilding.java View File

@@ -324,4 +324,19 @@ public class TaBuilding implements Serializable {
324 324
      * 项目亮点
325 325
      */
326 326
     private String highlights;
327
+
328
+    /**
329
+     * 项目公众号链接
330
+     */
331
+    private String highlightsLink;
332
+
333
+    /**
334
+     * 项目亮点类型
335
+     */
336
+    private String highlightsType;
337
+
338
+    /**
339
+     * 项目亮点封面
340
+     */
341
+    private String highlightsCover;
327 342
 }

+ 51
- 0
src/main/java/com/huiju/estateagents/entity/TaMiniappIcon.java View File

@@ -0,0 +1,51 @@
1
+package com.huiju.estateagents.entity;
2
+
3
+import lombok.Data;
4
+import lombok.EqualsAndHashCode;
5
+import lombok.experimental.Accessors;
6
+
7
+import java.io.Serializable;
8
+import java.time.LocalDateTime;
9
+
10
+/**
11
+ * <p>
12
+ * 小程序图标表 
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2020-02-03
17
+ */
18
+@Data
19
+@EqualsAndHashCode(callSuper = false)
20
+@Accessors(chain = true)
21
+public class TaMiniappIcon implements Serializable {
22
+
23
+    private static final long serialVersionUID = 1L;
24
+
25
+    /**
26
+     * 图标编码
27
+     */
28
+    private String iconCode;
29
+
30
+    /**
31
+     * 图标名称
32
+     */
33
+    private String iconName;
34
+
35
+    /**
36
+     * 图标地址
37
+     */
38
+    private String iconUrl;
39
+
40
+    /**
41
+     * 状态
42
+     */
43
+    private Integer status;
44
+
45
+    /**
46
+     * 创建时间
47
+     */
48
+    private LocalDateTime createDate;
49
+
50
+
51
+}

+ 74
- 0
src/main/java/com/huiju/estateagents/entity/TaMiniappOrgIcon.java View File

@@ -0,0 +1,74 @@
1
+package com.huiju.estateagents.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import lombok.Data;
6
+import lombok.EqualsAndHashCode;
7
+import lombok.experimental.Accessors;
8
+
9
+import java.io.Serializable;
10
+import java.time.LocalDateTime;
11
+
12
+/**
13
+ * <p>
14
+ * 小程序导航表 
15
+ * </p>
16
+ *
17
+ * @author jobob
18
+ * @since 2020-02-03
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+public class TaMiniappOrgIcon implements Serializable {
24
+
25
+    private static final long serialVersionUID = 1L;
26
+
27
+    /**
28
+     * 小程序导航ID
29
+     */
30
+    @TableId(value = "org_icon_id", type = IdType.AUTO)
31
+    private Integer orgIconId;
32
+
33
+    /**
34
+     * 公司id
35
+     */
36
+    private Integer orgId;
37
+
38
+    /**
39
+     * 图标名称
40
+     */
41
+    private String iconName;
42
+
43
+    /**
44
+     * 图标编码
45
+     */
46
+    private String iconCode;
47
+
48
+    /**
49
+     * 导航地址
50
+     */
51
+    private String iconUrl;
52
+
53
+    /**
54
+     * 状态
55
+     */
56
+    private Integer status;
57
+
58
+    /**
59
+     * 排序
60
+     */
61
+    private Integer sort;
62
+
63
+    /**
64
+     * 创建时间
65
+     */
66
+    private LocalDateTime createDate;
67
+
68
+    /**
69
+     * 更新时间
70
+     */
71
+    private LocalDateTime updateDate;
72
+
73
+
74
+}

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TaMiniappIconMapper.java View File

@@ -0,0 +1,18 @@
1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.huiju.estateagents.entity.TaMiniappIcon;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ * 小程序图标表  Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2020-02-03
14
+ */
15
+@Mapper
16
+public interface TaMiniappIconMapper extends BaseMapper<TaMiniappIcon> {
17
+
18
+}

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TaMiniappOrgIconMapper.java View File

@@ -0,0 +1,18 @@
1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ * 小程序导航表  Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2020-02-03
14
+ */
15
+@Mapper
16
+public interface TaMiniappOrgIconMapper extends BaseMapper<TaMiniappOrgIcon> {
17
+
18
+}

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaMiniappIconService.java View File

@@ -0,0 +1,16 @@
1
+package com.huiju.estateagents.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.entity.TaMiniappIcon;
5
+
6
+/**
7
+ * <p>
8
+ * 小程序图标表  服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2020-02-03
13
+ */
14
+public interface ITaMiniappIconService extends IService<TaMiniappIcon> {
15
+
16
+}

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaMiniappOrgIconService.java View File

@@ -0,0 +1,16 @@
1
+package com.huiju.estateagents.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
5
+
6
+/**
7
+ * <p>
8
+ * 小程序导航表  服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2020-02-03
13
+ */
14
+public interface ITaMiniappOrgIconService extends IService<TaMiniappOrgIcon> {
15
+
16
+}

+ 0
- 111
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java View File

@@ -132,33 +132,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
132 132
 
133 133
                 List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(queryListWrapper);
134 134
                 taBuilding.setBuildingListImg(buildingListImg);
135
-
136
-                //获取项目类型里的价格
137
-                QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
138
-                projectTypeQueryWrapper.eq("building_id",taBuilding.getBuildingId());
139
-                projectTypeQueryWrapper.eq("building_type_id",taBuilding.getBuildingTypeId());
140
-                TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
141
-                //价格相同显示一个否则显示区间
142
-                if (null != taBuildingProjectType){
143
-                    Integer startPrice = taBuildingProjectType.getStartPrice();
144
-                    Integer endPrice = taBuildingProjectType.getEndPrice();
145
-                    if (null != startPrice && null == endPrice){
146
-                        taBuilding.setPrice(String.valueOf(startPrice));
147
-                    }else if (null == startPrice && null != endPrice){
148
-                        taBuilding.setPrice(String.valueOf(endPrice));
149
-                    }else if(null != startPrice && null != endPrice){
150
-                       if (startPrice.equals(endPrice)){
151
-                           taBuilding.setPrice(String.valueOf(startPrice));
152
-                       }else{
153
-                           taBuilding.setPrice(startPrice + "--" + endPrice);
154
-                       }
155
-                    }else{
156
-                        taBuilding.setPrice(null);
157
-                    }
158
-                    taBuilding.setPriceType(taBuildingProjectType.getPriceType());
159
-                } else {
160
-                    taBuilding.setPrice(null);
161
-                }
162 135
             }
163 136
         }
164 137
 
@@ -293,36 +266,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
293 266
         projectTypeQueryWrapper.eq("status", 1);
294 267
         List<TaBuildingProjectType> buildingProjectTypes = taBuildingProjectTypeMapper.selectList(projectTypeQueryWrapper);
295 268
         building.setBuildingProjectType(buildingProjectTypes);
296
-        building.setPrice(null);
297
-        buildingProjectTypes.forEach(e -> {
298
-            //兼容老小程序展示均价取其一
299
-            if (null == e.getPrice() && e.getPriceType().equals(CommConstant.PRICE_TYPE_AVERAGE)){
300
-                if (null != e.getStartPrice()){
301
-                    e.setPrice(e.getStartPrice());
302
-                }else if (null != e.getEndPrice()){
303
-                    e.setPrice(e.getEndPrice());
304
-                }
305
-            }
306
-            if (e.getBuildingTypeId().equals(building.getBuildingTypeId())){
307
-                //价格相同显示一个否则显示区间
308
-                Integer startPrice = e.getStartPrice();
309
-                Integer endPrice = e.getEndPrice();
310
-                if (null != startPrice && null == endPrice){
311
-                    building.setPrice(String.valueOf(startPrice));
312
-                }else if (null == startPrice && null != endPrice){
313
-                    building.setPrice(String.valueOf(endPrice));
314
-                }else if(null != startPrice && null != endPrice){
315
-                    if (startPrice.equals(endPrice)){
316
-                        building.setPrice(String.valueOf(startPrice));
317
-                    }else{
318
-                        building.setPrice(startPrice + "--" + endPrice);
319
-                    }
320
-                }else{
321
-                    building.setPrice(null);
322
-                }
323
-                building.setPriceType(e.getPriceType());
324
-            }
325
-        });
326 269
 
327 270
         // 海报和分享
328 271
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
@@ -790,33 +733,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
790 733
                         build.getBuildingImg().add(0, buildingListImg.get(0));
791 734
                     }
792 735
                 }
793
-
794
-                //获取项目类型里的价格
795
-                QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
796
-                projectTypeQueryWrapper.eq("building_id",build.getBuildingId());
797
-                projectTypeQueryWrapper.eq("building_type_id",build.getBuildingTypeId());
798
-                TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
799
-                //价格相同显示一个否则显示区间
800
-                if (null != taBuildingProjectType){
801
-                    Integer startPrice = taBuildingProjectType.getStartPrice();
802
-                    Integer endPrice = taBuildingProjectType.getEndPrice();
803
-                    if (null != startPrice && null == endPrice){
804
-                        build.setPrice(String.valueOf(startPrice));
805
-                    }else if (null == startPrice && null != endPrice){
806
-                        build.setPrice(String.valueOf(endPrice));
807
-                    }else if(null != startPrice && null != endPrice){
808
-                        if (startPrice.equals(endPrice)){
809
-                            build.setPrice(String.valueOf(startPrice));
810
-                        }else{
811
-                            build.setPrice(startPrice + "--" + endPrice);
812
-                        }
813
-                    }else{
814
-                        build.setPrice(null);
815
-                    }
816
-                    build.setPriceType(taBuildingProjectType.getPriceType());
817
-                } else {
818
-                    build.setPrice(null);
819
-                }
820 736
             }
821 737
         }
822 738
 
@@ -909,33 +825,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
909 825
             IPage<TaShare> pageSN = new Page<>(1, 10);
910 826
             pageSN.setTotal(null == building.getShareNum() ? 0l : building.getShareNum());
911 827
             building.setShareList(pageSN);
912
-
913
-            //获取项目类型里的价格
914
-            QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
915
-            projectTypeQueryWrapper.eq("building_id",building.getBuildingId());
916
-            projectTypeQueryWrapper.eq("building_type_id",building.getBuildingTypeId());
917
-            TaBuildingProjectType taBuildingProjectType = taBuildingProjectTypeMapper.selectOne(projectTypeQueryWrapper);
918
-            //价格相同显示一个否则显示区间
919
-            if (null != taBuildingProjectType){
920
-                Integer startPrice = taBuildingProjectType.getStartPrice();
921
-                Integer endPrice = taBuildingProjectType.getEndPrice();
922
-                if (null != startPrice && null == endPrice){
923
-                    building.setPrice(String.valueOf(startPrice));
924
-                }else if (null == startPrice && null != endPrice){
925
-                    building.setPrice(String.valueOf(endPrice));
926
-                }else if(null != startPrice && null != endPrice){
927
-                    if (startPrice.equals(endPrice)){
928
-                        building.setPrice(String.valueOf(startPrice));
929
-                    }else{
930
-                        building.setPrice(startPrice + "--" + endPrice);
931
-                    }
932
-                }else{
933
-                    building.setPrice(null);
934
-                }
935
-                building.setPriceType(taBuildingProjectType.getPriceType());
936
-            } else {
937
-                building.setPrice(null);
938
-            }
939 828
         }
940 829
 
941 830
         IPage<TaBuilding> page = new Page<>(1, 10);

+ 20
- 0
src/main/java/com/huiju/estateagents/service/impl/TaMiniappIconServiceImpl.java View File

@@ -0,0 +1,20 @@
1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.huiju.estateagents.entity.TaMiniappIcon;
5
+import com.huiju.estateagents.mapper.TaMiniappIconMapper;
6
+import com.huiju.estateagents.service.ITaMiniappIconService;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * 小程序图标表  服务实现类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2020-02-03
16
+ */
17
+@Service
18
+public class TaMiniappIconServiceImpl extends ServiceImpl<TaMiniappIconMapper, TaMiniappIcon> implements ITaMiniappIconService {
19
+
20
+}

+ 20
- 0
src/main/java/com/huiju/estateagents/service/impl/TaMiniappOrgIconServiceImpl.java View File

@@ -0,0 +1,20 @@
1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
5
+import com.huiju.estateagents.mapper.TaMiniappOrgIconMapper;
6
+import com.huiju.estateagents.service.ITaMiniappOrgIconService;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * 小程序导航表  服务实现类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2020-02-03
16
+ */
17
+@Service
18
+public class TaMiniappOrgIconServiceImpl extends ServiceImpl<TaMiniappOrgIconMapper, TaMiniappOrgIcon> implements ITaMiniappOrgIconService {
19
+
20
+}

+ 5
- 0
src/main/resources/mapper/TaMiniappIconMapper.xml View File

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.mapper.TaMiniappIconMapper">
4
+
5
+</mapper>

+ 5
- 0
src/main/resources/mapper/TaMiniappOrgIconMapper.xml View File

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.mapper.TaMiniappOrgIconMapper">
4
+
5
+</mapper>