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

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/ITaPersonService.java

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -140,3 +141,4 @@ public class BaseController {
         return taPersonBuildingList;
     }
 }
+

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.*;
@@ -22,7 +23,6 @@ import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -194,10 +194,10 @@ public class MiniAppController extends BaseController {
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
-        if (StringUtils.isBlank(code)) {
+        if (StringUtils.isEmpty(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        if (StringUtils.isBlank(appid)) {
+        if (StringUtils.isEmpty(appid)) {
             return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -254,8 +254,8 @@ public class MiniAppController extends BaseController {
             // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
 //            ExecutorService threadPool = Executors.newCachedThreadPool();
 //            threadPool.execute(() -> {
-////                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
+////                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender)) {
 //                    // 校验是否点击过此人的分享
 //                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
 //                    if (checkPoint) {
@@ -265,7 +265,7 @@ public class MiniAppController extends BaseController {
 //                }
 //            });
 
-            if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
+            if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
@@ -486,7 +486,7 @@ public class MiniAppController extends BaseController {
     /**
      * 获取用户绑定手机号信息
      */
-    @PostMapping("/userPhone")
+    @PostMapping("Phone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);
@@ -502,19 +502,25 @@ public class MiniAppController extends BaseController {
         // 楼盘ID
         String buildingId = params.getString("buildingId");
         // 场景ID
-        String sceneId = params.getString("sceneId");
+        String sceneId = StringUtils.ifNull(params.getString("sceneId"), request.getHeader("x-sceneId"));
         // 访问目标
-        String targetType = params.getString("targetType");
+        String targetType = StringUtils.ifNull(params.getString("targetType"), request.getHeader("x-targetType"));
         // 目标ID
-        String targetId = params.getString("targetId");
+        String targetId = StringUtils.ifNull(params.getString("targetId"), request.getHeader("x-targetId"));
         // 目标名称
-        String targetName = params.getString("targetName");
+        String targetName = StringUtils.ifNull(params.getString("targetName"), request.getHeader("x-targetName"));
         // 推广用户
-        String promoter = params.getString("promoter");
+        String promoter = StringUtils.ifNull(params.getString("promoter"), request.getHeader("x-recommender"));
+        // 置业顾问
+        String consultantPersonId = request.getHeader("x-consultant");
+        // 渠道ID
+        String channelId = params.getString("channelId");
+        // 推广码ID
+        String qrCodeId = params.getString("qrCodeId");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
-        if (null == phoneNoInfo || com.huiju.estateagents.common.StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
+        if (null == phoneNoInfo || StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
             ResponseBean.error("解析用户手机号码出错", ResponseBean.ERROR_UNAVAILABLE);
         }
 
@@ -522,17 +528,28 @@ public class MiniAppController extends BaseController {
         Integer orgId = getOrgId(request);
         String phone = phoneNoInfo.getPhoneNumber();
 
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        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));
+        }
+
         try {
             taPersonService.authPhone(
                     orgId,
                     openid,
                     phone,
                     buildingId,
-                    sceneId,
-                    targetType,
-                    targetId,
-                    targetName,
-                    promoter);
+                    promoter,
+                    consultantPersonId,
+                    customerFrom);
 
             return ResponseBean.success(phoneNoInfo);
         } catch (Exception e) {

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

@@ -140,4 +140,13 @@ public class TaCustomerFrom implements Serializable {
     @TableField(exist = false)
     private LocalDateTime registerTime;
 
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

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

@@ -330,4 +330,14 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String targetName;
+
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

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

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaCustomerFrom;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;

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

@@ -881,66 +881,76 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
      * @param openid
      * @param phone
      * @param buildingId
-     * @param sceneId
-     * @param targetType
-     * @param targetId
-     * @param targetName
      * @param promoter
+     * @param customerFrom
      * @throws Exception
      */
     @Override
-    public void authPhone(Integer orgId, String openid, String phone, String buildingId, String sceneId, String targetType, String targetId, String targetName, String promoter) throws Exception {
-        log.info("orgId={},openid={},phone={},buildingId={},sceneId={},targetType={},targetId={},targetName={},promoter={}",
-                orgId,openid,phone,buildingId,sceneId,targetType,targetId,targetName,promoter);
+    public void authPhone(Integer orgId,
+                          String openid,
+                          String phone,
+                          String buildingId,
+                          String promoter,
+                          String consultantPersonId,
+                          TaCustomerFrom customerFrom) throws Exception {
+        log.info("orgId={},openid={},phone={},buildingId={},promoter={}, customerFrom={}",
+                orgId,openid,phone,buildingId,promoter, JSONObject.toJSONString(customerFrom));
         //
         LocalDateTime now = LocalDateTime.now();
 
-        // 更新人员手机号
+        // 当前人员
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             throw new Exception("当前人员 openid 异常");
         }
         TaPerson person = persons.get(0);
+        // 更新手机号
         person.setPhone(phone);
+        // 更新授权时间
         person.setAuthPhoneTime(now);
         if (StringUtils.isEmpty(person.getBuildingId())) {
+            // 更新楼盘
             person.setBuildingId(buildingId);
         }
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
+            // 更新人员身份
             person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         }
+        if (null != customerFrom.getChannelId() && null == person.getChannelId()) {
+            // 更新渠道
+            person.setChannelId(customerFrom.getChannelId());
+        }
+        if (null != customerFrom.getQrCodeId() && null == person.getQrCodeId()) {
+            // 更新推广码
+            person.setQrCodeId(customerFrom.getQrCodeId());
+        }
         updateById(person);
 
         // 关联推荐客户
         fixCustomerPersonId(person);
 
         // 客户来源
-        TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
         customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-        customerFrom.setTargetType(targetType);
-        customerFrom.setTargetId(targetId);
-        customerFrom.setTargetName(targetName);
-        customerFrom.setOrgId(orgId);
-        customerFrom.setSceneId(sceneId);
         customerFrom.setCreateDate(now);
 
         // 推广人
         TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
         // 推荐楼盘
         TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
-        // 是否置业顾问
+        // 置业顾问
         boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+        TaPerson consultant = null != consultantPersonId ? getById(consultantPersonId) : (isConsultant ? recPerson : null);
 
         try {
-            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, isConsultant ? recPerson : null, building, customerFrom);
+            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
             if (customerList.size() > 0) {
                 // 发放积分
                 applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
                 //授权手机给推广人加积分
                 String sharePersonId = getSharePersonFrom(person);
-                if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
+                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
                     applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
                 }
             }