Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v0.0.2</version>
+	<version>v0.1.0</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 

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

@@ -115,29 +115,43 @@ public class CommConstant {
      */
     public static final Integer ACTIVITY_CONDITION_ONE_THREE = 3;
 
+    //=================  首屏广告 / 轮播图 start =======================
+
     /**
      * 首页轮播图类型_活动
      */
     public static final String CAROUSEL_ACTIVITY = "activity";
 
     /**
-     * 首页轮播图类型_项目
+     * 首页 轮播图/广告 类型_项目
      */
     public static final String CAROUSEL_PROJECT = "project";
 
     /**
      * 首页轮播图类型_资讯
      */
-    public static final String CAROUSEL_INFORMATION = "information";
+    public static final String CAROUSEL_NEWS = "news";
 
     /**
-     * 开屏
+     * 打开放式_开屏
      */
     public static final String OPEN_SCREEN = "screen";
 
     /**
-     * 首页轮播图
+     * 打开放式_首页轮播图
      */
     public static final String CAROUSEL = "banner";
 
+    /**
+     * 首屏广告_发布位置——商城
+     */
+    public static final String MALL = "mall";
+
+    /**
+     * 首屏广告_发布位置——首页
+     */
+    public static final String BANNER_INDEX = "index";
+
+    //=================  首屏广告 / 轮播图 end =======================
+
 }

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

@@ -53,21 +53,16 @@ public class ExtendContentController extends BaseController {
     }
 
     /**
-     * 根据状态查当前的轮播图
-     * @return
-     */
-    @RequestMapping(value="/wx/selectExtendContent",method= RequestMethod.GET)
-    public ResponseBean extendContentList(@RequestBody ExtendContent extendContent ){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentList(extendContent);
-        return responseBean;
-    }
-
-    /**
-     * 根据状态查当前的开屏
+     * 微信 开屏 / 轮播图
      */
-    @RequestMapping(value="/wx/selectExtendContentShowType",method= RequestMethod.GET)
-    public ResponseBean extendContentListShowType(@RequestBody ExtendContent extendContent ){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(extendContent);
+    @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
+    public ResponseBean extendContentListShowType(@PathVariable(value = "showType") String showType,
+                                                  @RequestParam(value = "showPosition", required = false) String showPosition,
+                                                  @RequestParam(value = "targetId", required = false) String targetId,
+                                                  @RequestParam(value = "contentType", required = false) String contentType,
+                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                  @RequestParam(value = "contentId", required = false) String contentId){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId);
         return responseBean;
     }
 

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

@@ -73,7 +73,8 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
         return responseBean;
     }
 
@@ -85,8 +86,10 @@ public class TaBuildingDynamicController extends BaseController {
      */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-                                             @RequestParam("buildingId")Integer buildingId){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
+                                             @RequestParam("buildingId")Integer buildingId,
+                                             HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
         return responseBean;
     }
 

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

@@ -54,8 +54,9 @@ public class TaCheckinController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.GET)
-    public ResponseBean taCheckinList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,String activity){
+    public ResponseBean taCheckinList(@PathVariable String activity,
+                                      @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -78,8 +79,8 @@ public class TaCheckinController extends BaseController {
      * @param activity 实体对象
      * @return
      */
-    @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.POST)
-    public ResponseBean taCheckinAdd(@RequestBody String activity, HttpServletRequest request){
+    @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
+    public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);

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

@@ -42,7 +42,7 @@ public class TaNewsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taNews",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
@@ -71,7 +71,7 @@ public class TaNewsController extends BaseController {
      * @param taNews 实体对象
      * @return
      */
-    @RequestMapping(value="/taNews",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
@@ -82,7 +82,7 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taNews/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taNews/{id}", method= RequestMethod.DELETE)
     public ResponseBean taNewsDelete(@PathVariable Integer id){
         ResponseBean responseBean = iTaNewsService.deleteTaNews(id);
         return responseBean;
@@ -94,7 +94,7 @@ public class TaNewsController extends BaseController {
      * @param taNews 实体对象
      * @return
      */
-    @RequestMapping(value="/taNews/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
                                         @RequestBody TaNews taNews){
         taNews.setNewsId(id);
@@ -106,7 +106,7 @@ public class TaNewsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taNews/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsGet(@PathVariable Integer id){
         ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
         return responseBean;

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

@@ -42,7 +42,7 @@ public class TaNewsTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taNewsType",method= RequestMethod.GET)
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
@@ -56,7 +56,7 @@ public class TaNewsTypeController extends BaseController {
      * @param taNewsType 实体对象
      * @return
      */
-    @RequestMapping(value="/taNewsType",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
     public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
         ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
         return responseBean;
@@ -67,7 +67,7 @@ public class TaNewsTypeController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taNewsType/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taNewsType/{id}", method= RequestMethod.DELETE)
     public ResponseBean taNewsTypeDelete(@PathVariable Integer id){
         ResponseBean responseBean = iTaNewsTypeService.deleteTaNewsType(id);
         return responseBean;
@@ -79,7 +79,7 @@ public class TaNewsTypeController extends BaseController {
      * @param taNewsType 实体对象
      * @return
      */
-    @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
                                         @RequestBody TaNewsType taNewsType){
         taNewsType.setNewsTypeId(id);
@@ -91,7 +91,7 @@ public class TaNewsTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsTypeGet(@PathVariable Integer id){
         ResponseBean responseBean = iTaNewsTypeService.getTaNewsTypeById(id);
         return responseBean;

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/TaActivityDynamicEnlist.java

@@ -27,13 +27,13 @@ public class TaActivityDynamicEnlist implements Serializable {
     /**
      * 报名ID
      */
-    @TableId(value = "favor_id", type = IdType.AUTO)
+    @TableId(value = "enlist_id", type = IdType.AUTO)
     private Integer enlist_id;
 
     /**
      * 活动ID
      */
-    private String dynamic_id;
+    private String dynamicId;
 
     /**
      * 姓名
@@ -43,7 +43,7 @@ public class TaActivityDynamicEnlist implements Serializable {
     /**
      * 楼盘id
      */
-    private String building_id;
+    private String buildingId;
 
     /**
      * 创建时间
@@ -55,5 +55,9 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private String phone;
 
+    /**
+     * favor_num
+     */
+
 
 }

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,9 @@ public class TaBuildingApartment implements Serializable {
 
     private String buildingArea;
 
+    private String apartmentPrice;
+
+    private String apartmentDescription;
 
     /**
      * 户型图片列表

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

@@ -118,6 +118,29 @@ public class TaBuildingDynamic implements Serializable {
     @TableField(exist = false)
     private  int count;
 
+    /**
+     * 是否报名1为已报名,0为未报名
+     */
+    @TableField(exist = false)
+    private String isSing;
 
+    /**
+     * 分享活动
+     */
+    private int shareNum;
 
+    /**
+     * 阅读量
+     */
+    private  int pvNum;
+
+    /**
+     * 收藏量
+     */
+    private  int saveNum;
+
+    /**
+     * 点赞
+     */
+    private  int favorNum;
 }

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/TaBuildingDynamicMapper.java

@@ -53,4 +53,6 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
+
+    void updateTaBuildingDynamic(@Param("dynamicId") String dynamicId, @Param("sum") String sum);
 }

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

@@ -33,4 +33,10 @@ 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);
+
+    TaPerson selectByIdPerson(@Param("openid") String openid);
+
 }

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/IExtendContentService.java

@@ -23,15 +23,18 @@ public interface IExtendContentService extends IService<ExtendContent> {
 
     /**
      * 根据状态查当前的轮播图
-     * @param extendContent
+     * @param contentType
+     * @param buildingId
      * @return
      */
-    ResponseBean selectExtendContentList(ExtendContent extendContent);
+    @Deprecated
+    ResponseBean selectExtendContentList(String contentType, String buildingId);
 
     /**
      * 开屏
-     * @param extendContent
+     * @param contentType
+     * @param buildingId
      * @return
      */
-    ResponseBean selectExtendContentListShowType(ExtendContent extendContent);
+    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId);
 }

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

@@ -34,14 +34,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid);
 
     /**
      * 微信小程序 项目详情
      * @param dynamicId
      * @return
      */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid);
 
     /**
      * 动态管理添加

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/ExtendContentServiceImpl.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.mapper.ExtendContentMapper;
 import com.huiju.estateagents.service.IExtendContentService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,7 +34,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         }else if("2".equals(extendContent.getContentType())){
             extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
         }else if ("3".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_INFORMATION);
+            extendContent.setContentType(CommConstant.CAROUSEL_NEWS);
         }
         extendContentMapper.insert(extendContent);
         responseBean.addSuccess("成功");
@@ -41,13 +42,16 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     }
 
     @Override
-    public ResponseBean selectExtendContentList(ExtendContent extendContent) {
+    @Deprecated
+    public ResponseBean selectExtendContentList(String contentType, String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         // 查询轮播图
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
+        // banner 或 screen(首屏广告) ,这里是 banner
         extendContentQuery.eq("show_position",CommConstant.CAROUSEL);
-        extendContentQuery.eq("content_type",extendContent.getContentType());
-        extendContentQuery.eq("building_id",extendContent.getBuildingId());
+        // activity(活动) 或 project(项目) 或 news（咨迅）
+        extendContentQuery.eq("content_type",contentType);
+        extendContentQuery.eq("building_id",buildingId);
         extendContentQuery.eq("status","1");
         List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
         responseBean.addSuccess(taExtendContent);
@@ -55,13 +59,18 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     }
 
     @Override
-    public ResponseBean selectExtendContentListShowType(ExtendContent extendContent) {
+    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId) {
         ResponseBean responseBean= new ResponseBean<>();
         // 开屏
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
-        extendContentQuery.eq("show_type",CommConstant.OPEN_SCREEN);
-        extendContentQuery.eq("content_type",extendContent.getContentType());
-        extendContentQuery.eq("building_id",extendContent.getBuildingId());
+        // banner 或 screen(首屏广告) ,这里是 screen
+        extendContentQuery.eq("show_type",showType);
+        extendContentQuery.eq(StringUtils.isNotBlank(showPosition), "show_position",showPosition);
+        extendContentQuery.eq(StringUtils.isNotBlank(targetId), "target_id",targetId);
+        extendContentQuery.eq(StringUtils.isNotBlank(contentId), "content_id",contentId);
+        // activity(活动) 或 project(项目) 或 news（咨迅）
+        extendContentQuery.eq(StringUtils.isNotBlank(contentType), "content_type",contentType);
+        extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
         extendContentQuery.eq("status","1");
         ExtendContent taExtendContent = extendContentMapper.selectOne(extendContentQuery);
         responseBean.addSuccess(taExtendContent);

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

@@ -10,9 +10,11 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -51,6 +53,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
 
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -81,7 +86,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -93,6 +98,16 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
         for (TaBuildingDynamic taBuildingDynamic:records){
+            QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
+            TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+            if (null == taPerson){
+                return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            activityDynamicEnlist.eq("phone", taPerson.getPhone());
+            TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
+            if (null == taActivityDynamicEnlistPhone){
+                taBuildingDynamic.setIsSing("1");
+            }
             // 获取当前时间状态
             taBuildingDynamic= timeCondition(taBuildingDynamic);
         }
@@ -105,11 +120,27 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid) {
+
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
+        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        // 当前阅读量加1
+
+        buildingDynamicMapper.updateById( tabuildingDynamic.setSaveNum(tabuildingDynamic.getSaveNum()+1));
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+        if (null == taPerson){
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        // 查询是否报名
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
+        activityDynamicEnlist.eq("phone", taPerson.getPhone());
+        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
+        if (null == taActivityDynamicEnlistPhone){
+            buildingDynamic.setIsSing("1");
+        }
         // 获取报名总数
         QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
         taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
@@ -118,6 +149,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamic.setCount(applyCount);
         // 获取当前时间状态
         buildingDynamic = timeCondition(buildingDynamic);
+
         return ResponseBean.success(buildingDynamic);
     }
 
@@ -180,9 +212,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Override
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
         // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamic_id());
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamicId());
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                               .setBuilding_id(taBuildingDynamic.getDynamicId());
+                               .setBuildingId(taBuildingDynamic.getDynamicId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
         return ResponseBean.success(state);
     }

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +41,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         page.setSize(pageSize);
 
         QueryWrapper<TaNewsType> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(buildingId != null,"building_id", buildingId);
+        taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.orderByDesc("create_date");

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

@@ -243,6 +243,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("unReadNum", 0);
         result.put("projects", buildings);
         result.put("address", person.getAddress());
+        result.put("personTags",person.getPersonTags());
 
         // 当前人员
         List<TaPerson> taPersonList = getPersonsByOpenId(openid);
@@ -605,4 +606,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/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -9,14 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPointsRecords;
-import com.huiju.estateagents.entity.TaShare;
-import com.huiju.estateagents.entity.TdPointsRules;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
-import com.huiju.estateagents.mapper.TaShareMapper;
-import com.huiju.estateagents.mapper.TdPointsRulesMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +40,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     private TaPointsRecordsMapper taPointsRecordsMapper;
 
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
@@ -54,6 +51,14 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         }
 
         TaPerson taPerson = persons.get(0);
+        // 如果是分享活动, 则活动 + 1
+        if (typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQuery= new QueryWrapper<>();
+            taBuildingDynamicQuery.eq("dynamic_id",id);
+            TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
+            taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum()+1));
+            return ResponseBean.success("成功");
+        }
 
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taPerson.getPersonId());
@@ -103,7 +108,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
             taPersonMapper.update(new TaPerson(), wrapper);
         }
-
         return ResponseBean.success("");
     }
 

src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8001
 spring:
   application:
     name: estateagents

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -75,5 +75,11 @@
         </set>
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
     </update>
+    <select id="updateTaBuildingDynamic">
+        UPDATE ta_building_dynamic
+        SET  share_num = #{sum}
+        WHERE
+	      dynamic_id = #{dynamicId}
+    </select>
 
 </mapper>

src/main/resources/mapper/TaCheckinMapper.xml

@@ -11,7 +11,7 @@
         AND activity = #{activity}
     </select>
 
-    <select id="isCustomerChecked" resultType="com.huiju.estateagents.entity.TaCheckin">
+    <select id="isCustomerChecked" resultType="int">
         SELECT
         count(1)
         FROM

src/main/resources/mapper/TaPersonMapper.xml

@@ -91,4 +91,18 @@ 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>
+
+    <select id="selectByIdPerson" resultType="com.huiju.estateagents.entity.TaPerson">
+        select * from ta_person where mini_openid = #{openid};
+
+    </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>