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

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -19,6 +19,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.TaChannelAppRelation;
 import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -233,6 +234,7 @@ public class SysUserChannelController extends BaseController {
             return responseBean;
         }
 
+        taChannelProxy.setExpireDate(taChannelProxy.getExpireDate().plusDays(1L));
         //更新业务层的登录账号为禁用
         if (taChannelProxy.getStatus() != null){
             QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
@@ -242,11 +244,14 @@ public class SysUserChannelController extends BaseController {
             taChannelAppRelation.forEach(e->{
                 orgIdList.add(e.getOrgId());
             });
-            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-            taUserQueryWrapper.in("org_id", orgIdList);
-            TaUser taUser = new TaUser();
-            taUser.setStatus(taChannelProxy.getStatus());
-            iTaUserService.update(taUser, taUserQueryWrapper);
+            if (CollectionUtils.isNotEmpty(orgIdList)){
+                QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+                taUserQueryWrapper.in("org_id", orgIdList);
+                TaUser taUser = new TaUser();
+                taUser.setStatus(taChannelProxy.getStatus());
+                iTaUserService.update(taUser, taUserQueryWrapper);
+            }
+
         }
 
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();

src/main/java/com/huiju/estateagents/excel/TaActivityDynamicEnlistExport.java

@@ -41,10 +41,10 @@ public class TaActivityDynamicEnlistExport implements Serializable {
      * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index = 4)
+    @ExcelProperty(value = "引流人", index = 4)
     private String sharePersonName;
 
-    /**
+    /*
      * 公司
      */
     @ColumnWidth(15)

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -145,7 +145,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             // 只尝试去解析
             Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
         } catch (ExpiredJwtException e) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, Token 已过期", ResponseBean.ERROR_AUTH_EXPIRED);
+            ResponseBean resp = ResponseBean.error("权限验证非法, 身份信息已过期", ResponseBean.ERROR_AUTH_EXPIRED);
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;

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

@@ -304,7 +304,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
 
@@ -458,6 +458,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            return responseBean;
+        }
+
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);
@@ -553,7 +559,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
             return responseBean;
         }
 
@@ -944,9 +950,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (taBuilding.getIsMain() != 1){
             return true;
         }
-        if (operte.equals("update") && (info.getStatus() == 2)){
-            return true;
-        }
+//        if (operte.equals("update") && (info.getStatus() == 2)){
+//            return true;
+//        }
         if (operte.equals("updateStatus") && status == 2){
             return true;
         }

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

@@ -132,7 +132,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setUserTel(personInfo.getPhone());
 			}
 
-			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
+			TaPerson userShareInfo = taPersonMapper.selectById(e.getPersonId());
 			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());

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

@@ -71,6 +71,10 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         queryWrapper.eq("tagert_type", typeOf);
         List<TaShare> uvs = taShareMapper.selectList(queryWrapper);
         if (null != uvs && uvs.size() > 0) {
+            //更新分享为最新时间
+            TaShare taShare = new TaShare();
+            taShare.setCreateDate(LocalDateTime.now());
+            taShareMapper.update(taShare, queryWrapper);
             return ResponseBean.success("");
         }
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -123,7 +123,7 @@
 
     <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            t.* ,
+            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,building_id, t.status, t.is_first_time,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
 	        p.avatarurl
@@ -154,7 +154,12 @@
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select * from (
             select
-            <include refid="columnSql"></include>,
+<!--            <include refid="columnSql"></include>,-->
+            t.person_id,
+            c.person_type,
+            t.create_date as visit_time,
+            t.tagert_type as event_type,
+            t.be_share as target_id,
             b.name as drainageName,
             d.building_name as buildingName,
             tn.news_name as newsName,
@@ -162,26 +167,25 @@
             tsa.activity_name as groupActivityName,
             tbd.title as activityName,
             b.drainage_id
-            from ta_person_visit_record t
-            left join ta_drainage b on t.target_id = b.drainage_id
-            left join ta_building d on t.target_id = d.building_id
-            left join ta_news tn on t.target_id = tn.news_id
-            left join ta_help_activity tha on t.target_id = tha.help_activity_id
-            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
-            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
-            left join ta_person c on t.share_person_id = c.person_id
-            where
-            t.share_person_id != t.person_id and t.share_person_id is not null and t.share_person_id != ''
+            from ta_share t
+            left join ta_drainage b on t.be_share = b.drainage_id
+            left join ta_building d on t.be_share = d.building_id
+            left join ta_news tn on t.be_share = tn.news_id
+            left join ta_help_activity tha on t.be_share = tha.help_activity_id
+            left join ta_share_activity tsa on t.be_share = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.be_share = tbd.dynamic_id
+            left join ta_person c on t.person_id = c.person_id
+            where 1=1
             <if test="orgId != null and orgId != ''">
-                and t.org_id = #{orgId}
+                and c.org_id = #{orgId}
             </if>
             <if test="eventType !=null and eventType != ''">
-                and t.event_type = #{eventType}
+                and t.tagert_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
                 and (
-                (b.name like concat('%',#{activityName},'%') and t.event_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.event_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.event_type = 'news')
-                or (tha.title like concat( '%', #{activityName}, '%' ) and t.event_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.event_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.event_type = 'activity')
+                (b.name like concat('%',#{activityName},'%') and t.tagert_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.tagert_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.tagert_type = 'news')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.tagert_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.tagert_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.tagert_type = 'activity')
                 )
             </if>
             <if test="shareName !=null and shareName != ''">
@@ -191,23 +195,23 @@
                 and c.phone = #{shareTel}
             </if>
             <if test="personType == 'Realty Consultant'">
-                and t.consultant_id is not null  and t.consultant_id != ''
+                and c.person_type = 'Realty Consultant'
             </if>
             <if test="personType == 'customer'">
-                and t.consultant_id is null
+                and c.person_type != 'Realty Consultant'
             </if>
             <if test="buildingId !=null and buildingId != ''">
-                and t.building_id = #{buildingId}
+                and d.building_id = #{buildingId}
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND t.building_id in
+                AND d.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
-            order by t.visit_time desc
+            order by t.create_date desc
         ) t
-        group by t.person_id, t.share_person_id,t.target_id,t.event_type
+        group by t.person_id, t.target_id,t.event_type
         order by t.visit_time desc
     </select>
 
@@ -222,7 +226,7 @@
                 a.address,
                 a.price,
                 t.tagert_type as eventType,
-				t.create_date
+				t.create_date as visit_time
                 from ta_share t
                 left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
                 where t.tagert_type = 'project'
@@ -241,7 +245,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_building_dynamic b on t.be_share = b.dynamic_id
         where t.tagert_type = 'activity'
@@ -260,7 +264,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_help_activity c on t.be_share = c.help_activity_id
         where t.tagert_type = 'help'
@@ -279,7 +283,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_share_activity d on t.be_share = d.group_activity_id
         where t.tagert_type = 'group'
@@ -298,7 +302,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_news e on t.be_share = e.news_id
         where t.tagert_type = 'news'
@@ -317,7 +321,7 @@
             '2' as building_name,
             '3' as address,
 			t.tagert_type as eventType,
-			t.create_date
+			t.create_date as visit_time
             from ta_share t
             left join ta_drainage f on t.be_share = f.drainage_id
             where t.tagert_type = 'h5'
@@ -325,7 +329,7 @@
             ) t
             group by t.target_id
         ) t
-        order by t.create_date desc
+        order by t.visit_time desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -559,6 +559,7 @@ FROM
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
         </where>
         order by b.create_date desc
         limit #{pageCode}, #{pageSize}
@@ -632,11 +633,14 @@ FROM
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        left join ta_person c on a.realty_consultant = c.user_id
+        LEFT JOIN ta_person c ON a.realty_consultant = c.user_id
+        LEFT JOIN ta_user d on d.user_id = a.realty_consultant
+        LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
         <where>
             a.status > 0
             and a.verify_status = 1
-            and realty_consultant is not null
+            and a.realty_consultant is not null
+            and a.realty_consultant != ''
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>