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

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

@@ -226,6 +226,8 @@ public class TaBuildingDynamicController extends BaseController {
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
                                                 HttpServletRequest request){
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -236,7 +238,7 @@ public class TaBuildingDynamicController extends BaseController {
         // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
 
         // 当前活动已报名的总人数
-        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), getOrgId(request));
+        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
             return ResponseBean.error("报名失败，超过活动报名的最大人数！", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -257,10 +259,9 @@ public class TaBuildingDynamicController extends BaseController {
 
 
         TaPerson person = taPersons.get(0);
-        Integer orgId = getOrgId(request);
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
         taActivityDynamicEnlist.setOrgId(orgId);
-        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist, orgId);
         return responseBean;
     }
     

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -61,4 +62,16 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private Integer attendNum;
 
+    /**
+     * 分享人
+     */
+    @TableField(exist = false)
+    private String sharePersonName;
+
+    /**
+     * 公司名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+
 }

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

@@ -64,4 +64,9 @@ public class TdPointsRules implements Serializable {
      * 停用启用状态
      */
     private Integer status;
+    
+    /**
+     * 积分说明
+     */
+    private String remark;
 }

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

@@ -46,7 +46,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
 
     /**
      * 获取推荐用户数据

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

@@ -72,7 +72,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 报名活动
      * @return
      */
-    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
+    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId);
 
     /**
      * 报名列表

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

@@ -156,6 +156,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(buildingDynamic.getDynamicId(), orgId);
         buildingDynamic.setEnlisted(enlistCount);
 
+        // 活动海报
+        buildingDynamic.setPosters(taPosterService.getPostersForTarget(buildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+
         return ResponseBean.success(buildingDynamic);
     }
 
@@ -216,23 +219,29 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
+    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId) {
         ResponseBean responseBean= new ResponseBean<>();
         // 查询当前活动属于哪个楼盘
         TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
-        // 判断当前活动是否满
-        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
-        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
-        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
-        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
+
+        /**
+         * 判断当前活动是否满
+         */
+
+        TaBuildingDynamic buildingDynamic = this.getById(taActivityDynamicEnlist.getDynamicId());
+        // 已报名人数
+        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
+
         // 当报名人数已满时，活动为已结束
-        if (contActivity >= personNum){
+        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
             taBuildingDynamic.setIsEnlist("2");
             buildingDynamicMapper.updateById(taBuildingDynamic);
             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
         // 判断是否报名根据电话号码校验
+        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
+        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
         taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
         TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
         if (null !=activityDynamicEnlist){

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

@@ -649,6 +649,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
             taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
             taRecommendCustomerQuery.eq("status",1);
+            taRecommendCustomerQuery.eq("org_id", orgid);
             /*推荐客户总数*/
             int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
             taPerson.setRecommendCount(recommendCount);

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

@@ -339,7 +339,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

src/main/resources/application-v3.yml

@@ -5,9 +5,9 @@ spring:
     name: estateagents
   datasource:
     username: estateagents
-      password: DQ@0lW##kBb2+-jPZ
-      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-      driver-class-name: com.mysql.cj.jdbc.Driver
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
     min-idle: 8 # 最小空闲数

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -2,10 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
-            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
+             SELECT
+                tade.*,
+                tp.name as sharePersonName,
+                tao.name as orgName
+            FROM
+                ta_activity_dynamic_enlist tade LEFT JOIN ta_person tp on tade.share_person = tp.person_id
+                LEFT JOIN ta_org tao on tade.org_id = tao.org_id
+            WHERE
+                tade.dynamic_id = #{dynamicId}
+                AND tade.org_id = #{orgId}
+
         </select>
 
         <select id="selectEnlistCount" resultType="Integer" >
-            select sum(attend_num) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
+            select ifnull(sum( attend_num ), 0) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
         </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -10,9 +10,10 @@
             t.post,
             t.tel AS phone,
             t.avatarurl AS avatar,
-            t.photo
+            t.photo,
+            u.description as description
         FROM
-            ta_person t
+            ta_person t left join ta_user u on t.user_id = u.user_id
         LEFT JOIN ta_person_building p ON t.person_id = p.person_id
         WHERE
             t.person_type = #{personType}
@@ -27,7 +28,7 @@
 
     <select id="selectBuildingConsultants" resultType="java.util.HashMap">
         SELECT
-            u.user_id AS id,
+            t.person_id AS id,
             u.user_name,
             u.org_name,
             u.department,
@@ -131,9 +132,10 @@ FROM
         t.post,
         t.tel AS phone,
         t.avatarurl AS avatar,
-        t.photo
+        t.photo,
+        u.description as description
         FROM
-        ta_person t
+        ta_person t left join ta_user u on t.user_id = u.user_id
         WHERE
         t.person_type = #{personType}
         AND t.status = #{status}
@@ -471,52 +473,51 @@ FROM
 
     <select id="getPersonList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-	a.*
-FROM
-	ta_person a
-	LEFT JOIN ta_person_building b ON a.person_id = b.person_id
-	<where>
-        1=1
-        <if test="personType != null and personType!= ''">
-            and a.person_type = #{personType}
-        </if>
-        <if test="name != null and name!= ''">
-            and a.name like CONCAT('%',#{name}, '%')
-        </if>
-        <if test="personTags != null and personTags!= ''">
-            and a.person_tags like CONCAT('%',#{personTags}, '%')
-        </if>
-        <if test="phone != null and phone!= ''">
-            and a.tel = #{phone}
-        </if>
-        <if test="buildingId != null and buildingId!= ''">
-            and b.building_id = #{buildingId}
-        </if>
-        <if test="status != null">
-            and a.status = #{status}
-        </if>
-    </where>
-	GROUP BY a.person_id
+            a.*
+        FROM
+            ta_person a
+            LEFT JOIN ta_person_building b ON a.person_id = b.person_id
+            <where>
+                1=1
+                <if test="personType != null and personType!= ''">
+                    and a.person_type = #{personType}
+                </if>
+                <if test="name != null and name!= ''">
+                    and a.name like CONCAT('%',#{name}, '%')
+                </if>
+                <if test="personTags != null and personTags!= ''">
+                    and a.person_tags like CONCAT('%',#{personTags}, '%')
+                </if>
+                <if test="phone != null and phone!= ''">
+                    and a.tel = #{phone}
+                </if>
+                <if test="buildingId != null and buildingId!= ''">
+                    and b.building_id = #{buildingId}
+                </if>
+                <if test="status != null">
+                    and a.status = #{status}
+                </if>
+            </where>
+            GROUP BY a.person_id
     </select>
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
         p.person_id,
         p.avatarurl,
-        p.tel,
         p.sex,
-        rc.`name`,
-        rc.phone,
+        rc.`name` as name,
+        rc.phone as tel,
         COUNT(rc.person_id) as recommendCount
         from ta_channel_person tch
         left join  ta_person p on  tch.person_id = p.person_id
-        LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
+        LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id
         <where>
         <if test="name !=null and name !=''">
-            and rc.`name` = #{name}
+            and rc.name like CONCAT('%',#{name}, '%')
         </if>
         <if test="phone !=null and phone !=''">
-            and rc.phone = #{phone}
+            and rc.phone like CONCAT('%',#{phone}, '%')
         </if>
             and p.org_id= #{orgid}
             and tch.channel_id = #{channelId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -83,7 +83,7 @@ FROM
             left join ta_channel_person tcp on a.person_id = tcp.person_id
             left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
-            a.person_type = 'estate agent'
+            a.person_type in ('estate agent', 'channel agent')
             and a.status >0
             <if test="name != null and name !=''">
                 and a.nickname = #{name}
@@ -166,16 +166,16 @@ FROM
                 and a.building_id = #{building}
             </if>
             <if test="name != null and name !=''">
-                and a.name = #{name}
+                and a.name like CONCAT('%',#{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and a.phone = #{tel}
+                and a.phone like CONCAT('%',#{tel}, '%')
             </if>
             <if test="consultName != null and consultName !=''">
                 and b.name like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}
@@ -208,10 +208,10 @@ FROM
             b.status > 0
             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
             <if test="name != null and name !=''">
-                and b.nickname = #{name}
+                and b.nickname like CONCAT('%',#{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and b.phone = #{tel}
+                and b.phone like CONCAT('%',#{tel}, '%')
             </if>
             <if test="entryType != null and entryType !=''">
                 and b.entry_type = #{entryType}
@@ -222,6 +222,9 @@ FROM
             <if test="orgId != null">
                 and b.org_id = #{orgId}
             </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
         </where>
         order by b.create_date desc