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

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.activity.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.activity.service.ActivityServiceI;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +33,9 @@ public class ActivityController extends BaseController {
 	@Autowired
 	private ITaPersonService taPersonService;
 	
+	@Autowired
+	ITaRecommendCustomerService taRecommendCustomerService;
+	
 	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
 	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
 	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
@@ -47,4 +53,29 @@ public class ActivityController extends BaseController {
 		
 		return responseBean;
 	}
+	
+	@RequestMapping(value = "/wx/customer/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxActivityList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "customerId") String customerId,
+	                                           HttpServletRequest request){
+		ResponseBean  responseBean = new ResponseBean();
+		Integer orgId = getOrgId(request);
+		//查找客户信息
+		QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("customer_id",customerId);
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
+		if (null == taRecommendCustomer){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if (null == taRecommendCustomer.getPersonId()){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
+		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
+		return responseBean;
+	}
 }

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -6,8 +6,18 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface ActivityMapper {
 	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
+	
+	/**
+	 * 获取客户参与的活动列表
+	 * @param pg
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	List<Map<String,Object>> getCustomerActivityList(Page pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -14,4 +14,14 @@ public interface ActivityServiceI {
 	 * @return
 	 */
 	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
+	
+	/**
+	 * 获取客户参加的活动信息
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
 }

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -113,4 +114,22 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		pg.setRecords(list);
 		return ResponseBean.success(pg);
 	}
+	
+	/**
+	 * 获取客户参加的活动信息
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Map<String, Object>> customerActivityList = activityMapper.getCustomerActivityList(pg, orgId, person.getPersonId());
+		pg.setRecords(customerActivityList);
+		return ResponseBean.success(pg);
+	}
 }

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

@@ -236,10 +236,12 @@ public class TaBuildingController extends BaseController {
     @ApiOperation(value = "依据项目ID 查户型", notes = "依据项目ID 查户型")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目ID"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "apartmentType", value = "类型"),
     })
     @RequestMapping(value = "/admin/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
-    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id){
-        return taBuildingService.buildingApartmentBuildingId(id);
+    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id,
+                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType){
+        return taBuildingService.buildingApartmentBuildingId(id, apartmentType);
     }
 
     /**

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

@@ -200,4 +200,25 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+    
+    /**
+     * 盘客工具分页获取访问记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "customerId") String customerId){
+        try {
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 }

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

@@ -765,5 +765,60 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     }
-
+    
+    /**
+     * 查询判客工具下的我的客户人数集合
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/statistics")
+    @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
+    public ResponseBean getMyCustStatistics(HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustStatistics(openid);
+    }
+    
+    /**
+     * 分页查询判客工具下的我的客户跟进人集合
+     *  根据type区分  follow 跟进  clinch 成交
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/{type}")
+    @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
+    public ResponseBean getMyCustFollows(@PathVariable(value = "type") String type,
+                                         @RequestParam(value = "pageNumber",defaultValue = "0") Integer pageNumber,
+                                         @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "name",required = false) String name,
+                                         @RequestParam(value = "phone",required = false) String phone,
+                                         @RequestParam(value = "status",required = false) Integer status,HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status);
+    }
+    
+    /**
+     * 查询盘客工具下我的客户详情
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/{customerId}")
+    @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
+    public ResponseBean getMyCustDetail(@PathVariable(value = "customerId") String customerId,HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustDetail(customerId,openid);
+    }
+    
+    /**
+     * 查询盘客工具下编辑基本信息
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/inventory/customer/{customerId}")
+    @ApiOperation(value = "编辑客户信息", notes = "编辑客户信息")
+    public ResponseBean updateMyCustDetail(@PathVariable(value = "customerId") String customerId,
+                                           @RequestBody TaRecommendCustomer taRecommendCustomer, HttpServletRequest request) {
+        String openid = getOpenId(request);
+        taRecommendCustomer.setCustomerId(customerId);
+        return taRecommendCustomerService.updateMyCust(taRecommendCustomer,openid);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaUv;
@@ -11,6 +12,9 @@ import org.springframework.web.bind.annotation.*;
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,4 +44,39 @@ public class TaUvController extends BaseController {
 
         return taUvService.getListOf(id, typeOf, pageNumber, pageSize);
     }
+
+
+    /**
+     * 测试：重复插入数据 ta_uv 表
+     */
+    //@RequestMapping(value = "/admin/test/uv", method = RequestMethod.GET)
+    public  ResponseBean testUv(HttpServletRequest request, @RequestParam("beUv") String beUv, @RequestParam("num") Integer num){
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("be_uv", beUv);
+        queryWrapper.eq("tagert_type", "project");
+        List<TaUv> list = taUvService.list(queryWrapper);
+
+//        TaUv uv = new TaUv();
+//        uv.setPersonId("8a79cdad85182211abeab6adcafd5830");
+//        uv.setNameOrnick("党党");
+//        uv.setPhotoOravatar("https://wx.qlogo.cn/mmopen/vi_32/ywmrMa0pkIVrPwNAedLt58eKMlicQSHce2M0TUBJFdFIH5pYPPMVfbKJHJJNicDfVrfRVuGXpn3xseJCTTT5nqibg/132");
+//        uv.setBeUv("2dd1dadd467751adcc106cb7cb1ab76d");
+//        uv.setTagertType("project");
+//        uv.setCreateDate(LocalDateTime.of(2019, 9, 9, 10, 10));
+//        taUvService.save(uv);
+
+        int i = 0;
+        for (int t = 0; t < num; t++) {
+            List<TaUv> collect = list.stream().map(e -> {
+                e.setCreateDate(LocalDateTime.of(2019, 9, 9, 10, 10));
+                e.setUvId(null);
+                return e;
+            }).collect(Collectors.toList());
+
+            taUvService.saveBatch(collect);
+        }
+
+        return responseBean;
+    }
 }

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

@@ -107,9 +107,14 @@ public class HelpActivity implements Serializable {
     private String img;
 
     /**
-     * 列表图
+     * 助力封面图1,用于活动列表
      */
-    private String detailImg;
+    private String listImg;
+
+    /**
+     * 助力封面图2,用于首页底部活动轮播
+     */
+    private String bannerListImg;
 
     /**
      * 城市ID

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

@@ -198,7 +198,10 @@ public class TaBuilding implements Serializable {
      */
     private Integer mapScope;
 
-
+    /**
+     * 地图数据
+     */
+    private String mapJson;
 
     /**
      * 图片

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

@@ -47,7 +47,7 @@ public class TaBuildingDynamic implements Serializable {
     /**
      * 首页详情图片URL
      */
-    private String detailImgUrl;
+    private String listImgUrl;
 
     /**
      * 标题

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

@@ -101,5 +101,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private Integer accessCount;
+    
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
 
 }

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

@@ -51,9 +51,14 @@ public class TaShareActivity implements Serializable {
     private String mainImg;
 
     /**
-     * 活动列表图
+     * 拼团封面图1，用于活动列表
      */
-    private String detailImg;
+    private String listImg;
+
+    /**
+     * 拼团封面图2,用于首页底部活动轮播
+     */
+    private String bannerListImg;
 
     /**
      * 活动开始时间

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

@@ -49,7 +49,13 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     @ResultType(TaPersonVisitRecord.class)
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId} and org_id = #{orgId} ")
     List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId, @Param("orgId") Integer orgId);
-
-
-
+    
+    
+    /**
+     * 获取用户行为列表
+     * @param pg
+     * @param personId
+     * @return
+     */
+	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg,@Param("personId") String personId);
 }

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -150,7 +151,35 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @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, @Param("orgId") Integer orgId, @Param("status")Integer status);
+    
+    /**
+     * 获取我的客户的人数统计
+     * @param personId
+     * @param userId
+     * @return
+     */
+	List<Map<String, Object>> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+    
+    /**
+     * 获取我的跟进客户数据
+     * @param page
+     * @param personId
+     * @param userId
+     * @param orgId
+     * @param type
+     * @param name
+     * @param phone
+     * @param status
+     * @return
+     */
+    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status);
+    
+    /**
+     * 获取我的客户详情数据
+     * @param customerId
+     * @return
+     */
+    TaRecommendCustomer getMyCustDetailById(String customerId);
 
     List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
-
 }

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

@@ -90,7 +90,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
     ResponseBean buildingApartmentAdd(String parameter);
 
     /**
-     * 户型添加
+     * 户型修改
      * @param parameter
      * @return
      */
@@ -141,7 +141,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingApartmentBuildingId(String id);
+    ResponseBean buildingApartmentBuildingId(String id, String apartmentType);
 
     /**
      * 户型删除

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

@@ -15,6 +15,13 @@ import com.huiju.estateagents.entity.TaPersonVisitRecord;
  * @since 2019-07-23
  */
 public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecord> {
+	/**
+	 * 分页获取客户访问记录
+	 * @param pg
+	 * @param customerId
+	 * @return
+	 */
+	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId);
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);
 }

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

@@ -97,5 +97,39 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
-
+    
+    /**
+     * 查询我的客户人数集合
+     * @param openid
+     * @return
+     */
+    ResponseBean getMyCustStatistics(String openid);
+    
+    /**
+     * 分页查询我的跟进客户集合
+     * @param pageNumber
+     * @param pageSize
+     * @param openid
+     * @param name
+     * @param phone
+     * @param status
+     * @return
+     */
+    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status);
+    
+    /**
+     * 获取盘客工具下我的客户详情
+     * @param customerId
+     * @param openid
+     * @return
+     */
+    ResponseBean getMyCustDetail(String customerId, String openid);
+    
+    /**
+     * 更新我的客户基本信息
+     * @param taRecommendCustomer
+     * @param openid
+     * @return
+     */
+    ResponseBean updateMyCust(TaRecommendCustomer taRecommendCustomer, String openid);
 }

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

@@ -173,6 +173,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
 //        buildingDynamic.setDynamicId(idGen.nextId()+"");
         buildingDynamic.setBuildingId(map.get("buildingId")+"");
         buildingDynamic.setImgUrl((String) map.get("imgUrl"));
+        buildingDynamic.setListImgUrl((String) map.get("listImgUrl"));
         buildingDynamic.setDesc(map.get("desc")+"");
         buildingDynamic.setUrl(map.get("url")+"");
         buildingDynamic.setTitle(map.get("title")+"");
@@ -207,6 +208,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamic.setDynamicId(map.get("dynamicId")+"");
         buildingDynamic.setBuildingId(map.get("buildingId")+"");
         buildingDynamic.setImgUrl((String) map.get("imgUrl"));
+        buildingDynamic.setListImgUrl((String) map.get("listImgUrl"));
         buildingDynamic.setDesc(map.get("desc")+"");
         buildingDynamic.setUrl(map.get("url")+"");
         buildingDynamic.setTitle(map.get("title")+"");

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

@@ -625,12 +625,29 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingApartmentBuildingId(String id) {
+    public ResponseBean buildingApartmentBuildingId(String id, String apartmentType) {
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", id);
         buildingApartmentQueryWrapper.eq("status",1);
+        buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType),"apartment_type",apartmentType);
         buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartment= taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
+        buildingApartment.forEach(e -> {
+            QueryWrapper<TaApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
+            ApartmentImgQueryWrapper.eq("apartment_id", e.getApartmentId());
+            List<TaApartmentImg> buildingImg= taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+
+            List<TaBuildingImg> buildingImag = buildingImg.stream().map(img -> {
+                QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", img.getImgId());
+                buildingImgQueryWrapper.eq("img_type", "aparment");
+                return taBuildingImgMapper.selectOne(buildingImgQueryWrapper);
+            }).collect(Collectors.toList());
+
+            e.setBuildingImgList(buildingImag);
+
+        });
+
         return ResponseBean.success(buildingApartment);
     }
 

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

@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务实现类
@@ -20,6 +24,26 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRecordMapper, TaPersonVisitRecord> implements ITaPersonVisitRecordService {
+	
+	@Autowired
+	private TaRecommendCustomerMapper taRecommendCustomerMapper;
+	
+	@Autowired
+	private TaPersonVisitRecordMapper personVisitRecordMapper;
+	
+	/**
+	 * 分页获取客户访问记录
+	 *
+	 * @param pg
+	 * @param customerId
+	 * @return
+	 */
+	@Override
+	public IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId) {
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(customerId);
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
+		return result;
+	}
 //    @Autowired
 //    private TaPersonMapper taPersonMapper;
 //    @Autowired

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

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.service.impl;
 
-import ch.qos.logback.core.status.StatusUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -20,10 +19,11 @@ import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
+import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.naming.spi.ResolveResult;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -60,6 +60,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Autowired
     private TdCityMapper cityMapper;
+    
+    @Autowired
+    private TaCustomerFollowUpRecordMapper customerFollowUpRecordMapper;
 
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
@@ -583,4 +586,105 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
         return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
     }
+    
+    /**
+     * 查询我的客户人数集合
+     *
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean getMyCustStatistics(String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        List<Map<String,Object>> list = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId());
+        return ResponseBean.success(list);
+    }
+    
+    /**
+     * 分页查询我的跟进客户集合
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param openid
+     * @param name
+     * @param phone
+     * @param status
+     * @return
+     */
+    @Override
+    public ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        
+        IPage<TaRecommendCustomer> page = new Page<>();
+        page.setCurrent(pageNumber);
+        page.setSize(pageSize);
+        
+        //分页获取跟进客户status != 4的为跟进客户， status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status);
+        return ResponseBean.success(result);
+    }
+    
+    /**
+     * 获取盘客工具下我的客户详情
+     *
+     * @param customerId
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean getMyCustDetail(String customerId, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getMyCustDetailById(customerId);
+        //添加跟进行为
+        addCustomerFpllowUp(taPerson,taRecommendCustomer,"查看客户详情");
+        return ResponseBean.success(taRecommendCustomer);
+    }
+    
+    /**
+     * 更新我的客户基本信息
+     *
+     * @param taRecommendCustomer
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean updateMyCust(TaRecommendCustomer taRecommendCustomer, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        taRecommendCustomerMapper.updateById(taRecommendCustomer);
+        //添加跟进行为
+        addCustomerFpllowUp(taPerson,taRecommendCustomer,"编辑客户信息");
+        return ResponseBean.success(taRecommendCustomer);
+    }
+    
+    //添加跟进行为
+    private void addCustomerFpllowUp(TaPerson taPerson,TaRecommendCustomer taRecommendCustomer,String recordType) {
+        TaCustomerFollowUpRecord taCustomerFollowUpRecord = new TaCustomerFollowUpRecord();
+        taCustomerFollowUpRecord.setOrgId(taPerson.getOrgId());
+        taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());
+        taCustomerFollowUpRecord.setCustomerId(taRecommendCustomer.getCustomerId());
+        taCustomerFollowUpRecord.setRecordType(recordType);
+        taCustomerFollowUpRecord.setFollowerId(taPerson.getPersonId());
+        taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
+        customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
+    }
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
 import com.huiju.estateagents.statistic.service.ITaCustomerFollowUpRecordService;
 import org.slf4j.Logger;
@@ -18,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 跟进记录表 小程序盘客工具我的客户跟进记录信息 前端控制器
@@ -27,14 +32,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerFollowUpRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerFollowUpRecordController.class);
 
     @Autowired
     public ITaCustomerFollowUpRecordService iTaCustomerFollowUpRecordService;
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
     /**
      * 分页查询列表
@@ -146,4 +153,72 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 盘客工具添加跟进记录
+     * @param taCustomerFollowUpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.POST)
+    public ResponseBean wxCustomerFollowUpRecordAdd(@RequestBody TaCustomerFollowUpRecord taCustomerFollowUpRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        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);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            taCustomerFollowUpRecord.setFollowerId(person.getPersonId());
+            if (iTaCustomerFollowUpRecordService.save(taCustomerFollowUpRecord)){
+                responseBean.addSuccess(taCustomerFollowUpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 分页查询跟进记录列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.GET)
+    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value ="customerId",required = true) Integer customerId,
+                                                     HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        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);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            //使用分页插件
+            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerFollowUpRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("follower_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("customer_id",customerId);
+            queryWrapper.orderByDesc("create_date");
+            
+            IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerFollowUpRecord.java

@@ -58,7 +58,7 @@ public class TaCustomerFollowUpRecord implements Serializable {
     /**
      * 跟进人ID
      */
-    private Integer followerId;
+    private String followerId;
     
     /**
      * 客户性别

src/main/resources/mapper/Activity.xml

@@ -25,4 +25,80 @@
         </if>
         ORDER BY weight desc,activity_status,start_date
     </select>
+    <select id="getCustomerActivityList" resultType="java.util.Map">
+        SELECT
+            t.enlist_id AS id,
+            t.dynamic_id AS activityId,
+            t.create_date AS createDate,
+            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
+            d.img_url AS mainImg,
+            d.title,
+            d.start_date AS startDate,
+            d.enlist_end AS endDate,
+            'dynamic' AS type
+        FROM
+            ta_activity_dynamic_enlist t
+            LEFT JOIN ta_building_dynamic d ON t.dynamic_id = d.dynamic_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.record_id AS id,
+            t.group_activity_id AS activityId,
+            t.create_time AS createDate,
+        CASE
+            WHEN t.STATUS = 1 THEN
+            "进行中"
+            WHEN t.STATUS = 0
+            AND t.verification_status = 1 THEN
+            "成功已核销"
+        WHEN t.STATUS = 0
+        AND t.verification_status != 1 THEN
+        "成功未核销"
+        WHEN t.STATUS = 2 THEN
+        "失败"
+        END `status`,
+            d.main_img AS mainImg,
+            d.activity_name AS title,
+            d.start_time AS startDate,
+            d.end_time AS endDate,
+            'group' AS type
+        FROM
+            ta_share_record t
+            LEFT JOIN ta_share_activity d ON t.group_activity_id = d.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.help_record_initiate_id AS id,
+            t.help_activity_id AS activityId,
+            t.create_date AS createDate,
+        CASE
+                WHEN t.STATUS = 1 THEN
+                "进行中"
+                WHEN t.STATUS = 0
+                AND t.verification_status = 1 THEN
+                    "成功已核销"
+                    WHEN t.STATUS = 0
+                    AND t.verification_status != 1 THEN
+                        "成功未核销"
+                        WHEN t.STATUS = 2 THEN
+                        "失败"
+                    END `status`,
+            d.img AS mainImg,
+            d.title,
+            d.start_date AS startDate,
+            d.end_date AS endDate,
+            'help' AS type
+        FROM
+            ta_help_initiate_record t
+            LEFT JOIN ta_help_activity d ON t.help_activity_id = d.help_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+        ORDER BY
+        createDate DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -49,5 +49,17 @@
         GROUP BY tpvr.person_id, tpvr.event
         ORDER BY 	accessCount DESC,tpvr.visit_time DESC
     </select>
+    <select id="getPersonVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            b.building_name
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_building b ON t.building_id = b.building_id
+        WHERE
+            t.person_id = #{personId}
+        ORDER BY
+            t.visit_time DESC
+    </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -230,7 +230,7 @@ FROM
             b.status > 0
             and b.org_id = #{orgId}
             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id ！= ''  )
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
             <if test="name != null and name !=''">
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
@@ -605,19 +605,63 @@ FROM
         limit #{pageCode}, #{pageSize}
     </select>
 
+    <select id="getMyCustStatistics" resultType="java.util.Map">
+        SELECT
+            sum( IF ( STATUS = 4, 1, 0 ) ) AS followSum,
+            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS clinchSum
+        FROM
+            ta_recommend_customer
+        WHERE
+            org_id = #{orgId}
+        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+    </select>
+
+    <select id="getMyCustFollowOrClinch" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+            *
+        FROM
+            ta_recommend_customer
+        WHERE
+            org_id = #{orgId}
+        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+        <if test="type == 'follow'">
+          AND STATUS != 4
+            <if test="name != null and name !=''">
+                and `name` like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="phone != null and phone !=''">
+                and phone like CONCAT('%',#{phone}, '%')
+            </if>
+            <if test="status != null and status !=''">
+                and status = #{status}
+            </if>
+        </if>
+        <if test="type == 'clinch'">
+          AND STATUS = 4
+        </if>
+    </select>
+
+    <select id="getMyCustDetailById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+            *
+        FROM
+            ta_recommend_customer
+        where customer_id = #{customerId}
+    </select>
+
     <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
         SELECT
-	SUM( intention ) AS intention,
-	building_id,
-	building_name
-FROM
-	`ta_person_intention_record`
-WHERE
-	person_id = #{personId}
-GROUP BY
-	building_id
-ORDER BY
-	intention DESC
+            SUM( intention ) AS intention,
+            building_id,
+            building_name
+        FROM
+            `ta_person_intention_record`
+        WHERE
+            person_id = #{personId}
+        GROUP BY
+            building_id
+        ORDER BY
+            intention DESC
     </select>
 
 </mapper>