change Customer

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

@@ -154,4 +154,19 @@ public class CommConstant {
 
     //=================  首屏广告 / 轮播图 end =======================
 
+    //=================  客户入口类型 start =======================
+    /*
+    * 自主进入
+    * */
+    public static final String ENTRY_VOLUNTEER = "volunteer";
+    /*
+    添加
+    */
+    public static final String ENTRY_INPUT = "input";
+    /*
+    * 报备
+    * */
+    public static final String ENTRY_VERIFY = "verify";
+    //=================  客户入口类型 end =======================
+
 }

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

@@ -126,6 +126,7 @@ public class TaPointsRecordsController extends BaseController {
     public ResponseBean taPointsRecordsUpdate(@PathVariable Integer id,
                                         @RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
+        taPointsRecords.setPointsRecordId(id);
         try {
             if (iTaPointsRecordsService.updateById(taPointsRecords)){
                 responseBean.addSuccess(taPointsRecords);
@@ -185,4 +186,30 @@ public class TaPointsRecordsController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
+    public ResponseBean CustomerPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            String id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",taPersonService.getPersonIdByCustomerId(id));
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -112,9 +112,11 @@ public class TaRecommendCustomerController extends BaseController {
                                          @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 ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/entity/TaPointsRecords.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 lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -80,5 +81,8 @@ public class TaPointsRecords implements Serializable {
      */
     private Integer status;
 
+    @TableField(exist = false)
+    private Integer totalPoints;
+
 
 }

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

@@ -139,6 +139,8 @@ public class TaRecommendCustomer implements Serializable {
 
     private String city;
 
+    private String entryType;
+
     @TableField(exist = false)
     private List<TaPersonVisitRecord> visitRecords;
 

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

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPointsRecords;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
+    IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
 
 }

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

@@ -25,7 +25,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);
+    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);
 
 
 }

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

@@ -54,5 +54,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
 
+    String getPersonIdByCustomerId(String customerId);
+
 
 }

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

@@ -25,7 +25,7 @@ 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);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus);
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 

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

@@ -634,4 +634,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }
+
+    @Override
+    public String getPersonIdByCustomerId(String customerId){
+        return taRecommendCustomerMapper.getCustomerPersonId(customerId);
+    }
 }

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

@@ -246,9 +246,9 @@ 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){
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus);
     }
 
     @Override

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -56,6 +56,13 @@ FROM
         <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>
+
     </where>
     </select>
     <select id="getCustomerById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">