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

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -59,16 +59,16 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		queryWrapper.eq("org_id",orgId);
 		queryWrapper.eq("person_id",person.getPersonId());
 		List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
-		//查询是否报名了分享活动
+		//查询是否报名了拼团活动
 		QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
 		taShareRecordQueryWrapper.eq("org_id",orgId);
 		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
 		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
 		//判断是否报名了助力活动
-		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-		helpRecordQueryWrapper.eq("org_id",orgId);
-		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
-		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
+		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
+		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
 		
 		//分页获取全部数据
 		Page pg = new Page(pageNumber,pageSize);
@@ -95,7 +95,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
 				e.setSuccessNum(taShareRecordsList.size());
 			}else if (e.getType().equals("help")){
-				helpRecords.forEach(help -> {
+				HelpInitiateRecords.forEach(help -> {
 					if (e.getId().equals(help.getHelpActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}

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

@@ -429,4 +429,22 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    
+    /**
+     * 消息通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_NOTICE = "notice";
+    
+    /**
+     * 助力通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_HELP = "help.result";
+    
+    /**
+     * 拼团通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_GROUP = "group.result";
 }

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

@@ -472,6 +472,11 @@ public class HelpActivityController extends BaseController {
                 helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
                 helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
                 List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                helpRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
         
                 map.put("helpInitiateRecord",helpInitiateRecord);
                 map.put("helpRecordList",helpRecordList);

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

@@ -357,7 +357,19 @@ public class MiniAppController extends BaseController {
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
         }
-
+//        else{
+//            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+//            taRecommendCustomer.setPersonId(person.getPersonId());
+//            taRecommendCustomer.setPicture(person.getAvatarurl());
+//            taRecommendCustomer.setCountry(person.getCountry());
+//            taRecommendCustomer.setCity(person.getCity());
+//            taRecommendCustomer.setProvince(person.getProvince());
+//            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+//            taRecommendCustomer.setOrgId(getOrgId(request));
+//            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
+//            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
+//
+//        }
         return ResponseBean.success(phoneNoInfo);
     }
 

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

@@ -348,6 +348,11 @@ public class TaShareActivityController extends BaseController {
                 childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                 childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
                 List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                shareChildRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
                 map.put("shareChildRecordList",shareChildRecordList);
             }
     

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

@@ -52,21 +52,19 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 总用户数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType}")
-    Integer selectUserCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')")
+    Integer selectUserCount(@Param("org") Integer orgId);
 
     /**
      * 总注册数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and phone is not null")
-    Integer selectRegisteredCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
+    Integer selectRegisteredCount(@Param("org") Integer orgId);
 
     /**
      * 根据时间段查询
@@ -115,11 +113,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      *
      *  据说 1 男  2 女
      *
-     * @param personType
      * @return
      */
-    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and gender = #{gender}")
-    Integer selectSexUser(@Param("org") Integer orgId, @Param("personType") String personType, @Param("gender") Integer gender);
+    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')  and gender = #{gender}")
+    Integer selectSexUser(@Param("org") Integer orgId, @Param("gender") Integer gender);
 
 
     /**
@@ -140,10 +137,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
             "on a.city = b.id " +
             "WHERE " +
             "   a.org_id = #{org} " +
-            "	AND ifnull(a.person_type, '') != #{personType} " +
+            "	AND a.person_type IN ('customer','drift','estate agent')  " +
             "GROUP BY " +
             "	a.city ")
-    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId, @Param("personType") String personType);
+    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId);
 
 
     // ------------- 用户来源 start ------------

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

@@ -44,7 +44,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaRecommendCustomer> page, @Param("buildingId") String buildingId, @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);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @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/impl/MiniAppServiceImpl.java

@@ -82,7 +82,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
         data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
 
-        sendMessage("notice", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
     }
     
     @Override
@@ -92,7 +92,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("help.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
     }
     
     @Override
@@ -102,7 +102,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("group.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
     }
 
     @Override

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

@@ -52,10 +52,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Map<String,Object> map = new HashMap<>();
 
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
         // 最近七天
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
@@ -71,8 +71,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -84,7 +84,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         selectSexUser.add(selectSexFemaleMap);
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
 
         // 转化率, 当前 默认项目收藏
         Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical(orgId, "save");
@@ -235,10 +235,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
             case CommConstant.AUTHORIZATION_PHONE:
                 // 总用户数
-                Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
                 // 注册数
-                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
                 Map<String, Object> userMap = new HashMap<>();
                 userMap.put("pvNum", selectUserCount);
                 userMap.put("registeredCount", selectRegisteredCount);
@@ -284,7 +284,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectUserCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserCount", selectUserCount);
         responseBean.addSuccess(map);
@@ -295,7 +295,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectRegisteredCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectRegisteredCount", selectRegisteredCount);
         responseBean.addSuccess(map);
@@ -319,8 +319,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -342,7 +342,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         ResponseBean responseBean = new ResponseBean();
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectCityUser", selectCityUser);
         responseBean.addSuccess(map);

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

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

src/main/resources/mapper/TaPersonMapper.xml

@@ -157,7 +157,7 @@ FROM
         FROM
         ta_person tp
         where tp.org_id = #{org} AND
-          ifnull(tp.person_type, '') != #{personType}
+        tp.person_type IN ('customer','drift','estate agent')
 
         <if test="startDate != null or endDate != null">
             AND  tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -196,7 +196,7 @@ FROM
             FROM
               ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+            where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
             <if test="buildingId != null and buildingId != ''">
                 and tpvr.building_id = #{buildingId}
             </if>
@@ -254,7 +254,7 @@ FROM
              LEFT JOIN
             ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
-             where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+             where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )
         ) AS temp ON
         <if test="dateType == 'month'.toString()">
@@ -297,7 +297,7 @@ FROM
                         tp.create_date as create_date
                     FROM
                       ta_person tp
-                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
+                    where tp.person_type IN ('customer','drift','estate agent') and tp.org_id = #{orgId}
                     and tp.phone is NOT NULL
                     <if test="startDate != null or endDate != null">
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -335,7 +335,7 @@ FROM
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
+                where tp.person_type IN ('customer','drift','estate agent') and tp.org_id = #{orgId}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>
@@ -355,8 +355,7 @@ FROM
     <select id="selectUserSourcePie" resultType="integer">
         select count(1)
         FROM ta_person
-        WHERE org_id = #{org} AND
-          ifnull(person_type, '') != #{personType}
+        WHERE org_id = #{org} AND person_type IN ('customer','drift','estate agent')
         <if test="recommendPersonType != null and recommendPersonType != ''">
             and recommend_person_type = #{recommendPersonType}
         </if>
@@ -373,7 +372,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code and tps.phone is NOT NULL
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != #{personType}
+            and tps.person_type IN ('customer','drift','estate agent')
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
@@ -389,7 +388,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != #{personType}
+            and tps.person_type IN ('customer','drift','estate agent')
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
@@ -401,7 +400,7 @@ FROM
         FROM td_person_from tpf
         LEFT JOIN ta_person tp
         ON tp.from_code = tpf.from_code
-        where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+        where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
         GROUP BY tpf.from_code
     </select>
 
@@ -445,7 +444,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != 'Realty Consultant'
+            and tps.person_type IN ('customer','drift','estate agent')
             AND tps.create_date BETWEEN #{startDate} AND #{endDate}
 
             GROUP BY tpfs.from_code
@@ -463,7 +462,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
                 AND tps.org_id = #{org}
-                and ifnull(tps.person_type, '') != 'Realty Consultant'
+                and tps.person_type IN ('customer','drift','estate agent')
                 AND tps.create_date BETWEEN #{startDate} AND #{endDate}
                 and tps.phone is not null
             GROUP BY tpfs.from_code

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -203,11 +203,35 @@ FROM
 	WHERE a.customer_id = #{customerId}
     </select>
 
-    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
-        select * from
-        ta_recommend_customer ta
-        WHERE (ta.realty_consultant is NULL OR ta.realty_consultant = '')
-        order by ta.create_date desc
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+                b.*
+                FROM
+                ta_person b
+               <where>
+                    b.status > 0
+                   AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+                    <if test="name != null and name !=''">
+                        and b.nickname like CONCAT('%',#{name}, '%')
+                    </if>
+                    <if test="tel != null and tel!=''">
+                        and b.phone like CONCAT('%',#{tel}, '%')
+                    </if>
+                    <if test="entryType != null and entryType !=''">
+                        and b.entry_type = #{entryType}
+                    </if>
+                    <if test="sex != null and sex !=''">
+                        and b.sex = #{sex}
+                    </if>
+                    <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
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">