* bug fix

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

@@ -55,7 +55,7 @@ public class TaQrcodeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
-            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getOrgId(request), personBuildingList);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taQrcodeList -=- {}", e.toString());

src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java

@@ -34,6 +34,7 @@ public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
                                           @Param("targetName") String targetName,
                                           @Param("channelId") Integer channelId,
                                           @Param("buildingId") String buildingId,
+                                          @Param("userId") Integer userId,
                                           @Param("orgId") Integer orgId,
                                           @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -302,5 +302,5 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param buildingId
      * @return
      */
-    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId, @Param("consultPersonId")String consultPersonId, @Param("userId")Integer userId);
+    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
 }

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

@@ -24,7 +24,7 @@ import java.util.List;
 public interface ITaQrcodeService extends IService<TaQrcode> {
 
     ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
-                                       String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
+                                       String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList);
 
     ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
 

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxQrCodeUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
@@ -55,6 +57,9 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
     @Autowired
     private IMiniAppService iMiniAppService;
 
+    @Autowired
+    private TaUserServiceImpl taUserService;
+
     /**
      * 条件查询二维码列表
      *
@@ -69,10 +74,16 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
      */
     @Override
     public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
-                                              String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
+                                              String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
+
+        TaUser taUser = taUserService.getById(userId);
+        if (taUser != null && taUser.getIsAdmin()) {
+            userId = null;
+        }
+
         IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId, personBuildingList));
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, userId, orgId, personBuildingList));
         return responseBean;
     }
 

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

@@ -193,21 +193,27 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         from.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
         from.setCreateDate(now);
 
-        Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null, consultant != null ? consultant.getPersonId() : null, consultant != null ? consultant.getUserId() : null);
+        Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null);
+        // 是否存在小程序客户记录
         boolean hasOrgCust = checkNum.get("orgNum").intValue() > 0;
-        boolean hasConsultBingBuildCust = checkNum.get("consultBindBuildingNum").intValue() > 0;
+        // 是否存在置业绑定的楼盘客户记录
+        boolean hasConsultBuildingCust = checkNum.get("consultBuildingNum").intValue() > 0;
+        // 是否存在置业绑定的楼盘私客记录
+        boolean hasConsultCust = checkNum.get("consultNum").intValue() > 0;
+        // 是否存在当前内容楼盘的客户记录
         boolean hasBuildingCust = checkNum.get("buildingNum").intValue() > 0;
-        boolean hasConstCust = checkNum.get("consultNum") == null ? true : checkNum.get("consultNum").intValue() > 0;
 
-        // 控制是否需要插入小程序级别公客
-        boolean inserted = false;
-        // 置业与楼盘是否有关联关系
+        // 置业与内容楼盘是否有关联关系
         boolean builingAssociated = false;
 
-        boolean personTypeFlag = CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType()) ? true : false;
+        // 职业顾问不插入客户表
+        boolean personIsConsultant = CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType()) ? true : false;
+        if (personIsConsultant) {
+            return result;
+        }
 
-        // 私客
-        if (null != consultant && hasConsultBingBuildCust && null != consultBuildings && !hasConstCust) {
+        // 置业项目
+        if (null != consultant && null != consultBuildings && !hasConsultCust) {
             TaBuilding taBuilding = null;
             if (consultBuildingIds.contains(null != building ? building.getBuildingId() : null)) {
                 taBuilding = building;
@@ -216,46 +222,62 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 taBuilding = consultBuildings.get(0);
             }
 
-            //如果公客绑定的项目和分享活动关联的项目相同，从公客列表移除该人员
-            QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
-            taRecommendCustomerQueryWrapper.eq("building_id", taBuilding.getBuildingId());
-            taRecommendCustomerQueryWrapper.isNull("realty_consultant");
-            List<TaRecommendCustomer> taRecommendCustomers = taRecommendCustomerMapper.selectList(taRecommendCustomerQueryWrapper);
-            for (TaRecommendCustomer customer : taRecommendCustomers){
-                if (customer.getBuildingId().equals(taBuilding.getBuildingId()) && person.getPersonId().equals(customer.getPersonId())){
-                    delPubCust(customer.getPersonId(), customer.getBuildingId());
+            if (hasConsultBuildingCust) {
+                // 如果是项目公客
+                QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+                taRecommendCustomerQueryWrapper.eq("building_id", taBuilding.getBuildingId());
+                taRecommendCustomerQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+                taRecommendCustomerQueryWrapper.orderByAsc("create_date");
+                taRecommendCustomerQueryWrapper.last("limit 1");
+                TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(taRecommendCustomerQueryWrapper);
+
+                taRecommendCustomer = copyFromPerosn(person, taRecommendCustomer);
+                taRecommendCustomer.setRealtyConsultant(consultant.getUserId().toString());
+                taRecommendCustomerMapper.updateById(taRecommendCustomer);
+                result.add(taRecommendCustomer);
+            } else {
+                // 如果没有任何置业及置业楼盘相关的数据, 则插入新记录
+                TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+                fillSomeFieldsOfCustomer(customer, recommender, now);
+                customer.setBuildingId(taBuilding.getBuildingId());
+                customer.setBuildingName(taBuilding.getBuildingName());
+                customer.setRealtyConsultant(consultant.getUserId().toString());
+                taRecommendCustomerMapper.insert(customer);
+                result.add(customer);
+
+                // 如果非小程序公客, 即首次进入
+                if (!hasOrgCust) {
+                    // 如果分享内容的楼盘跟置业楼盘一致
+                    if (builingAssociated) {
+                        hasOrgCust = true;
+                    }
                 }
-            }
-
-            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
-            fillSomeFieldsOfCustomer(customer, recommender, now);
-            customer.setBuildingId(taBuilding.getBuildingId());
-            customer.setBuildingName(taBuilding.getBuildingName());
-            customer.setRealtyConsultant(consultant.getUserId().toString());
-            taRecommendCustomerMapper.insert(customer);
-            result.add(customer);
-            inserted = true;
 
-            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
-            customerFrom.setCustomerId(customer.getCustomerId());
-            customerFrom.setSharePersonId(recommender.getPersonId());
-            customerFrom.setSharePersonName(StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
-            customerFrom.setBuildingId(taBuilding.getBuildingId());
-            customerFrom.setBuildingName(taBuilding.getBuildingName());
-            customerFrom.setIsOrgFirst(!hasOrgCust);
-            customerFrom.setIsProjectFirst(true);
-            customerFrom.setCreateDate(now);
-            taCustomerFromMapper.insert(customerFrom);
+                TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+                customerFrom.setCustomerId(customer.getCustomerId());
+                customerFrom.setSharePersonId(recommender.getPersonId());
+                customerFrom.setSharePersonName(StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+                customerFrom.setBuildingId(taBuilding.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setIsOrgFirst(hasOrgCust);
+                customerFrom.setIsProjectFirst(true);
+                customerFrom.setCreateDate(now);
+                taCustomerFromMapper.insert(customerFrom);
+            }
         }
 
         // 项目公客
-        if (null != building && !hasBuildingCust && !builingAssociated && !personTypeFlag) {
+        if (null != building && !hasBuildingCust && !builingAssociated) {
             TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
             fillSomeFieldsOfCustomer(customer, recommender, now);
             customer.setBuildingId(building.getBuildingId());
             taRecommendCustomerMapper.insert(customer);
             result.add(customer);
-            inserted = true;
+
+            // 如果非小程序公客, 即首次进入
+            if (!hasOrgCust) {
+                hasOrgCust = true;
+            }
 
             TaCustomerFrom customerFrom = copyPropertiesFrom(from);
             customerFrom.setCustomerId(customer.getCustomerId());
@@ -263,14 +285,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             customerFrom.setSharePersonName(null == recommender ? null : StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
             customerFrom.setBuildingId(building.getBuildingId());
             customerFrom.setBuildingName(building.getBuildingName());
-            customerFrom.setIsOrgFirst(!hasOrgCust);
+            customerFrom.setIsOrgFirst(hasOrgCust);
             customerFrom.setIsProjectFirst(true);
             customerFrom.setCreateDate(now);
             taCustomerFromMapper.insert(customerFrom);
         }
 
         // 小程序公客
-        if (!hasOrgCust && !inserted && !personTypeFlag) {
+        if (!hasOrgCust) {
             TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
             fillSomeFieldsOfCustomer(customer, recommender, now);
             taRecommendCustomerMapper.insert(customer);

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -26,6 +26,9 @@
         <if test = "channelId != null">
             AND t.channel_id = #{channelId}
         </if>
+        <if test = "userId != null">
+            AND t.create_user = #{userId}
+        </if>
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND (t.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -158,6 +161,7 @@
             LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
+            AND t.is_org_first =1
             AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.customer_id
@@ -178,6 +182,7 @@
             LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
+            AND t.is_org_first =1
             AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.customer_id

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -951,17 +951,26 @@
                 COALESCE(sum( IF ( t.building_id IN ('****')
             </otherwise>
         </choose>
-            , 1, 0 ) ), 0) AS consultBindBuildingNum,
+            , 1, 0 ) ), 0) AS consultBuildingNum,
+
+        <choose>
+            <when test="consultBuildingIds != null and consultBuildingIds.size > 0">
+                COALESCE(sum( IF ( t.building_id IN <foreach collection="consultBuildingIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            </when>
+            <otherwise>
+                COALESCE(sum( IF ( t.building_id IN ('****')
+            </otherwise>
+        </choose>
+
+              AND IFNULL(t.realty_consultant, '') != ''), 1, 0 ) ), 0) AS consultNum,
 
             COALESCE(sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ), 0) AS buildingNum
-        <if test="userId != null and userId != ''">
-            ,COALESCE(sum( IF ( t.realty_consultant in (#{consultPersonId}, #{userId}), 1, 0 ) ), 0) AS consultNum
-        </if>
 
         FROM
             ta_recommend_customer t
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+            AND t.status > -1
     </select>
 </mapper>