Browse Source

Merge branch 'v3.5.1' into dev

魏超 5 years ago
parent
commit
ae9bd09b78

+ 1
- 1
pom.xml View File

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.huiju</groupId>
11
 	<groupId>com.huiju</groupId>
12
 	<artifactId>estateagents</artifactId>
12
 	<artifactId>estateagents</artifactId>
13
-	<version>v3.5.1</version>
13
+	<version>v3.5.1.0</version>
14
 	<name>estateages</name>
14
 	<name>estateages</name>
15
 	<description>置业经纪人</description>
15
 	<description>置业经纪人</description>
16
 
16
 

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaNewsController.java View File

166
         taNews.setCityId(cityId);
166
         taNews.setCityId(cityId);
167
         taNews.setOrgId(getOrgId(request));
167
         taNews.setOrgId(getOrgId(request));
168
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
168
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
169
-        if ("0".equals(String.valueOf(taNews.getNewsStatus()))){
169
+        if ("1".equals(String.valueOf(taNews.getNewsStatus()))){
170
             // 设置为取消发布以后把轮播图和资讯设置为停用
170
             // 设置为取消发布以后把轮播图和资讯设置为停用
171
             iExtendContentService.updateActivity(String.valueOf(id),"news",getOrgId(request));
171
             iExtendContentService.updateActivity(String.valueOf(id),"news",getOrgId(request));
172
         }
172
         }

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

549
 
549
 
550
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
550
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
551
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
551
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
552
+        building.setInsideArea(building.getInsideArea() == null ? 0d : building.getInsideArea());
552
         taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
553
         taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
553
 
554
 
554
         JSONObject jsonobject = JSONObject.parseObject(parameter);
555
         JSONObject jsonobject = JSONObject.parseObject(parameter);

+ 8
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java View File

86
 
86
 
87
     @Autowired
87
     @Autowired
88
     private TaShareContentService taShareContentService;
88
     private TaShareContentService taShareContentService;
89
+    
90
+    @Autowired
91
+    private TaBuildingMapper taBuildingMapper;
89
 
92
 
90
 
93
 
91
     @Resource
94
     @Resource
232
         // 获取关联项目
235
         // 获取关联项目
233
         List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
236
         List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
234
         List<String> buildings = new ArrayList<>();
237
         List<String> buildings = new ArrayList<>();
238
+        TaBuilding taBuilding = new TaBuilding();
235
         if (null != buildingList && buildingList.size() > 0) {
239
         if (null != buildingList && buildingList.size() > 0) {
236
             for(TaPersonBuilding b: buildingList) {
240
             for(TaPersonBuilding b: buildingList) {
237
                 buildings.add(b.getBuildingId());
241
                 buildings.add(b.getBuildingId());
238
             }
242
             }
243
+            //获取楼盘信息
244
+            taBuilding = taBuildingMapper.selectById(buildingList.get(0).getBuildingId());
239
         }
245
         }
240
 
246
 
241
         Map<String, Object> result = new HashMap<>();
247
         Map<String, Object> result = new HashMap<>();
255
         result.put("liked", false);
261
         result.put("liked", false);
256
         result.put("unReadNum", 0);
262
         result.put("unReadNum", 0);
257
         result.put("projects", buildings);
263
         result.put("projects", buildings);
258
-        result.put("address", user.getAddress());
264
+        result.put("address", taBuilding.getAddress());
265
+        result.put("coordinate", taBuilding.getCoordinate());
259
         result.put("personTags",person.getPersonTags());
266
         result.put("personTags",person.getPersonTags());
260
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
267
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
261
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
268
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java View File

42
      * 根据经纬度获取城市详情信息
42
      * 根据经纬度获取城市详情信息
43
      *
43
      *
44
      * @param location
44
      * @param location
45
-     * @return  
45
+     * @return
46
      */
46
      */
47
     @Override
47
     @Override
48
     public TdCity getLocationCity(String location) {
48
     public TdCity getLocationCity(String location) {