Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/common/CommConstant.java

      */
     public static final String HOUSE = "house";
 
+
+    /**
+     * 首页分享
+     */
+    public static final String INDEX = "index";
+
+
     /**
      * 批量销售
      */

src/main/java/com/huiju/estateagents/common/StringUtils.java

     }
 
     public static String ifNull(String src, String defaultVal) {
-        return null == src || "".equals(src) ? defaultVal : src;
+        return isEmpty(src) ? defaultVal : src;
     }
 
     public static String random(int length) {

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

 package com.huiju.estateagents.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 微信首页
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/wx")
 public class IndexController {
 
 
 
-
-
-
+    @PostMapping("/indexCustomer")
+    @ReportCustomer(type = "index")
+    public ResponseBean getPreloadData(@RequestParam(value = "id", required = false) 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) {
+        return ResponseBean.success("success");
+    }
 
 }

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

 package com.huiju.estateagents.reportCustomerAop;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.alibaba.fastjson.JSONObject;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+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 javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 @Aspect
 @Component
             HttpServletRequest request = (HttpServletRequest) args[4];
 
             Map<String, Object> stringObjectMap = getBuildingByIdAndType(targetId, targetType);
-            if (request == null) {
+            if (!CommConstant.INDEX.equals(targetType) && request == null) {
                 responseBean.addError("未授权，不进行操作");
                 return responseBean;
             }
             TaPerson taPerson = persons.get(0);
             Integer orgId = getOrgId(request);
 
-            TaCustomerFrom taCustomerFrom = assembleVO(taPerson, targetType, targetId, stringObjectMap.get("targetName").toString(), orgId, sceneId, channelId, qrCodeId);
+            TaCustomerFrom taCustomerFrom = assembleVO(taPerson, targetType,StringUtils.ifNull(targetId,null), null == stringObjectMap ? null : stringObjectMap.get("targetName").toString(), orgId, StringUtils.ifNull(sceneId,null), channelId, qrCodeId);
             // 推广人
             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 taBuilding = (TaBuilding) stringObjectMap.get("taBuilding");
+            TaBuilding taBuilding = null == stringObjectMap ? null : (TaBuilding) stringObjectMap.get("taBuilding");
             TaBuilding building = taBuilding == null ? null : taBuildingMapper.selectById(taBuilding.getBuildingId());
 
             if (StringUtils.isEmpty(taPerson.getPhone())) {
             case CommConstant.HOUSE:
                 buildingAndNameInfo = reportCustomerImpl.selectHouseBuildingInfo(targetId);
                 break;
+            case CommConstant.INDEX:
+                break;
             default:
                 buildingAndNameInfo = reportCustomerImpl.selectBuildingInfo(targetId);
                 break;

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

 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.TaSalesBatch;
-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.TaSalesBatchMapper;
-import com.huiju.estateagents.mapper.TaShareActivityMapper;
-
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 @Service
     public TaPerson getPerson(String personId){
         return getById(personId);
     }
+
+    public Map<String, Object> selectIndexInfo(String targetId) {
+        Map<String, Object> map = new HashMap<>();
+        return map;
+    }
 }

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

                 // 如果非小程序公客, 即首次进入
                 if (!isFirstOrg) {
                     // 如果分享内容的楼盘跟置业楼盘一致
-                    if (builingAssociated) {
+                    if (builingAssociated || null  == building ) {
                         isFirstOrg = true;
                     }
                 } else {
         }
 
         // 小程序公客
-        if (!hasOrgCust) {
+        if (!hasOrgCust && null == consultant) {
             TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
             fillSomeFieldsOfCustomer(customer, recommender, now);
             taRecommendCustomerMapper.insert(customer);