customer &records

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

@@ -78,7 +78,7 @@ public class TaCheckinController extends BaseController {
      * @param activity 实体对象
      * @return
      */
-    @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.POST)
+    @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
     public ResponseBean taCheckinAdd(@RequestBody String activity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);

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

@@ -5,13 +5,21 @@ 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.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+
 
 /**
  * <p>
@@ -29,6 +37,8 @@ public class TaPersonVisitRecordController extends BaseController {
 
     @Autowired
     public ITaPersonVisitRecordService iTaPersonVisitRecordService;
+    @Autowired
+    public ITaPersonService taPersonService;
 
 
     /**
@@ -61,9 +71,17 @@ public class TaPersonVisitRecordController extends BaseController {
      * @param taPersonVisitRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.POST)
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord){
+    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        taPersonVisitRecord.setPersonId(person.getPersonId());
+        taPersonVisitRecord.setVisitTime(LocalDateTime.now());
         try {
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
                 responseBean.success(taPersonVisitRecord);
@@ -104,10 +122,14 @@ public class TaPersonVisitRecordController extends BaseController {
      * @param taPersonVisitRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
     public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id,
                                         @RequestBody TaPersonVisitRecord taPersonVisitRecord){
         ResponseBean responseBean = new ResponseBean();
+        taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
+        taPersonVisitRecord.setRecordId(id);
+        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
+        taPersonVisitRecord.setVisitDuration(duation.intValue());
         try {
             if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
                 responseBean.success(taPersonVisitRecord);

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.controller;
 
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.JWTUtils;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +29,8 @@ public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
     ITaRecommendCustomerService taRecommendCustomerService;
+    @Autowired
+    ITaPersonService taPersonService;
 
     /**
      * 我的客户列表
@@ -79,4 +85,118 @@ public class TaRecommendCustomerController extends BaseController {
         String openid = JWTUtils.getSubject(request);
         return taRecommendCustomerService.recommendCust(paramStr, openid);
     }
+
+    @PostMapping("/wx/customer/recommend")
+    public ResponseBean getUnSignedCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        String buildingId = "";
+        try{
+            responseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+        return responseBean;
+    }
+
+    @PostMapping("/customer/recommend")
+    public ResponseBean getCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            String buildingId="";
+            responseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+        return responseBean;
+    }
+
+    @PostMapping("/customer/recommend/{customerId}")
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,String customerId){
+        ResponseBean responseBean = new ResponseBean();
+        String buildingId="";
+        try{
+            responseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+        return responseBean;
+    }
+
+        /**
+     * 修改对象
+     * @param taRecommendCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
+                                        @RequestBody TaRecommendCustomer taRecommendCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        taRecommendCustomer.setCustomerId(id);
+        try {
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                responseBean.addSuccess(taRecommendCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    /**
+     * 修改对象
+     * @param taRecommendCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
+            @RequestBody TaRecommendCustomer taRecommendCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        taRecommendCustomer.setCustomerId(id);
+        try {
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                responseBean.addSuccess(taRecommendCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/customer/recommend/get/{id}")
+    public ResponseBean getSingleCustomer(String customerId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/customer/recommend/get/{id}")
+    public ResponseBean getCutomerDetail(String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -144,6 +144,18 @@ public class TaBuilding implements Serializable {
      */
     private String poster;
 
+    private String buildingTransport;
+
+    private String buildingMall;
+
+    private String buildingEdu;
+
+    private String buildingHospital;
+
+    private String buildingBank;
+
+    private String buildingRestaurant;
+
 
     /**
      * 图片

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

@@ -71,6 +71,12 @@ public class TaBuildingApartment implements Serializable {
 
     private String buildingArea;
 
+    private String apartmentPrice;
+
+    private String apartmentDescription;
+
+    private String apartmentImg;
+
 
     /**
      * 户型图片列表

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

@@ -204,4 +204,21 @@ public class TaPerson implements Serializable {
     @TableField(exist = false)
     private LocalDateTime visitTime;
 
+    private String personTags;
+
+    private String personDescription;
+
+    private String gender;
+
+    private String unionId;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    private String language;
+
+
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -120,5 +121,30 @@ public class TaRecommendCustomer implements Serializable {
      * 服务顾问
      */
     @TableField(exist = false)
-    private Map<String, Object> consultant;
+    private Map<String, Object> consultants;
+
+    private String verifyStatus;
+
+    private String verifyRemark;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    @TableField(exist = false)
+    private List<TaPersonVisitRecord> visitRecords;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    @TableField(exist = false)
+    private Integer duration;
+
+    @TableField(exist = false)
+    private LocalDateTime visitTime;
+
+    @TableField(exist = false)
+    private TaPerson consultant;
 }

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

@@ -33,4 +33,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 
     TaPerson getById(@Param("personId") String personId);
+
+    List<String>getUserProjects(@Param("personId") String personId);
 }

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

@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
-//    List<TaPersonVisitRecord>visitRecordByPersonId(@Param("personId") String personId);
+    List<TaPersonVisitRecord>visitRecordByPersonId(@Param("personId") String personId);
 
 
 }

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

@@ -17,4 +17,10 @@ import org.apache.ibatis.annotations.Param;
 public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustomer> {
 
     Integer getMyCutsomerNum(@Param("personId") String personId);
+
+    String getCustomerPersonId(@Param("customerId")String customerId);
+
+    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId);
+
+
 }

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

@@ -51,4 +51,6 @@ public interface ITaPersonService extends IService<TaPerson> {
     Map<String,Object> getExtraInfo(String personId);
 
     List<TaPerson> getPersonsByOpenId(String openid);
+
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -21,4 +22,14 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     ResponseBean updateCustByJSON(String paramStr);
 
     ResponseBean recommendCust(String paramStr, String openid);
+
+    IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
+
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building);
+
+    TaRecommendCustomer getCustomerDetail(String customerId);
+
+    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building);
+
+
 }

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

@@ -554,4 +554,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         queryWrapper.eq("person_id", personId);
         return taPersonBuildingMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building){
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.isNull("person_type");
+        queryWrapper.eq("building_id",building);
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        return taPersonMapper.selectPage(page,queryWrapper);
+    }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -12,6 +13,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
 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.IMiniAppService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
@@ -45,6 +47,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     IMiniAppService iMiniAppService;
 
+    @Autowired
+    TaPersonVisitRecordMapper taPersonVisitRecordMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -74,7 +79,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
             if (null != taPerson) {
-                taRecommendCustomer.setConsultant(new HashMap<String, Object>() {{
+                taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
                     put("name", taPerson.getName());
                     put("phone", taPerson.getTel());
                     put("photo", taPerson.getPhoto());
@@ -224,7 +229,55 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
 
+
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }
+
+    @Override
+    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize,String building,String personId){
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("building_id",building);
+        queryWrapper.eq("realty_consultant",personId);
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building){
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("building_id",building);
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+    }
+
+    @Override
+    public TaRecommendCustomer getCustomerDetail(String customerId){
+        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
+        if(!personId.equals("")&& null != personId){
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
+        }
+        if(!taRecommendCustomer.getRealtyConsultant().equals("")&&null != taRecommendCustomer.getRealtyConsultant()){
+            TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
+            taRecommendCustomer.setConsultant(consultant);
+        }
+        return taRecommendCustomer;
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
+        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id",personId);
+//        queryWrapper.eq("building_id",building);
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+
+    }
 }

src/main/resources/mapper/TaPersonMapper.xml

@@ -91,4 +91,12 @@ FROM
 WHERE
 	a.person_id = #{personId}
     </select>
+    <select id="getUserProjects" resultType="java.lang.String">
+        SELECT
+	b.building_name
+FROM
+	ta_person_building a
+	LEFT JOIN ta_building b ON a.building_id = b.building_id
+	WHERE a.person_id = #{personId}
+    </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -9,4 +9,24 @@
         WHERE
             t.person_id = #{personId}
     </select>
+    <select id="getCustomerPersonId" resultType="java.lang.String">
+        SELECT
+	person_id
+FROM
+	ta_customer_person
+WHERE
+	customer_id = #{customerId}
+    </select>
+
+    <select id="getCustomerDetail" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+	a.*,
+	(select c.visit_time FROM ta_person_visit_record c where b.person_id = c.person_id ORDER BY c.visit_time desc LIMIT 1) as visitTime,
+	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE b.person_id = d.person_id) as duration
+FROM
+	ta_recommend_customer a
+	LEFT JOIN ta_customer_person b on a.customer_id = b.customer_id
+	LEFT JOIN ta_person_visit_record c ON b.person_id = c.person_id
+	where a.customer_id = #{customerId}
+    </select>
 </mapper>