bug 修复

src/main/java/com/yunzhi/marketing/service/impl/TaPersonVisitRecordServiceImpl.java

@@ -9,15 +9,11 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.drainage.entity.TaDrainage;
 import com.yunzhi.marketing.drainage.mapper.TaDrainageMapper;
-import com.yunzhi.marketing.mapper.HelpActivityMapper;
-import com.yunzhi.marketing.mapper.TaBuildingDynamicMapper;
-import com.yunzhi.marketing.mapper.TaNewsMapper;
-import com.yunzhi.marketing.mapper.TaPersonMapper;
-import com.yunzhi.marketing.mapper.TaPersonVisitRecordMapper;
-import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
-import com.yunzhi.marketing.mapper.TaShareActivityMapper;
+import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
+import com.yunzhi.marketing.xlk.entity.Video;
+import com.yunzhi.marketing.xlk.mapper.VideoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,12 +39,12 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	
 	@Autowired
 	private TaBuildingDynamicMapper taBuildingDynamicMapper;
-	
+
 	@Autowired
-	private TaShareActivityMapper taShareActivityMapper;
-	
+	private TaLiveActivityMapper taLiveActivityMapper;
+
 	@Autowired
-	private HelpActivityMapper helpActivityMapper;
+	private VideoMapper videoMapper;
 	
 	@Autowired
 	private TaNewsMapper taNewsMapper;
@@ -90,39 +86,42 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
 		List<TaPersonVisitRecord> records = result.getRecords();
 		records.forEach(e -> {
+			if (StringUtils.isEmpty(e.getTargetId())){
+				return;
+			}
 			//获取活动标题
-			if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+			if ("activity".equals(e.getEventType()) || "house".equals(e.getEventType()) || "dymic".equals(e.getEventType()) || "look".equals(e.getEventType())) {
 				TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-				if (null != taBuildingDynamic){
+				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 ("live".equals(e.getEventType()) && null != e.getTargetId()) {
+				TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(e.getTargetId());
+				if (null != taLiveActivity) {
+					e.setActivityName(taLiveActivity.getLiveActivityTitle());
 				}
 			}
 			//获取助力标题
-			if ("help".equals(e.getEventType()) && null != e.getTargetId()){
-				HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-				if (null != helpActivity){
-					e.setActivityName(helpActivity.getTitle());
+			if ("video".equals(e.getEventType()) && null != e.getTargetId()) {
+				Video video = videoMapper.selectById(e.getTargetId());
+				if (null != video) {
+					e.setActivityName(video.getName());
 				}
 			}
 			//获取咨询标题
-			if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+			if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
 				TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-				if (null != taNews){
+				if (null != taNews) {
 					e.setActivityName(taNews.getNewsName());
 				}
 			}
 			//获取H5活动标题
-			if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+			if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
 				TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-				if (null != taDrainage){
+				if (null != taDrainage) {
 					e.setActivityName(taDrainage.getName());
 				}
 			}

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -91,10 +91,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
     @Autowired
-    private TaShareActivityMapper taShareActivityMapper;
+    private TaLiveActivityMapper taLiveActivityMapper;
 
     @Autowired
-    private HelpActivityMapper helpActivityMapper;
+    private VideoMapper videoMapper;
 
     @Autowired
     private TaNewsMapper taNewsMapper;
@@ -1242,8 +1242,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page, personId, taPersonBuildingList, buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
+                if (StringUtils.isEmpty(e.getTargetId())){
+                    return;
+                }
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
+                if ("activity".equals(e.getEventType()) || "house".equals(e.getEventType()) || "dymic".equals(e.getEventType()) || "look".equals(e.getEventType())) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
                     if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
@@ -1251,17 +1254,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
                 }
                 //获取拼团标题
-                if ("group".equals(e.getEventType()) && null != e.getTargetId()) {
-                    TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-                    if (null != taShareActivity) {
-                        e.setActivityName(taShareActivity.getActivityName());
+                if ("live".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(e.getTargetId());
+                    if (null != taLiveActivity) {
+                        e.setActivityName(taLiveActivity.getLiveActivityTitle());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()) {
-                    HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity) {
-                        e.setActivityName(helpActivity.getTitle());
+                if ("video".equals(e.getEventType()) && null != e.getTargetId()) {
+                    Video video = videoMapper.selectById(e.getTargetId());
+                    if (null != video) {
+                        e.setActivityName(video.getName());
                     }
                 }
                 //获取咨询标题
@@ -1338,8 +1341,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page, personId, taPersonBuildingList, buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
+                if (StringUtils.isEmpty(e.getTargetId())){
+                   return;
+                }
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
+                if ("activity".equals(e.getEventType()) || "house".equals(e.getEventType()) || "dymic".equals(e.getEventType()) || "look".equals(e.getEventType())) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
                     if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
@@ -1347,17 +1353,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
                 }
                 //获取拼团标题
-                if ("group".equals(e.getEventType()) && null != e.getTargetId()) {
-                    TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-                    if (null != taShareActivity) {
-                        e.setActivityName(taShareActivity.getActivityName());
+                if ("live".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(e.getTargetId());
+                    if (null != taLiveActivity) {
+                        e.setActivityName(taLiveActivity.getLiveActivityTitle());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()) {
-                    HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity) {
-                        e.setActivityName(helpActivity.getTitle());
+                if ("video".equals(e.getEventType()) && null != e.getTargetId()) {
+                    Video video = videoMapper.selectById(e.getTargetId());
+                    if (null != video) {
+                        e.setActivityName(video.getName());
                     }
                 }
                 //获取咨询标题

src/main/java/com/yunzhi/marketing/xlk/service/impl/CustomerInfoServiceImpl.java

@@ -11,7 +11,9 @@ import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import com.yunzhi.marketing.xlk.entity.Video;
 import com.yunzhi.marketing.xlk.mapper.CustomerInfoMapper;
+import com.yunzhi.marketing.xlk.mapper.VideoMapper;
 import com.yunzhi.marketing.xlk.service.ICustomerInfoService;
 import com.yunzhi.marketing.xlk.vo.CustomerInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,10 +51,10 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
     @Autowired
-    private TaShareActivityMapper taShareActivityMapper;
+    private TaLiveActivityMapper taLiveActivityMapper;
 
     @Autowired
-    private HelpActivityMapper helpActivityMapper;
+    private VideoMapper videoMapper;
 
     @Autowired
     private TaNewsMapper taNewsMapper;
@@ -79,39 +81,42 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
         if (!StringUtils.isEmpty(personId)) {
             List<TaPersonVisitRecord> records = taPersonVisitRecordMapper.visitRecordByPersonIdNew(personId);
             records.forEach(e -> {
+                if (StringUtils.isEmpty(e.getTargetId())){
+                    return;
+                }
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("activity".equals(e.getEventType()) || "house".equals(e.getEventType()) || "dymic".equals(e.getEventType()) || "look".equals(e.getEventType())) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-                    if (null != taBuildingDynamic){
+                    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 ("live".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(e.getTargetId());
+                    if (null != taLiveActivity) {
+                        e.setActivityName(taLiveActivity.getLiveActivityTitle());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
-                    HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity){
-                        e.setActivityName(helpActivity.getTitle());
+                if ("video".equals(e.getEventType()) && null != e.getTargetId()) {
+                    Video video = videoMapper.selectById(e.getTargetId());
+                    if (null != video) {
+                        e.setActivityName(video.getName());
                     }
                 }
                 //获取咨询标题
-                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-                    if (null != taNews){
+                    if (null != taNews) {
                         e.setActivityName(taNews.getNewsName());
                     }
                 }
                 //获取H5活动标题
-                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-                    if (null != taDrainage){
+                    if (null != taDrainage) {
                         e.setActivityName(taDrainage.getName());
                     }
                 }