|
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
7
|
7
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
8
|
8
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
9
|
9
|
import com.huiju.estateagents.base.ResponseBean;
|
|
10
|
+import com.huiju.estateagents.center.taUser.entity.TaUser;
|
|
11
|
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
|
10
|
12
|
import com.huiju.estateagents.common.CommConstant;
|
11
|
13
|
import com.huiju.estateagents.common.DateUtils;
|
12
|
14
|
import com.huiju.estateagents.common.MD5Utils;
|
|
@@ -14,10 +16,8 @@ import com.huiju.estateagents.common.StringUtils;
|
14
|
16
|
import com.huiju.estateagents.entity.*;
|
15
|
17
|
import com.huiju.estateagents.event.EventBus;
|
16
|
18
|
import com.huiju.estateagents.mapper.*;
|
17
|
|
-import com.huiju.estateagents.service.ITaPersonService;
|
|
19
|
+import com.huiju.estateagents.service.*;
|
18
|
20
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
19
|
|
-import com.huiju.estateagents.service.ITaPointsRecordsService;
|
20
|
|
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
|
21
|
21
|
import org.springframework.beans.factory.annotation.Autowired;
|
22
|
22
|
import org.springframework.context.ApplicationContext;
|
23
|
23
|
import org.springframework.stereotype.Service;
|
|
@@ -76,6 +76,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
|
76
|
76
|
@Autowired
|
77
|
77
|
private ITaPointsRecordsService pointsRecordsService;
|
78
|
78
|
|
|
79
|
+ @Autowired
|
|
80
|
+ private ITaUserService taUserService;
|
|
81
|
+
|
|
82
|
+ @Autowired
|
|
83
|
+ private TaPosterService taPosterService;
|
|
84
|
+
|
|
85
|
+ @Autowired
|
|
86
|
+ private TaShareContentService taShareContentService;
|
|
87
|
+
|
79
|
88
|
|
80
|
89
|
@Resource
|
81
|
90
|
private ApplicationContext applicationContext;
|
|
@@ -225,13 +234,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
|
225
|
234
|
buildings.add(b.getBuildingId());
|
226
|
235
|
}
|
227
|
236
|
}
|
228
|
|
-
|
|
237
|
+ TaUser user = taUserService.getById(person.getUserId());
|
229
|
238
|
Map<String, Object> result = new HashMap<>();
|
230
|
239
|
result.put("id", person.getPersonId());
|
231
|
|
- result.put("name", person.getName());
|
232
|
|
- result.put("company", person.getCompany());
|
233
|
|
- result.put("department", person.getDepartment());
|
234
|
|
- result.put("picture", person.getPhoto());
|
|
240
|
+ result.put("name", user.getUserName());
|
|
241
|
+ result.put("company", user.getOrgName());
|
|
242
|
+ result.put("department", user.getDepartment());
|
|
243
|
+ result.put("picture", user.getAvatar());
|
235
|
244
|
result.put("hotNum", person.getHotNum());
|
236
|
245
|
result.put("likeNum", person.getLikeNum());
|
237
|
246
|
result.put("pvNum", person.getPvNum());
|
|
@@ -244,6 +253,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
|
244
|
253
|
result.put("projects", buildings);
|
245
|
254
|
result.put("address", person.getAddress());
|
246
|
255
|
result.put("personTags",person.getPersonTags());
|
|
256
|
+ result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
|
|
257
|
+ result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
|
247
|
258
|
QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
|
248
|
259
|
saveQueryWrapper.eq("tagert_type", "card");
|
249
|
260
|
saveQueryWrapper.eq("person_id",personId);
|