新需求

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

@@ -17,6 +17,7 @@ import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -457,7 +458,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
     })
     @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "help")
     public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
+                                          @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                          @RequestParam(value = "channelId", required = false) String channelId,
+                                          @RequestParam(value = "sceneId", required = false) String sceneId,
                                           HttpServletRequest request, @RequestParam(value = "initiateId",required = false) Integer initiateId) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);

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

@@ -486,7 +486,7 @@ public class MiniAppController extends BaseController {
     /**
      * 获取用户绑定手机号信息
      */
-    @PostMapping("Phone")
+    @PostMapping("/userPhone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);

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

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
@@ -355,7 +356,12 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "building")
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);

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

@@ -19,6 +19,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -291,7 +292,11 @@ public class TaBuildingDynamicController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
     })
     @RequestMapping(value = "/wx/buildingDynamiceEnlistInfo/{dynamicId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "activity")
     public ResponseBean iBuildingDynamicEnlistInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                                   @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                                   @RequestParam(value = "channelId", required = false) String channelId,
+                                                   @RequestParam(value = "sceneId", required = false) String sceneId,
                                              HttpServletRequest request){
         ResponseBean  responseBean = new ResponseBean();
                 String openid = getOpenId(request);

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -244,9 +245,14 @@ public class TaHousingResourcesController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
+    @ReportCustomer(type = "house")
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source,
-                                             HttpServletRequest request) {
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
+                                             HttpServletRequest request,
+                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source
+                                             ) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
@@ -221,7 +222,12 @@ public class TaLiveActivityController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
-    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "live")
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id,
+                                                  @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                                  @RequestParam(value = "channelId", required = false) String channelId,
+                                                  @RequestParam(value = "sceneId", required = false) String sceneId,
+                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaLiveActivityService.getLiveActivityDetailById(id, getOrgId(request));

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -215,7 +216,12 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
+    @ReportCustomer(type = "news")
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id,
+                                    @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                    @RequestParam(value = "channelId", required = false) String channelId,
+                                    @RequestParam(value = "sceneId", required = false) String sceneId,
+                                    HttpServletRequest request){
         String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {

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

@@ -784,8 +784,15 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/userInfo/updatePhoto")
-    public ResponseBean updateUserPhoto(String photoUrl, HttpServletRequest request){
+    public ResponseBean updateUserPhoto(@RequestBody Map<String, String> photoUrl, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
         String openId = getOpenId(request);
-        return taPersonService.updateUserPhoto(photoUrl, openId);
+        String imgUrl = photoUrl.get("photoUrl");
+        if (StringUtils.isEmpty(imgUrl)){
+            responseBean.addError("请上传图片");
+            return responseBean;
+        }
+        return taPersonService.updateUserPhoto(imgUrl, openId);
     }
 }

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

@@ -363,7 +363,11 @@ public class TaShareActivityController extends BaseController {
     @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
     @ReportCustomer(type = "group")
     public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
-                                           HttpServletRequest request, @RequestParam(value = "recordId",required = false) Integer recordId ){
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request,
+                                           @RequestParam(value = "recordId",required = false) Integer recordId ){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -1,5 +1,23 @@
 package com.huiju.estateagents.drainage.controller;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,20 +33,11 @@ import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
 
 
 /**
@@ -332,7 +341,12 @@ public class TaDrainageController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean wxDrainageGet(@PathVariable Integer id, HttpServletRequest request){
+    @ReportCustomer(type = "h5")
+    public ResponseBean wxDrainageGet(@PathVariable Integer id,
+                                      @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                      @RequestParam(value = "channelId", required = false) String channelId,
+                                      @RequestParam(value = "sceneId", required = false) String sceneId,
+                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaDrainageService.getById(id));

src/main/java/com/huiju/estateagents/entity/TaCustomerFrom.java

@@ -19,7 +19,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 public class TaCustomerFrom implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/huiju/estateagents/entity/TaPersonVisitRecord.java

@@ -214,4 +214,8 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String city;
+
+    private Integer qrCodeId;
+
+    private Integer channelId;
 }

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomer.java

@@ -6,7 +6,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.servlet.http.HttpServletRequest;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD})

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerAspect.java

@@ -1,23 +1,21 @@
 package com.huiju.estateagents.reportCustomerAop;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
@@ -29,12 +27,12 @@ import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 
-import io.swagger.models.auth.In;
-
 @Aspect
 @Component
 public class ReportCustomerAspect extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(ReportCustomerAspect.class);
+
     @Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
 
@@ -42,7 +40,10 @@ public class ReportCustomerAspect extends BaseController {
     TaPersonMapper taPersonMapper;
 
     @Autowired
-    private TaBuildingMapper taBuildingMapper;
+    TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    ReportCustomerImpl reportCustomerImpl;
 
 
     /** 以自定义 @ReportCustomer 注解为切点 */
@@ -58,51 +59,47 @@ public class ReportCustomerAspect extends BaseController {
             ReportCustomer reportCustomer = ((MethodSignature)proceedingJoinPoint.getSignature()).getMethod().getAnnotation(ReportCustomer.class);
             //获取请求参数
             Object[] args = proceedingJoinPoint.getArgs();
-            HttpServletRequest request = (HttpServletRequest)args[1];
+            String targetType = reportCustomer.type();
+            String targetId = String.valueOf(args[0]);
+            String qrCodeId = String.valueOf(args[1]);
+            String channelId = String.valueOf(args[2]);
+            String sceneId = String.valueOf(args[3]);
+            HttpServletRequest request = (HttpServletRequest)args[4];
 
+            Map<String, Object> stringObjectMap = getBuildingByIdAndType(targetId, targetType);
             if (request == null){
                 responseBean.addError("未授权，不进行操作");
                 return responseBean;
             }
 
-            String params = request.getHeader("reportInfo");
-            JSONObject paramObject = JSONObject.parseObject(params);
+            String consultantPersonId = request.getHeader("x-consultant");
+            String recommend = request.getHeader("x-recommender");
 
             List<TaPerson> persons = getPersonsByOpenId(getOpenId(request));
             TaPerson taPerson = persons.get(0);
             Integer orgId = getOrgId(request);
 
-            // 楼盘ID
-            String buildingId = paramObject.getString("buildingId");
-            // 场景ID
-            String sceneId = paramObject.getString("sceneId");
-            // 访问目标
-            String targetType = reportCustomer.type();
-            // 目标ID
-            String targetId = paramObject.getString("targetId");
-            // 目标名称
-            String targetName = paramObject.getString("targetName");
-            // 推广用户
-            String promoter = paramObject.getString("promoter");
-
-            TaCustomerFrom  taCustomerFrom = assembleVO(taPerson, targetType, targetId, targetName, orgId, sceneId);
+            TaCustomerFrom  taCustomerFrom = assembleVO(taPerson, targetType, targetId, stringObjectMap.get("targetName").toString(), orgId, sceneId, channelId, qrCodeId);
             // 推广人
-            TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
+            TaPerson recPerson = StringUtils.isEmpty(recommend) ? null : taPersonMapper.getById(recommend);
             // 是否置业顾问
             boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+            TaPerson consultantInfo = null != consultantPersonId ? reportCustomerImpl.getPerson(consultantPersonId) : (isConsultant ? recPerson : null);
             // 推荐楼盘
-            TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
+            TaBuilding taBuilding = (TaBuilding) stringObjectMap.get("taBuilding");
+            TaBuilding building = taBuilding == null ? null : taBuildingMapper.selectById(taBuilding.getBuildingId());
 
-            iTaRecommendCustomerService.newCustomer(orgId, taPerson, recPerson, isConsultant ? recPerson : null, building, taCustomerFrom);
+            iTaRecommendCustomerService.newCustomer(orgId, taPerson, recPerson, consultantInfo, building, taCustomerFrom);
             responseBean.addSuccess("绑定成功");
 
         }catch (Exception e){
+            logger.error("绑定失败");
             responseBean.addError("失败");
         }
         return responseBean;
     }
 
-    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId){
+    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId, String channelId, String qrCodeId){
         // 客户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
@@ -112,6 +109,12 @@ public class ReportCustomerAspect extends BaseController {
         customerFrom.setTargetName(targetName);
         customerFrom.setOrgId(orgId);
         customerFrom.setSceneId(sceneId);
+        if (!StringUtils.isEmpty(channelId)){
+            customerFrom.setChannelId(Integer.valueOf(channelId));
+        }
+        if(!StringUtils.isEmpty(qrCodeId)){
+            customerFrom.setQrCodeId(Integer.valueOf(qrCodeId));
+        }
         customerFrom.setCreateDate(LocalDateTime.now());
 
         return customerFrom;
@@ -120,4 +123,36 @@ public class ReportCustomerAspect extends BaseController {
     public List<TaPerson> getPersonsByOpenId(String openId){
         return taPersonMapper.getPersonByOpenId(openId);
     }
+
+    public Map<String, Object> getBuildingByIdAndType(String targetId, String targetType){
+        Map<String, Object> buildingAndNameInfo = null;
+
+        switch (targetType){
+            case CommConstant.FAVOR_ACTIVITY:
+                buildingAndNameInfo = reportCustomerImpl.selectActivityBuildingInfo(targetId);
+                break;
+            case CommConstant.POINTS_CHANGE_HELP:
+                buildingAndNameInfo = reportCustomerImpl.selectHelpBuildingInfo(targetId);
+                break;
+            case CommConstant.POINTS_CHANGE_GROUP:
+                buildingAndNameInfo = reportCustomerImpl.selectGroupBuildingInfo(targetId);
+                break;
+            case CommConstant.LIVE:
+                buildingAndNameInfo = reportCustomerImpl.selectLiveBuildingInfo(targetId);
+                break;
+            case CommConstant.EVENT_H5:
+                buildingAndNameInfo = reportCustomerImpl.selectH5BuildingInfo(targetId);
+                break;
+            case CommConstant.FAVOR_NEWS:
+                buildingAndNameInfo = reportCustomerImpl.selectNewsBuildingInfo(targetId);
+                break;
+            default:
+                buildingAndNameInfo = reportCustomerImpl.selectBuildingInfo(targetId);
+                break;
+        }
+
+        return buildingAndNameInfo;
+    }
+
+
 }

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerImpl.java

@@ -0,0 +1,161 @@
+package com.huiju.estateagents.reportCustomerAop;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaLiveActivityMapper;
+import com.huiju.estateagents.mapper.TaNewsMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+public class ReportCustomerImpl extends ServiceImpl<TaPersonMapper, TaPerson> {
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
+
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
+
+    public Map<String, Object> selectActivityBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaBuildingDynamic> taBuildingDynamicQueryWrapper = new QueryWrapper<>();
+        taBuildingDynamicQueryWrapper.eq("dynamic_id", targetId);
+        TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQueryWrapper);
+        map.put("targetName", taBuildingDynamic.getTitle());
+
+        TaBuilding taBuilding = buildingInfo(taBuildingDynamic.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectHelpBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", targetId);
+        HelpActivity helpActivity = helpActivityMapper.selectOne(helpActivityQueryWrapper);
+        map.put("targetName", helpActivity.getTitle());
+
+        TaBuilding taBuilding = buildingInfo(helpActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectGroupBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("group_activity_id", targetId);
+        TaShareActivity taShareActivity = taShareActivityMapper.selectOne(taShareActivityQueryWrapper);
+        map.put("targetName", taShareActivity.getActivityName());
+
+        TaBuilding taBuilding = buildingInfo(taShareActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectLiveBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
+        taLiveActivityQueryWrapper.eq("live_activity_id", targetId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectOne(taLiveActivityQueryWrapper);
+        map.put("targetName", taLiveActivity.getLiveActivityTitle());
+
+        TaBuilding taBuilding = buildingInfo(taLiveActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectH5BuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaDrainage> taDrainageQueryWrapper = new QueryWrapper<>();
+        taDrainageQueryWrapper.eq("drainage_id", targetId);
+        TaDrainage taDrainage = taDrainageMapper.selectOne(taDrainageQueryWrapper);
+        map.put("targetName", taDrainage.getName());
+
+        TaBuilding taBuilding = buildingInfo(taDrainage.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+        taBuildingQueryWrapper.eq("building_id", targetId);
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+        map.put("targetName", taBuilding.getBuildingName());
+        map.put("taBuilding", taBuilding);
+        return map;
+    }
+
+    public Map<String, Object> selectNewsBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq("news_id", targetId);
+        TaNews taNews = taNewsMapper.selectOne(taNewsQueryWrapper);
+        map.put("targetName", taNews.getNewsName());
+
+        TaBuilding taBuilding = buildingInfo(taNews.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public TaBuilding buildingInfo(String buildingId){
+        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+        taBuildingQueryWrapper.eq("building_id", buildingId);
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+        return taBuilding;
+    }
+
+    public TaPerson getPerson(String personId){
+        return getById(personId);
+    }
+}

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

@@ -413,13 +413,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
 
         TaPerson taPerson = taPersons.get(0);
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("user_id", taPerson.getUserId());
+        TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
+
         Map<String, Object> result = new HashMap<>();
         result.put("id", taPerson.getPersonId());
         result.put("name", taPerson.getName());
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("nickname", taPerson.getNickname());
-        result.put("avatar", taPerson.getAvatarurl());
+        result.put("avatar", taUser == null ? taPerson.getAvatarurl() : taUser.getPhoto());
         result.put("sex", taPerson.getSex());
         result.put("phone",StringUtils.ifNull(taPerson.getTel(),taPerson.getPhone()) );
         result.put("points", taPerson.getPoints());