私客 公客

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

@@ -24,7 +24,7 @@ public class CommConstant {
     public final static String PERSON_ESTATE_CUSTOMER = "customer";
 
     /**
-     * 人员类型: 客户
+     * 人员类型: 渠道经纪人
      */
     public final static String PERSON_ESTATE_CHANNEL = "channel agent";
 
@@ -363,4 +363,9 @@ public class CommConstant {
     public static final Integer NOT_PUBLISH = 0;
     // ------- 政策发布状态 end -------
 
+    // 公客
+    public static final String CUTOMER_TYPE_PUBLIC = "public";
+    // 私客
+    public static final String CUTOMER_TYPE_PRIVATE = "private";
+
 }

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

@@ -147,7 +147,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    // 客户列表
+    // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
     public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
@@ -158,9 +158,10 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex){
+                                         @RequestParam(value = "sex",required = false)Integer sex,
+                                         @RequestParam(value = "customerType") String customerType){ // public 公  private 私
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -211,14 +212,21 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
 
-    //独立经纪人列表
+    /**
+     * 经纪人列表
+     * @param name
+     * @param tel
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
     @GetMapping("/admin/customer/agents")
     public ResponseBean getIndependentAgents (@RequestParam(value ="name",required = false) String name,
                                             @RequestParam(value ="tel",required = false) String tel,
                                             @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, null));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -246,4 +246,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private TaOrg org;
+
+    /**
+     * 渠道名称
+     */
+    @TableField(exist = false)
+    private String channelName;
 }

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

@@ -29,5 +29,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
+
+    /**
+     * 公客
+     * @param page
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @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);
 }

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

@@ -28,13 +28,13 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId);

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

@@ -330,15 +330,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType){
+
+        IPage<TaRecommendCustomer> customerList = null;
+        if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+            // 公客
+            IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex);
+        } else {
+            // 私客
+            IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex);
+        }
+
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel){
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId){
         IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel);
+        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel, orgId);
     }
 
     @Override

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -73,23 +73,29 @@ FROM
 
     <select id="getIndependentAgents" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-	a.*
-FROM
-	ta_person a
-<where>
-    a.person_type = 'estate agent'
-    and a.status >0
-    <if test="name != null and name !=''">
-        and a.nickname = #{name}
-    </if>
-    <if test="tel != null and tel!=''">
-        and a.phone = #{tel}
-    </if>
+            a.*,
+            tc.channel_name as channelName
+        FROM
+            ta_person a
+            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'
+            and a.status >0
+            <if test="name != null and name !=''">
+                and a.nickname = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone = #{tel}
+            </if>
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
 
-</where>
+        </where>
 
-ORDER BY
-	create_date DESC
+        ORDER BY
+            create_date DESC
     </select>
 
     <select id="getRepCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -145,6 +151,7 @@ ORDER BY
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
+            and realty_consultant is not null
             <if test="building != null and building !=''">
                 and a.building_id = #{building}
             </if>
@@ -181,4 +188,29 @@ FROM
 	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
 	WHERE a.customer_id = #{customerId}
     </select>
+
+    <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 = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone = #{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>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+    </select>
 </mapper>