Merge remote-tracking branch 'origin/master'

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

@@ -132,6 +132,56 @@ public class TaRecommendCustomerController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+    @GetMapping("/admin/customer/recommend/recommender")
+    public ResponseBean getRecCustomerList (@RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="recommendName",required = false) String recommendName,
+                                         @RequestParam(value ="recommendTel",required = false) String recommendTel,
+                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                         @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){
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+    @GetMapping("/admin/customer/recommend/report")
+    public ResponseBean getRepCustomerList (@RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
+                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                         @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){
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @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));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
 
     @GetMapping("/admin/customer/recommend/{customerId}")
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,6 +27,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
     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);
 }

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

@@ -24,10 +24,19 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean recommendCust(String paramStr, String openid);
 
+    ResponseBean reportCust(String paramStr, String openid);
+
     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> 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);
+
+
     TaRecommendCustomer getCustomerDetail(String customerId);
 
     TaRecommendCustomer getCustomerById(String customerId);

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

@@ -183,8 +183,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
 
-        // 报备日期是今天
-        taRecommendCustomer.setReportDate(LocalDateTime.now());
 
         String status = params.getString("status");
         if (null == status) status = "1";
@@ -195,10 +193,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name", taRecommendCustomer.getName());
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
-        queryWrapper.ge("report_date", LocalDateTime.now().minusDays(10));
+        queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
-            return ResponseBean.error("当前客户尚在保护期, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
@@ -206,6 +204,83 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             return ResponseBean.error("推荐客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+//        // 找到销售经理，并推送消息
+//        TaPerson saleMan = taPersonMapper.getSalesExecutive();
+//        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
+//            // 发送消息
+//            iMiniAppService.sendNewCustomerMessage(saleMan.getMiniOpenid(), CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
+//        }
+
+        return ResponseBean.success(taRecommendCustomer);
+    }
+
+
+
+    @Override
+    public ResponseBean reportCust(String paramStr, String openid) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson taPerson = taPersons.get(0);
+
+        String checkResult = checkCustomerParams(params);
+        if (null != checkResult) {
+            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+
+        taRecommendCustomer.setName(params.getString("name"));
+        taRecommendCustomer.setPicture(params.getString("picture"));
+        taRecommendCustomer.setPhone(params.getString("phone"));
+        taRecommendCustomer.setSex(params.getInteger("sex"));
+        taRecommendCustomer.setDescribe(params.getString("describe"));
+        taRecommendCustomer.setRealtyConsultant(params.getString("RealtyConsultant"));
+        taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
+        taRecommendCustomer.setCreateDate(LocalDateTime.now());
+
+        // 时间格式 yyyy-MM-dd
+        String at = params.getString("appointmentTime");
+        if (!StringUtils.isEmpty(at)) {
+            taRecommendCustomer.setAppointmentTime(DateUtils.day2LocalDateime(at));
+        }
+
+//        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
+        taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
+        taRecommendCustomer.setIntention(params.getString("intention"));
+        taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
+        taRecommendCustomer.setDemandType(params.getString("demandType"));
+        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
+        taRecommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+
+
+        String status = params.getString("status");
+        if (null == status) status = "1";
+        taRecommendCustomer.setStatus(status);
+        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
+
+        // 报备有 10 天有效期
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", taRecommendCustomer.getName());
+        queryWrapper.eq("phone", taRecommendCustomer.getPhone());
+        queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
+        if (null != result && result.size() > 0) {
+            return ResponseBean.error("当前客户已被报备, 不能再次报备", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
+        if (row < 1) {
+            return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         // 找到销售经理，并推送消息
         TaPerson saleMan = taPersonMapper.getSalesExecutive();
         if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
@@ -256,6 +331,24 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         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){
+        IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel);
+    }
+
+    @Override
+    public 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>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer> getRepCustomerList(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);
+    }
+
     @Override
     public TaRecommendCustomer getCustomerById(String customerId){
         return taRecommendCustomerMapper.getCustomerById(customerId);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -31,20 +31,18 @@ FROM
 	GROUP BY a.customer_id
     </select>
 
-    <select id="getCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+    <select id="getRecCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
-	a.*,
-	a.customer_id as customerId,
-	b.name as consultantName,
-    b.tel as consultTel,
-    c.nickname as recommendName,
-    c.tel as recommendTel
-FROM
-	ta_recommend_customer a
-	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-    LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        a.*,
+        a.customer_id as customerId,
+        c.phone as recommendTel,
+        c.nickname as recommendName
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
 	<where>
         a.status > 0
+        and a.report_recommend_status = 2
         <if test="building != null and building !=''">
             and a.building_id = #{building}
         </if>
@@ -55,10 +53,10 @@ FROM
             and a.phone = #{tel}
         </if>
         <if test="consultName != null and consultName !=''">
-            and b.name like CONCAT('%',#{consultName}, '%')
+            and c.nickname like CONCAT('%',#{consultName}, '%')
         </if>
         <if test="consultTel != null and consultTel !=''">
-            and b.tel = #{consultTel}
+            and c.phone = #{consultTel}
         </if>
         <if test="entryType != null and entryType !=''">
             and a.entry_type = #{entryType}
@@ -69,8 +67,110 @@ FROM
         <if test="sex != null and sex !=''">
             and a.sex = #{sex}
         </if>
-
     </where>
+        order by a.create_date desc
+    </select>
+
+    <select id="getIndependentAgents" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+	*
+FROM
+	ta_person
+<where>
+    person_type = 'estate agent'
+    and status >0
+    <if test="name != null and name !=''">
+        and a.nickname = #{name}
+    </if>
+    <if test="tel != null and tel!=''">
+        and a.phone = #{tel}
+    </if>
+
+</where>
+
+ORDER BY
+	create_date DESC
+    </select>
+
+    <select id="getRepCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+        a.*,
+        a.customer_id AS customerId,
+        b.NAME AS consultantName,
+        b.tel AS consultTel
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        <where>
+            a.status > 0
+            and a.report_recommend_status = 1
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone = #{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}
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+        </where>
+        order by a.create_date desc
+    </select>
+    <select id="getCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+        a.*,
+        a.customer_id as customerId,
+        b.name as consultantName,
+        b.tel as consultTel,
+        c.nickname as recommendName,
+        c.tel as recommendTel
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone = #{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}
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+        </where>
+        order by a.create_date desc
     </select>
     <select id="getCustomerById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
          SELECT