bug

src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java

@@ -67,6 +67,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	@Autowired
 	private TaPersonMapper taPersonMapper;
 
+	@Autowired
 	private TaDrainageMapper taDrainageMapper;
 
 	/**

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -11,6 +11,8 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
@@ -67,6 +69,21 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaPersonBuildingMapper taPersonBuildingMapper;
 
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
+
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -509,8 +526,49 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
+            records.forEach(e -> {
+                //获取活动标题
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
+                    if (null != taBuildingDynamic){
+                        e.setActivityName(taBuildingDynamic.getTitle());
+                    }
+
+                }
+                //获取拼团标题
+                if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
+                    if (null != taShareActivity){
+                        e.setActivityName(taShareActivity.getActivityName());
+                    }
+                }
+                //获取助力标题
+                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+                    HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
+                    if (null != helpActivity){
+                        e.setActivityName(helpActivity.getTitle());
+                    }
+                }
+                //获取咨询标题
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaNews taNews = taNewsMapper.selectById(e.getTargetId());
+                    if (null != taNews){
+                        e.setActivityName(taNews.getNewsName());
+                    }
+                }
+                //获取H5活动标题
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
+                    if (null != taDrainage){
+                        e.setActivityName(taDrainage.getName());
+                    }
+                }
+            });
+            taPersonVisitRecordIPage.setRecords(records);
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
@@ -547,8 +605,49 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
+            records.forEach(e -> {
+                //获取活动标题
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
+                    if (null != taBuildingDynamic){
+                        e.setActivityName(taBuildingDynamic.getTitle());
+                    }
+
+                }
+                //获取拼团标题
+                if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
+                    if (null != taShareActivity){
+                        e.setActivityName(taShareActivity.getActivityName());
+                    }
+                }
+                //获取助力标题
+                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+                    HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
+                    if (null != helpActivity){
+                        e.setActivityName(helpActivity.getTitle());
+                    }
+                }
+                //获取咨询标题
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaNews taNews = taNewsMapper.selectById(e.getTargetId());
+                    if (null != taNews){
+                        e.setActivityName(taNews.getNewsName());
+                    }
+                }
+                //获取H5活动标题
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                    TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
+                    if (null != taDrainage){
+                        e.setActivityName(taDrainage.getName());
+                    }
+                }
+            });
+            taPersonVisitRecordIPage.setRecords(records);
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
             taRecommendCustomer.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
             taRecommendCustomer.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));