bug fix

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -92,74 +92,19 @@ public class TaPersonVisitRecordController extends BaseController {
      */
     @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.POST)
     public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
-        taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(), taPersonVisitRecord.getEventType(), taPersonVisitRecord.getActivity(), getOrgId(request));
-        if (eventProperties <= 0) {
-            TaEventProperties taEventProperty = new TaEventProperties();
-            taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
-            taEventProperty.setCreateDate(LocalDateTime.now());
-            taEventProperty.setPropertyCode(taPersonVisitRecord.getPropertyName());
-            taEventProperty.setPropertyName(taPersonVisitRecord.getPropertyName());
-            taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
-            taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
-            taEventProperty.setEventType(taPersonVisitRecord.getEventType());
-            taEventProperty.setOrgId(getOrgId(request));
-            if (!taEventPropertiesService.save(taEventProperty)) {
-                return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-
-        }
 
+        taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
+        taPersonVisitRecord.setOrgId(String.valueOf(orgId));
         taPersonVisitRecord.setPersonId(person.getPersonId());
-        taPersonVisitRecord.setVisitTime(LocalDateTime.now());
-        if (!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())) {
-            QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
-            intentionQueryWrapper.eq("building_id", taPersonVisitRecord.getBuildingId());
-            intentionQueryWrapper.eq("org_id", getOrgId(request));
-            intentionQueryWrapper.eq("event_code", taPersonVisitRecord.getEvent());
-            List<TaBuildingIntention> list = buildingIntentionService.list(intentionQueryWrapper);
-            if (list.size() > 0) {
-                TaBuildingIntention buildingIntention = list.get(0);
-                TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
-                TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
-                intentionRecord.setBuildingId(buildingIntention.getBuildingId());
-                intentionRecord.setBuildingName(building.getBuildingName());
-                intentionRecord.setCreateDate(LocalDateTime.now());
-                intentionRecord.setEventCode(buildingIntention.getEventCode());
-                intentionRecord.setEventId(buildingIntention.getEventId());
-                intentionRecord.setEventName(buildingIntention.getEventName());
-                intentionRecord.setIntention(buildingIntention.getIntention());
-                intentionRecord.setOrgId(getOrgId(request));
-                intentionRecord.setPersonId(person.getPersonId());
-                intentionRecord.setPersonName(person.getNickname());
-                intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
-                if (!personIntentionRecordService.save(intentionRecord)) {
-                    return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
-                }
-            }
-        }
-        try {
-            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)) {
-                //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
-                if (taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)) {
-                    iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
-                }
 
-                return ResponseBean.success(taPersonVisitRecord);
-            } else {
-                return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-        } catch (Exception e) {
-            logger.error("taPersonVisitRecordAdd -=- {}", e.toString());
-            return ResponseBean.error("系统异常" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
-        }
+        return iTaPersonVisitRecordService.newRecord(taPersonVisitRecord, person);
     }
 
     /**

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -248,9 +248,8 @@ public class TaRaiseController extends BaseController {
     public ResponseBean getRaiseProfile(@RequestParam(required = false) Integer salesBatchId,
                                         @RequestParam(required = false) Integer raiseId,
                                         @RequestParam(required = false) Integer raiseRecordId,
-                                        @RequestParam(required = false) String personId,
                                         HttpServletRequest request) {
-        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, raiseRecordId, salesBatchId, personId);
+        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, raiseRecordId, salesBatchId);
         return ResponseBean.success(taRaise);
     }
 

src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaConsultantInfo;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -63,4 +64,6 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId);
 
 	Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String personId, String eventType);
+
+    ResponseBean newRecord(TaPersonVisitRecord taPersonVisitRecord, TaPerson person);
 }

src/main/java/com/huiju/estateagents/service/ITaRaiseService.java

@@ -53,8 +53,7 @@ public interface ITaRaiseService extends IService<TaRaise> {
      * @param raiseId
      * @param raiseRecordId
      * @param salesBatchId
-     * @param personId
      * @return
      */
-    TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId, String personId);
+    TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.alibaba.fastjson.JSONObject;
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.controller.TaMiniFormidsController;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.*;
@@ -21,10 +23,12 @@ import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
-import com.huiju.estateagents.service.ITaPersonVisitRecordService;
+import com.huiju.estateagents.service.*;
+import com.sun.corba.se.spi.resolver.Resolver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 
@@ -66,6 +70,21 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	@Autowired
 	private TaDrainageMapper taDrainageMapper;
 
+	@Autowired
+	private ITaEventPropertiesService taEventPropertiesService;
+
+	@Autowired
+	private ITaBuildingIntentionService buildingIntentionService;
+
+	@Autowired
+	private ITaBuildingService buildingService;
+
+	@Autowired
+	private ITaPersonIntentionRecordService personIntentionRecordService;
+
+	@Autowired
+	private ITaPersonFromRecordService iTaPersonFromRecordService;
+
 	/**
 	 * 分页获取客户访问记录
 	 *
@@ -179,6 +198,70 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		return personVisitRecordMapper.countShareNumByEventType(orgId, targetId, userId, personId, eventType);
 	}
 
+	@Override
+	public ResponseBean newRecord(TaPersonVisitRecord taPersonVisitRecord, TaPerson person) {
+		Integer orgId = person.getOrgId();
+
+		Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(), taPersonVisitRecord.getEventType(), taPersonVisitRecord.getActivity(), orgId);
+		if (eventProperties <= 0) {
+			TaEventProperties taEventProperty = new TaEventProperties();
+			taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
+			taEventProperty.setCreateDate(LocalDateTime.now());
+			taEventProperty.setPropertyCode(taPersonVisitRecord.getPropertyName());
+			taEventProperty.setPropertyName(taPersonVisitRecord.getPropertyName());
+			taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
+			taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
+			taEventProperty.setEventType(taPersonVisitRecord.getEventType());
+			taEventProperty.setOrgId(orgId);
+			if (!taEventPropertiesService.save(taEventProperty)) {
+				return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
+			}
+		}
+
+		taPersonVisitRecord.setVisitTime(LocalDateTime.now());
+		if (!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())) {
+			QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
+			intentionQueryWrapper.eq("building_id", taPersonVisitRecord.getBuildingId());
+			intentionQueryWrapper.eq("org_id", taPersonVisitRecord.getOrgId());
+			intentionQueryWrapper.eq("event_code", taPersonVisitRecord.getEvent());
+			List<TaBuildingIntention> list = buildingIntentionService.list(intentionQueryWrapper);
+			if (list.size() > 0) {
+				TaBuildingIntention buildingIntention = list.get(0);
+				TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
+				TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
+				intentionRecord.setBuildingId(buildingIntention.getBuildingId());
+				intentionRecord.setBuildingName(building.getBuildingName());
+				intentionRecord.setCreateDate(LocalDateTime.now());
+				intentionRecord.setEventCode(buildingIntention.getEventCode());
+				intentionRecord.setEventId(buildingIntention.getEventId());
+				intentionRecord.setEventName(buildingIntention.getEventName());
+				intentionRecord.setIntention(buildingIntention.getIntention());
+				intentionRecord.setOrgId(orgId);
+				intentionRecord.setPersonId(person.getPersonId());
+				intentionRecord.setPersonName(person.getNickname());
+				intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
+				if (!personIntentionRecordService.save(intentionRecord)) {
+					return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
+				}
+			}
+		}
+		try {
+			if (this.save(taPersonVisitRecord)) {
+				//清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
+				if (taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)) {
+					iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
+				}
+
+				return ResponseBean.success(taPersonVisitRecord);
+			} else {
+				return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
+			}
+		} catch (Exception e) {
+//			logger.error("taPersonVisitRecordAdd -=- {}", e.toString());
+			return ResponseBean.error("系统异常" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+		}
+	}
+
 	/**
 	 * 分页获取个人中心访客记录
 	 *

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

@@ -115,7 +115,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     }
 
     @Override
-    public TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId, String personId) {
+    public TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId) {
         if (raiseId == null && salesBatchId == null && raiseRecordId == null) return null;
 
         TaRaise taRaise = null;
@@ -131,15 +131,10 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaise = this.getOne(queryWrapper);
         }
 
-        // 通过认筹单记录ID 或者人员ID
-        boolean mayPerson = taRaise != null && !StringUtils.isEmpty(personId);
-        if (raiseRecordId != null || mayPerson) {
+        // 通过认筹单记录ID
+        if (raiseRecordId != null) {
             QueryWrapper<TaRaiseRecord> wrapper = new QueryWrapper<>();
-            wrapper.eq(raiseRecordId != null, "raise_record_id", raiseRecordId);
-            if (mayPerson) {
-                wrapper.eq("raise_id", taRaise.getRaiseId());
-                wrapper.eq("person_id", personId);
-            }
+            wrapper.eq("raise_record_id", raiseRecordId);
             wrapper.eq("status", CommConstant.STATUS_NORMAL);
             wrapper.last("limit 1");
             taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
@@ -35,6 +39,12 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     @Autowired
     private IMiniAppService miniAppService;
 
+    @Autowired
+    private ITaPersonVisitRecordService taPersonVisitRecordService;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -151,7 +161,10 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
      * @return
      */
     @PostMapping("/third/qrcode")
-    public ResponseBean thirdQrcode(@RequestBody String paramsStr, HttpServletRequest request) {
+    public ResponseBean thirdQrcode(@RequestBody String paramsStr,
+                                    @RequestParam String buildingId,
+                                    @RequestParam String personId,
+                                    HttpServletRequest request) {
         //获取H5项目相关信息
         String xAppid = request.getHeader("x-appid");
         QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
@@ -162,6 +175,27 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
         }
         String appid = request.getHeader("appid");
-        return miniAppService.getQrCode(paramsStr, appid);
+
+        ResponseBean res = miniAppService.getQrCode(paramsStr, appid);
+
+        // 埋點流程, 不影響主流程
+
+        try {
+            TaPerson taPerson = iTaPersonService.getById(personId);
+
+            TaPersonVisitRecord taPersonVisitRecord = new TaPersonVisitRecord();
+            taPersonVisitRecord.setPropertyName("生成H5海报");
+            taPersonVisitRecord.setActivity("生成H5海报");
+            taPersonVisitRecord.setOrgId(taPerson.getOrgId().toString());
+            taPersonVisitRecord.setPersonId(taPerson.getPersonId());
+            taPersonVisitRecord.setTargetId(buildingId);
+            taPersonVisitRecord.setData("{}");
+            taPersonVisitRecord.setEvent("poster");
+            taPersonVisitRecord.setEventType("building");
+
+            taPersonVisitRecordService.newRecord(taPersonVisitRecord, taPerson);
+        } catch (Exception e) {}
+
+        return res;
     }
 }