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.1.0</version>
+	<version>v0.2.1</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 

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

@@ -67,17 +67,22 @@ public class CommConstant {
     /**
      * 签到
      */
-    public final static String POINTS_CHECKIN = "checkin";
+    public final static String POINTS_CHANGE_CHECKIN = "checkin";
     
     /**
      * 分享
      */
-    public final static String POINTS_SHARE = "share";
+    public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
     
     /**
-     * 授权
+     * 注册经纪人
      */
-    public final static String POINTS_AUTHORIZE = "authorize";
+    public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
+
+    /**
+     * 推荐客户
+     */
+    public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
 
 
     /**
@@ -103,17 +108,17 @@ public class CommConstant {
     /**
      * 活动的当前状态1:进行中
      */
-    public static final Integer ACTIVITY_CONDITION_ONE = 1;
+    public static final Integer ACTIVITY_CONDITION_PROCESSING = 1;
 
     /**
      * 活动的当前状态2:未开始
      */
-    public static final Integer ACTIVITY_CONDITION_TWO = 2;
+    public static final Integer ACTIVITY_CONDITION_PREPARE = 2;
 
     /**
      * 活动的当前状态3:结束
      */
-    public static final Integer ACTIVITY_CONDITION_ONE_THREE = 3;
+    public static final Integer ACTIVITY_CONDITION_FINISH = 3;
 
     //=================  首屏广告 / 轮播图 start =======================
 
@@ -205,4 +210,33 @@ public class CommConstant {
     public static final String ENTRY_VERIFY = "verify";
     //=================  客户入口类型 end =======================
 
+    /**
+     * 积分规则开启
+     */
+    public static final Integer POINTS_RULE_ON = 1;
+
+    /**
+     * 积分规则关闭
+     */
+    public static final Integer POINTS_RULE_OFF = 0;
+
+    /**
+     * 签到积分规则
+     */
+    public static final Integer POINTS_RULE_CHECKIN = 1;
+
+    /**
+     * 分享海报积分规则
+     */
+    public static final Integer POINTS_RULE_SHARE_POSTER = 2;
+
+    /**
+     * 推荐客户积分规则
+     */
+    public static final Integer POINTS_RULE_RECOMMENDER_CUSTOMER = 3;
+
+    /**
+     * 注册经纪人积分规则
+     */
+    public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
 }

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

@@ -86,6 +86,21 @@ public class MiniAppController {
         }
     }
 
+    /**
+     * 登陆接口
+     */
+    @PostMapping("/logout")
+    public ResponseBean logout(HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.success("");
+        }
+
+        return ResponseBean.success("");
+    }
+
+
     /**
      * 获取用户信息, 并写入内部人员表
      */

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

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysOrgParams;
+import com.huiju.estateagents.service.ISysOrgParamsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 组织参数配置表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@RestController
+@RequestMapping("/")
+public class SysOrgParamsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysOrgParamsController.class);
+
+    @Autowired
+    public ISysOrgParamsService iSysOrgParamsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/sysOrgParams",method= RequestMethod.GET)
+    public ResponseBean sysOrgParamsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysOrgParams> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysOrgParams> result = iSysOrgParamsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("sysOrgParamsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysOrgParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysOrgParams",method= RequestMethod.POST)
+    public ResponseBean sysOrgParamsAdd(@RequestBody SysOrgParams sysOrgParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysOrgParamsService.save(sysOrgParams)){
+                responseBean.addSuccess(sysOrgParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysOrgParamsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/sysOrgParams/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysOrgParamsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysOrgParamsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysOrgParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysOrgParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysOrgParams/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysOrgParamsUpdate(@PathVariable Integer id,
+                                        @RequestBody SysOrgParams sysOrgParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysOrgParamsService.updateById(sysOrgParams)){
+                responseBean.addSuccess(sysOrgParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysOrgParamsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/sysOrgParams/{id}",method= RequestMethod.GET)
+    public ResponseBean sysOrgParamsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysOrgParamsService.getById(id));
+        }catch (Exception e){
+            logger.error("sysOrgParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysProjectParams;
+import com.huiju.estateagents.service.ISysProjectParamsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 项目参数配置表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@RestController
+@RequestMapping("/")
+public class SysProjectParamsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysProjectParamsController.class);
+
+    @Autowired
+    public ISysProjectParamsService iSysProjectParamsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/sysProjectParams",method= RequestMethod.GET)
+    public ResponseBean sysProjectParamsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysProjectParams> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysProjectParams> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysProjectParams> result = iSysProjectParamsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("sysProjectParamsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysProjectParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysProjectParams",method= RequestMethod.POST)
+    public ResponseBean sysProjectParamsAdd(@RequestBody SysProjectParams sysProjectParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysProjectParamsService.save(sysProjectParams)){
+                responseBean.addSuccess(sysProjectParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysProjectParamsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/sysProjectParams/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysProjectParamsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysProjectParamsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysProjectParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysProjectParams 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sysProjectParams/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysProjectParamsUpdate(@PathVariable Integer id,
+                                        @RequestBody SysProjectParams sysProjectParams){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysProjectParamsService.updateById(sysProjectParams)){
+                responseBean.addSuccess(sysProjectParams);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysProjectParamsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/sysProjectParams/{id}",method= RequestMethod.GET)
+    public ResponseBean sysProjectParamsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysProjectParamsService.getById(id));
+        }catch (Exception e){
+            logger.error("sysProjectParamsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -2,14 +2,21 @@ package com.huiju.estateagents.controller;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +33,12 @@ public class TaBuildingController extends BaseController {
     @Autowired
     ITaBuildingService taBuildingService;
 
+    @Autowired
+    ITaSaveService iTaSaveService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
     /**
      * 楼盘详情
      * @param id
@@ -142,9 +155,22 @@ public class TaBuildingController extends BaseController {
     public ResponseBean getWxBuildingList(
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10")Integer pageSize,
-            String name
+            @RequestParam(defaultValue = "false") Boolean mine,
+            String name,
+            HttpServletRequest request
     ){
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name);
+        List<String> targets = null;
+        if (null != mine && mine) {
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
+        }
+
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets);
     }
 
     /**

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

@@ -7,12 +7,15 @@ 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.common.StringUtils;
 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.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -26,6 +29,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -45,6 +49,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    private ITaPersonService taPersonService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -76,26 +83,38 @@ public class TaBuildingDynamicController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam(defaultValue = "false" )boolean mine,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        ResponseBean  responseBean = new ResponseBean();
+        if(mine){
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
+        }else {
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        }
+
         return responseBean;
     }
 
     /**
      * 活动详情
      * @param dynamicId
-     * @param buildingId
      * @return
      */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-                                             @RequestParam("buildingId")String buildingId,
+
                                              HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
+        String buildingId = "";
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
         return responseBean;
     }
@@ -173,7 +192,11 @@ public class TaBuildingDynamicController extends BaseController {
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         TaBuilding building= taBuildingMapper.selectBuilding(dynamic.getBuildingId());
-        dynamic.setBuildingName(building.getBuildingName());
+
+        if (null != building) {
+            dynamic.setBuildingName(building.getBuildingName());
+        }
+
         responseBean.addSuccess(dynamic);
         return responseBean;
     }

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

@@ -0,0 +1,187 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaCustomerMessageService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+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.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 用户留言表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@RestController
+@RequestMapping("/api")
+public class TaCustomerMessageController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerMessageController.class);
+
+    @Autowired
+    public ITaCustomerMessageService iTaCustomerMessageService;
+
+    @Autowired
+    private ITaPersonService taPersonService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
+    public ResponseBean taCustomerMessageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerMessage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
+    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerMessageService.save(taCustomerMessage)){
+                responseBean.addSuccess(taCustomerMessage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerMessage/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerMessageDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerMessageService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerMessage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerMessage taCustomerMessage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerMessageService.updateById(taCustomerMessage)){
+                responseBean.addSuccess(taCustomerMessage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerMessageGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerMessageService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 保存对象
+     * @param taCustomerMessage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taCustomerMessage",method= RequestMethod.POST)
+    public ResponseBean wxCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            TaPerson taPersons = taPersonService.getPersonsByOpenId(openid).get(0);
+            taCustomerMessage.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taCustomerMessage.setCreateDate(LocalDateTime.now());
+            taCustomerMessage.setPersonId(taPersons.getPersonId());
+            taCustomerMessage.setNickname(taPersons.getNickname());
+            if (iTaCustomerMessageService.save(taCustomerMessage)){
+                responseBean.addSuccess(taCustomerMessage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -5,8 +5,14 @@ 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.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaNewsService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaSaveService;
+import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +24,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>
     * 资讯表  前端控制器
@@ -35,6 +44,12 @@ public class TaNewsController extends BaseController {
     @Autowired
     public ITaNewsService iTaNewsService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
 
     /**
      * 分页查询列表
@@ -61,9 +76,24 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, null, null, null, null);
-        return responseBean;
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(required = false) String buildingId,
+                                     @RequestParam(defaultValue = "false") Boolean mine,
+                                     HttpServletRequest request
+    ){
+        List<String> targets = null;
+        if (null != mine && mine) {
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
+        }
+
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets);
+        return ResponseBean.success(results);
     }
 
     /**

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -14,7 +16,9 @@ import org.springframework.web.bind.annotation.*;
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,13 +51,25 @@ public class TaPersonController extends BaseController {
     @GetMapping("/wx/cards")
     public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
                                     @RequestParam(defaultValue = "10") int pageSize,
-                                    @RequestParam(defaultValue = "false") boolean mine) {
+                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        if (mine){
+            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);
+            IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+            return ResponseBean.success(result);
+        }else {
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
+            return ResponseBean.success(result);
+        }
+
 
-        IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
-        return ResponseBean.success(result);
     }
 
     /**
@@ -277,6 +293,16 @@ public class TaPersonController extends BaseController {
     @GetMapping("/admin/consultant/{id}")
     public ResponseBean getConsultant(@PathVariable String id) {
         TaPerson taPerson = taPersonService.getById(id);
+
+        List<TaPersonBuilding> buildings = taPersonService.getPersonBuildings(id);
+        if (null != buildings && buildings.size() > 0) {
+            List<String> projects = new ArrayList<>();
+            for (TaPersonBuilding b : buildings) {
+                projects.add(b.getBuildingId());
+            }
+            taPerson.setProjects(projects);
+        }
+
         return ResponseBean.success(taPerson);
     }
 
@@ -293,4 +319,62 @@ public class TaPersonController extends BaseController {
     boolean isEmpty(String str) {
         return null == str || "".equals(str.trim());
     }
+
+    /**
+//     * 获取收藏置业顾问列表
+//     * @param pageNumber
+//     * @param pageSize
+//     * @return
+//     */
+//    @GetMapping("/wx/savedPerson")
+//    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
+//                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
+//        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);
+//        if (pageNumber < 0 || pageSize < 0) {
+//            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//        try {
+//            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+//            return ResponseBean.success(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//    }
+    /**
+     * 获取我参加过的活动列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/wx/joinedActivity/")
+    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
+                                             @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request){
+        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);
+
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        try {
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+    }
+
+
 }

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

@@ -113,13 +113,11 @@ public class TaPersonVisitRecordController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param taPersonVisitRecord 实体对象
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
-    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPersonVisitRecord taPersonVisitRecord){
-        ResponseBean responseBean = new ResponseBean();
+    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
+        TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
         taPersonVisitRecord.setRecordId(id);
         Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();

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

@@ -2,16 +2,20 @@ package com.huiju.estateagents.controller;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
@@ -29,9 +33,13 @@ public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
     ITaRecommendCustomerService taRecommendCustomerService;
+
     @Autowired
     ITaPersonService taPersonService;
 
+    @Resource
+    private ApplicationContext applicationContext;
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -229,4 +237,42 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+    /**
+     * 修改对象
+     * @return
+     */
+    @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam String verifyRemark){
+        if (null == verifyStatus) {
+            return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
+            if(taRecommendCustomer.getVerifyStatus() != CommConstant.VERIFY_READY){
+                taRecommendCustomer.setVerifyStatus(verifyStatus);
+                taRecommendCustomer.setVerifyRemark(verifyRemark);
+                if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+
+                    // 审核通过增加积分
+                    if (CommConstant.VERIFY_AGREE == verifyStatus) {
+                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
+                    }
+
+                    responseBean.addSuccess(taRecommendCustomer);
+                }else {
+                    responseBean.addError("fail");
+                }
+            } else {
+                responseBean.addSuccess("客户已审核");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -38,4 +38,18 @@ public class TaShareController extends BaseController {
 
         return taShareService.getListOf(id, typeOf, pageNumber, pageSize);
     }
+
+    /**
+     * 确认分享, 送积分
+     * @param typeOf
+     * @param id
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/{typeOf}/share/{id}")
+    public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        taShareService.makeSure(openid, typeOf, id);
+        return ResponseBean.success("");
+    }
 }

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

@@ -0,0 +1,69 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 组织参数配置表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysOrgParams implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数ID
+     */
+    @TableId(value = "param_id", type = IdType.AUTO)
+    private Integer paramId;
+
+    /**
+     * 参数名称
+     */
+    private String paramName;
+
+    /**
+     * 参数编码
+     */
+    private String paramCode;
+
+    /**
+     * 参数描述
+     */
+    private String paramDesc;
+
+    /**
+     * 参数值
+     */
+    private String paramValue;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -0,0 +1,74 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目参数配置表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysProjectParams implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数ID
+     */
+    @TableId(value = "param_id", type = IdType.AUTO)
+    private Integer paramId;
+
+    /**
+     * 参数名称
+     */
+    private String paramName;
+
+    /**
+     * 参数编码
+     */
+    private String paramCode;
+
+    /**
+     * 参数描述
+     */
+    private String paramDesc;
+
+    /**
+     * 参数值
+     */
+    private String paramValue;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -2,24 +2,17 @@ package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-
-/**
- * <p>
- * 点赞表
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@TableName("ta_activity_dynamic_enlist")
 public class TaActivityDynamicEnlist implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -55,9 +48,4 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private String phone;
 
-    /**
-     * favor_num
-     */
-
-
 }

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

@@ -0,0 +1,74 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户留言表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 留言ID
+     */
+    @TableId(value = "message_id", type = IdType.AUTO)
+    private Integer messageId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 用户ID
+     */
+    private String personId;
+
+    /**
+     * 用户名
+     */
+    private String nickname;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 留言内容
+     */
+    private String message;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -106,5 +107,9 @@ public class TaGoods implements Serializable {
      */
     private String address;
 
-
+    /**
+     * 兑换人
+     */
+    @TableField(exist = false)
+    private TaPerson exchanger;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -44,4 +45,7 @@ public class TaPersonSign implements Serializable {
      */
     private Integer durationDays;
 
+    @TableField(exist = false)
+    private TaPerson person;
+
 }

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

@@ -158,4 +158,10 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private TaPerson consultant;
+
+    @TableField(exist = false)
+    private String recommendName;
+
+    @TableField(exist = false)
+    private String recommendTel;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -60,5 +61,9 @@ public class TaShare implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 分享打开人
+     */
+    @TableField(exist = false)
+    private TaPerson openUser;
 }

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.event;
+
+import lombok.Data;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 积分自定义积分事件
+ * @author FXF
+ * @date 2019-07-30
+ */
+@Data
+public class EventBus extends ApplicationEvent {
+	EventType type;
+	
+	public EventBus(Object source, EventType type) {
+		super(source);
+		this.type = type;
+	}
+
+	public enum EventType {
+		// 分享海报
+		SharePoster(1),
+
+		// 签到
+		DailyCheckin(2),
+
+		// 推荐客户
+		RecommendCustomer(3),
+
+		// 注册经纪人
+		SignUpAgent(4);
+
+		private Integer type;
+
+		EventType(Integer type) {
+			this.type = type;
+		}
+
+		public Integer toInt() {
+			return type;
+		}
+	}
+}

src/main/java/com/huiju/estateagents/event/EventLisenter.java

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.event;
+
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonSign;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TaShare;
+import com.huiju.estateagents.service.ITaPointsRecordsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author FXF
+ * @date 2019-07-30
+ */
+
+@Component
+@Slf4j
+public class EventLisenter {
+	
+	@Autowired
+	private ITaPointsRecordsService taPointsRecordsService;
+
+	/**
+	 * 获取积分
+	 * @param event
+	 */
+	@EventListener
+	public void handler(EventBus event) {
+		switch (event.getType()) {
+			case SharePoster:
+				getSharePoints((TaShare) event.getSource());
+				break;
+			case DailyCheckin:
+				getCheckinPoints((TaPersonSign) event.getSource());
+				break;
+			case RecommendCustomer:
+				getRecommendCustPoints((TaRecommendCustomer) event.getSource());
+				break;
+			case SignUpAgent:
+				getSignUpPoints((TaPerson) event.getSource());
+				break;
+			default:
+				break;
+		}
+	}
+
+	// 分享赚积分
+	private void getSharePoints(TaShare taShare) {
+		taPointsRecordsService.sharePoints(taShare);
+	}
+
+	// 签到赚积分
+	private void getCheckinPoints(TaPersonSign taPersonSign) { taPointsRecordsService.checkinPoints(taPersonSign); }
+
+	// 注册送积分
+	private void getSignUpPoints(TaPerson taPerson) { taPointsRecordsService.signUpPoints(taPerson);}
+
+	// 推荐客户送积分
+	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer); }
+}

src/main/java/com/huiju/estateagents/exception/ExceptionHandleAdice.java

@@ -22,6 +22,7 @@ public class ExceptionHandleAdice {
 
     @ExceptionHandler(Exception.class)
     public ResponseBean handleException(Exception e){
+        e.printStackTrace();
         log.error(e.getMessage(),e);
         ResponseBean response = new ResponseBean();
         response.addError("系统异常,请稍后重试!");

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysOrgParams;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 组织参数配置表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Mapper
+public interface SysOrgParamsMapper extends BaseMapper<SysOrgParams> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysProjectParams;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目参数配置表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Mapper
+public interface SysProjectParamsMapper extends BaseMapper<SysProjectParams> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户留言表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@Mapper
+public interface TaCustomerMessageMapper extends BaseMapper<TaCustomerMessage> {
+
+}

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

@@ -43,4 +43,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     String getConsultantByTel(@Param("tel")String tel);
 
+    List<Map<String,Object>> selectCardListofMine(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("personIds")List<String> personIds);
+
 }

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaSave;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaSaveMapper extends BaseMapper<TaSave> {
 
+    List<String> getTargesOfPerson(@Param("personId") String personId, @Param("tagertType") String tagertType);
 }

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysOrgParams;
+
+/**
+ * <p>
+ * 组织参数配置表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+public interface ISysOrgParamsService extends IService<SysOrgParams> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysProjectParams;
+
+/**
+ * <p>
+ * 项目参数配置表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+public interface ISysProjectParamsService extends IService<SysProjectParams> {
+
+}

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

@@ -4,6 +4,8 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 项目表 服务类
@@ -105,7 +107,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+
+/**
+ * <p>
+ * 用户留言表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+public interface ITaCustomerMessageService extends IService<TaCustomerMessage> {
+
+}

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
 
+import java.util.List;
+
 /**
  * <p>
  * 资讯表  服务类
@@ -67,4 +69,6 @@ public interface ITaNewsService extends IService<TaNews> {
      * @return
      */
     ResponseBean wxTaPvNum(Integer id);
+
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets);
 }

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 import java.util.Map;
@@ -57,9 +58,9 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     String getPersonIdByCustomerId(String customerId);
 
-    IPage<TaPerson> getSavedConsaultants(int pageNumber, int pageSize,String personId);
-
-//    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
+    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
 
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
 
+    List<TaPersonBuilding> getPersonBuildings(String personId);
 }

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

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaPointsRecords;
+import com.huiju.estateagents.entity.*;
 
 /**
  * <p>
@@ -13,4 +13,13 @@ import com.huiju.estateagents.entity.TaPointsRecords;
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
+	void sharePoints(TaShare taShare);
+
+	void checkinPoints(TaPersonSign taPersonSign);
+
+	void signUpPoints(TaPerson taPerson);
+
+	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer);
+
+	void consumeGoodsPoints(TaGoods taGoods);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSave;
 
+import java.util.List;
+
 /**
  * <p>
  * 收藏表  服务类
@@ -19,4 +21,5 @@ public interface ITaSaveService extends IService<TaSave> {
 
     ResponseBean cancelLike(String openid, String typeOf, String like);
 
+    List<String> getTargesOfPerson(String personId, String tagertType);
 }

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

@@ -17,4 +17,6 @@ public interface ITaShareService extends IService<TaShare> {
     ResponseBean saveData(String openid, String typeOf, String id);
 
     ResponseBean getListOf(String id, String typeOf, Integer pageNumber, Integer pageSize);
+
+    void makeSure(String openid, String typeOf, String id);
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysOrgParams;
+import com.huiju.estateagents.mapper.SysOrgParamsMapper;
+import com.huiju.estateagents.service.ISysOrgParamsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 组织参数配置表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Service
+public class SysOrgParamsServiceImpl extends ServiceImpl<SysOrgParamsMapper, SysOrgParams> implements ISysOrgParamsService {
+
+}

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysProjectParams;
+import com.huiju.estateagents.mapper.SysProjectParamsMapper;
+import com.huiju.estateagents.service.ISysProjectParamsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目参数配置表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Service
+public class SysProjectParamsServiceImpl extends ServiceImpl<SysProjectParamsMapper, SysProjectParams> implements ISysProjectParamsService {
+
+}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
@@ -98,7 +99,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("building_id", buildingId);
+        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.orderByDesc("create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
@@ -218,8 +219,28 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
 
     @Override
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
+        ResponseBean responseBean= new ResponseBean<>();
         // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamicId());
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
+        // 判断当前活动是否满
+        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
+        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
+        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
+        // 当报名人数已满时，活动为已结束
+        if (contActivity >= personNum){
+            taBuildingDynamic.setIsEnlist("2");
+            buildingDynamicMapper.updateById(taBuildingDynamic);
+            responseBean.addError("当前报名人数已满");
+            return responseBean;
+        }
+        // 判断是否报名根据电话号码校验
+        taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
+        TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
+        if (null !=activityDynamicEnlist){
+            responseBean.addError("此号码已报名活动");
+            return responseBean;
+        }
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
                                .setBuildingId(taBuildingDynamic.getDynamicId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
@@ -246,15 +267,15 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
         // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
         if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PROCESSING);
         }
         //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
         if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_TWO);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PREPARE);
         }
         //(3:结束)当前时间大于报名结束时间,并且报名状态为1
         if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE_THREE);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_FINISH);
         }
         return taBuildingDynamic;
     }

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

@@ -45,6 +45,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     TaBuildingApartmentMapper taBuildingApartmentMapper;
 
+    @Autowired
+    TaSaveMapper taSaveMapper;
+
     @Autowired
     TaUvMapper taUvMapper;
 
@@ -308,13 +311,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
         buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
+        buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
+//        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");
 
         IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+import com.huiju.estateagents.mapper.TaCustomerMessageMapper;
+import com.huiju.estateagents.service.ITaCustomerMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户留言表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@Service
+public class TaCustomerMessageServiceImpl extends ServiceImpl<TaCustomerMessageMapper, TaCustomerMessage> implements ITaCustomerMessageService {
+
+}

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

@@ -71,6 +71,9 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		if (taGoods.getTotalNum() < 1){
 			return "此商品无库存";
 		}
+
+		taGoods.setExchanger(taPerson);
+
 		//插入积分消费流水表
 		insertTaPointRecords(taPerson,taGoods);
 		//插入积分兑换记录

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

@@ -6,27 +6,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.BeanTools;
-import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaFavor;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaNewsType;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaFavorService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -61,7 +55,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         page.setSize(pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
@@ -69,14 +63,17 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
-        List<TaNews> records = taNewsIPage.getRecords();
+        injectType(taNewsIPage.getRecords());
+
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
+
+    private void injectType(List<TaNews> records) {
         records.forEach(e -> {
             TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
             e.setNewsType(newsType);
         });
-
-        responseBean.addSuccess(taNewsIPage);
-        return responseBean;
     }
 
     @Override
@@ -183,4 +180,20 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         responseBean.addSuccess((Object)"");
         return responseBean;
     }
+
+    @Override
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets) {
+        IPage<TaNews> page = new Page<>(pageNum, pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+        taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+        injectType(taNewsIPage.getRecords());
+
+        return page;
+    }
 }

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

@@ -12,13 +12,16 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -56,12 +59,6 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     TaChatMapper taChatMapper;
-    
-    @Autowired
-    private TdPointsRulesMapper tdPointsRulesMapper;
-    
-    @Autowired
-    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
@@ -69,6 +66,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+    
+    @Resource
+    private ApplicationContext applicationContext;
+
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
         // 先查询是否存在用户
@@ -139,41 +145,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
 
         iTaRecommendCustomerService.newByPerson(person);
-
-        //查看是否领取过授权积分
-        QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
-        taPointsRecordsQueryWrapper.eq("person_id", person.getPersonId());
-        taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
-
-        List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
-        if (taPointsRecordsList.size() < 0){
-            //发放积分
-            QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("rule_id",2);
-            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
-            if (null != tdPointsRules) {
-                //插入积分消费流水表
-                TaPointsRecords taPointsRecords = new TaPointsRecords();
-                taPointsRecords.setPersonId(person.getPersonId());
-                taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
-                taPointsRecords.setPersonType(person.getPersonType());
-                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-                taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("person_id",person.getPersonId());
-                taPointsRecords.setChangeParams(jsonObject.toJSONString());
-                taPointsRecords.setCreateDate(LocalDateTime.now());
-                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-                taPointsRecordsMapper.insert(taPointsRecords);
-                //添加积分
-                UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
-                wrapper.eq("person_id", person.getPersonId());
-                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-                taPersonMapper.update(new TaPerson(), taPersonwrapper);
-            }
-        }
-
+        
+        // 发放积分
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
+        
         return person;
     }
 
@@ -368,39 +343,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             return ResponseBean.error("签到失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        // 增加积分
-        // 1-7 天积分 1-7, 超过7天按 7 个积分算
-        int points = durationDays >= 7 ? 7 : durationDays;
-        //签到获取积分
-        //TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(1);
-        //int points = tdPointsRules.getPointsAmount();
-        UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
-        wrapper.eq("person_id", taPerson.getPersonId());
-        wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(points));
-//        wrapper.set("points", "points + " + String.valueOf(points));
-        taPersonMapper.update(new TaPerson(), wrapper);
-        
-        //插入积分消费流水表
-        TaPointsRecords taPointsRecords = new TaPointsRecords();
-        taPointsRecords.setPersonId(taPerson.getPersonId());
-        taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-        taPointsRecords.setPersonType(taPerson.getPersonType());
-        taPointsRecords.setPointsAmount(points);
-        taPointsRecords.setChangeType(CommConstant.POINTS_CHECKIN);
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("person_id",taPerson.getPersonId());
-        taPointsRecords.setChangeParams(jsonObject.toJSONString());
-        taPointsRecords.setCreateDate(LocalDateTime.now());
-        taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-        taPointsRecordsMapper.insert(taPointsRecords);
-
-        Map<String, Object> result = new HashMap<>();
-
-        Integer oldPoints = taPerson.getPoints();
-        if (null == oldPoints) oldPoints = 0;
+        sign.setPerson(taPerson);
+        applicationContext.publishEvent(new EventBus(sign, EventBus.EventType.DailyCheckin));
 
-        result.put("integral", oldPoints + points);
-        return ResponseBean.success(result, "签到成功");
+        return ResponseBean.success("success");
     }
 
     @Override
@@ -562,6 +508,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public void addConsultantBuildings(String personId, String paramStr) {
         JSONObject params = JSONObject.parseObject(paramStr);
         String building = params.getString("buildings");
+        if (StringUtils.isEmpty(building)) {
+            return;
+        }
+
 //        JSONArray buildings = params.getJSONArray("buildings");
 
 //        if (null != buildings && !buildings.isEmpty()) {
@@ -626,7 +576,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getPersonByOpenId(openid);
     }
 
-    List<TaPersonBuilding> getPersonBuildings(String personId) {
+    public List<TaPersonBuilding> getPersonBuildings(String personId) {
         QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", personId);
         return taPersonBuildingMapper.selectList(queryWrapper);
@@ -649,25 +599,41 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<TaPerson> getSavedConsaultants(int pageNumber,int pageSize,String personId){
+    public IPage<Map<String,Object>> getSavedConsaultants(int pageNumber,int pageSize,String personId){
         QueryWrapper<TaSave> savePerson = new QueryWrapper<>();
         savePerson.eq("person_id",personId);
-        savePerson.eq("target_type",CommConstant.FAVOR_CONSULTANT);
+        savePerson.eq("tagert_type",CommConstant.FAVOR_CONSULTANT);
         List<TaSave> savedPerson = taSaveMapper.selectList(savePerson);
         List<String> personIds = new ArrayList<>();
         for(int i =0;i<savedPerson.size();i++){
             personIds.add(savedPerson.get(i).getSavedTarget());
         }
-        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        QueryWrapper<TaPerson> persons = new QueryWrapper<>();
-        persons.in("personId",personIds);
-        return taPersonMapper.selectPage(page,persons);
+        Page<Map<String, Object>> page = new Page<>();
+        page.setSize(pageSize);
+        page.setPages(pageNumber);
+        page.setCurrent(pageNumber);
+        page.setRecords(taPersonMapper.selectCardListofMine(page,CommConstant.PERSON_REALTY_CONSULTANT,CommConstant.STATUS_NORMAL,personIds));
+        return page;
 
     }
 
-//    @Override
-//    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building){
-//        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
-//
-//    }
+    @Override
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building){
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
+        activityDynamicEnlistQueryWrapper.eq("phone",phone);
+        if(!StringUtils.isEmpty(building)){
+            activityDynamicEnlistQueryWrapper.eq("building_id",building);
+        }
+        List<TaActivityDynamicEnlist> activityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(activityDynamicEnlistQueryWrapper);
+        List<String>activityIds = new ArrayList<>();
+        for (int i=0;i<activityDynamicEnlists.size();i++){
+            activityIds.add(activityDynamicEnlists.get(i).getDynamicId());
+        }
+        IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaBuildingDynamic> empty = new QueryWrapper<>();
+        empty.orderBy(true,false,"start_date");
+        return taBuildingDynamicMapper.selectPage(page,empty);
+
+
+    }
 }

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

@@ -1,11 +1,26 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaPointsRecords;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
+import com.huiju.estateagents.mapper.TdPointsRulesMapper;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 积分消费流水表  服务实现类
@@ -16,5 +31,252 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMapper, TaPointsRecords> implements ITaPointsRecordsService {
+	@Autowired
+	TaPersonMapper taPersonMapper;
+	
+	@Autowired
+	private TdPointsRulesMapper tdPointsRulesMapper;
+	
+	@Autowired
+	private TaPointsRecordsMapper taPointsRecordsMapper;
+
+	/**
+	 * 获取规则积分, 0 代表未启用
+	 * @param ruleId
+	 * @return
+	 */
+	private Integer getRulePoints(Integer ruleId) {
+		TdPointsRules rule = tdPointsRulesMapper.selectById(ruleId);
+		if (null == rule) {
+			return 0;
+		}
+
+		Integer status = rule.getStatus();
+		return null != status && status.equals(CommConstant.POINTS_RULE_ON) ? rule.getPointsAmount() : 0;
+	}
+
+	private boolean isPointsRecordsExist(String personId, String changeType, String changeParams) {
+		QueryWrapper<TaPointsRecords> query = new QueryWrapper<>();
+		query.eq("person_id", personId)
+			.eq("change_type", changeType)
+			.like(!StringUtils.isEmpty(changeParams), "change_params", changeParams)
+			.eq("status", CommConstant.STATUS_NORMAL);
+
+		Integer count = taPointsRecordsMapper.selectCount(query);
+		return null != count && count > 0;
+	}
+
+	@Override
+	public void sharePoints(TaShare taShare) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+
+		// 已经领取过的不会再次领取
+		String[] params = {
+				"shareId="+String.valueOf(taShare.getShareId()),
+				"openUser="+taShare.getOpenUser().getPersonId()
+		};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taShare.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void checkinPoints(TaPersonSign taPersonSign) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
+
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			add("date="+DateUtils.today());
+			add("user="+taPersonSign.getPerson().getPersonId());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taPersonSign.getPerson().getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 添加参数
+		params.add("recId="+taPersonSign.getRecId());
+		changeParams = String.join("&", params);
+
+
+		// 增加积分
+		// 1-7 天积分 1-7, 超过7天按 7 个积分算
+//		Integer durationDays = taPersonSign.getDurationDays();
+//		int points = durationDays >= 7 ? 7 : durationDays;
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void signUpPoints(TaPerson taPerson) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
+
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			add("user="+taPerson.getPersonId());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taPerson.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
+
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			// 推荐人
+			add("person="+taRecommendCustomer.getPersonId());
+			// 推荐客户手机
+			add("phone="+taRecommendCustomer.getPhone());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taRecommendCustomer.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getPersonId());
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void consumeGoodsPoints(TaGoods taGoods) {
+		Integer minusPoints = taGoods.getPointPrice();
+		if (null == minusPoints || minusPoints <= 0) {
+			return;
+		}
+
+		TaPerson taPerson = taGoods.getExchanger();
+		Integer origPoints = taPerson.getPoints();
+		if (null == origPoints) {
+			origPoints = 0;
+		}
+
+		// 积分不足
+		if (minusPoints > origPoints) {
+			return;
+		}
+
+		String[] params = {
+				"person="+taPerson.getPersonId(),
+				"goods="+String.valueOf(taGoods.getGoodsId()),
+				"points="+String.valueOf(minusPoints)
+		};
+		String changeParams = String.join("&", params);
+
+		// 发放积分
+		Integer pointsAmount = 0 - minusPoints;
+		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount) {
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
+		taPointsRecords.setPersonId(person.getPersonId());
+		taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(),person.getNickname()));
+		taPointsRecords.setPersonType(person.getPersonType());
+		taPointsRecords.setPointsAmount(pointsAmount);
+		taPointsRecords.setChangeType(changeType);
+		taPointsRecords.setChangeParams(changeParams);
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+		taPointsRecords.setCreateDate(LocalDateTime.now());
+
+		return taPointsRecordsMapper.insert(taPointsRecords) > 0;
+	}
 
+//	@Override
+//	public void authPoints(String personId) {
+//		//查看是否领取过授权积分
+//		QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
+//		taPointsRecordsQueryWrapper.eq("person_id", personId);
+//		taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
+//
+//		List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
+//		if (taPointsRecordsList.size() < 1){
+//			TaPerson person = taPersonMapper.selectById(personId);
+//			sendPoints(person,4,CommConstant.POINTS_AUTHORIZE);
+//		}
+//	}
+	
+	private void sendPoints(TaPerson person,Integer rulesId,String shareType) {
+		//发放积分
+		QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("rule_id",rulesId);
+		queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+		TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
+		if (null != tdPointsRules) {
+			//插入积分消费流水表
+			TaPointsRecords taPointsRecords = new TaPointsRecords();
+			taPointsRecords.setPersonId(person.getPersonId());
+			taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
+			taPointsRecords.setPersonType(person.getPersonType());
+			taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+			taPointsRecords.setChangeType(shareType);
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("person_id",person.getPersonId());
+			taPointsRecords.setChangeParams(jsonObject.toJSONString());
+			taPointsRecords.setCreateDate(LocalDateTime.now());
+			taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+			taPointsRecordsMapper.insert(taPointsRecords);
+			//添加积分
+			UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
+			taPersonwrapper.eq("person_id", person.getPersonId());
+			taPersonwrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+			taPersonMapper.update(new TaPerson(), taPersonwrapper);
+		}
+	}
 }

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

@@ -134,6 +134,11 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         return ResponseBean.success("");
     }
 
+    @Override
+    public List<String> getTargesOfPerson(String personId, String tagertType) {
+        return taSaveMapper.getTargesOfPerson(personId, tagertType);
+    }
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }

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

@@ -1,8 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,11 +8,14 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -33,18 +34,15 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
 
     @Autowired
     TaShareMapper taShareMapper;
-    
-    @Autowired
-    private TdPointsRulesMapper tdPointsRulesMapper;
-    
-    @Autowired
-    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
+    
+    @Resource
+    private ApplicationContext applicationContext;
 
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
@@ -94,33 +92,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             taBuildingMapper.setFieldNum(id, "share_num", 1);
         }
 
-        //发放分享积分
-        if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
-            QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("rule_id",2);
-            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
-            if (null != tdPointsRules){
-                //插入积分消费流水表
-                TaPointsRecords taPointsRecords = new TaPointsRecords();
-                taPointsRecords.setPersonId(taPerson.getPersonId());
-                taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-                taPointsRecords.setPersonType(taPerson.getPersonType());
-                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-                taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("person_id",taPerson.getPersonId());
-                taPointsRecords.setChangeParams(jsonObject.toJSONString());
-                taPointsRecords.setCreateDate(LocalDateTime.now());
-                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-                taPointsRecordsMapper.insert(taPointsRecords);
-                //添加积分
-                UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
-                wrapper.eq("person_id", taPerson.getPersonId());
-                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-                taPersonMapper.update(new TaPerson(), wrapper);
-            }
-        }
         return ResponseBean.success("");
     }
 
@@ -136,6 +107,47 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         return ResponseBean.success(result);
     }
 
+    @Override
+    public void makeSure(String openid, String typeOf, String id) {
+        // 查找分享记录
+        TaShare taShare = taShareMapper.selectById(id);
+        if (null == taShare) {
+            return;
+        }
+
+        // 记录分享人
+        TaPerson shareUsr = taPersonMapper.getById(taShare.getPersonId());
+        if (null == shareUsr) {
+            return;
+        }
+
+        // 如果分享人没有授权手机号
+        if (StringUtils.isEmpty(shareUsr.getPhone()) && StringUtils.isEmpty(shareUsr.getTel())) {
+            return;
+        }
+
+        // 查找打开人
+        List<TaPerson> persons = taPersonMapper.getPersonByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return;
+        }
+        TaPerson openUsr = persons.get(0);
+
+        // 如果打开人员与分享人员是同一个人
+        // 此处通过 personId 来判断，其实并不准确
+        // todo
+        if (openUsr.getPersonId().equals(shareUsr.getPersonId())) {
+            return;
+        }
+
+        taShare.setOpenUser(openUsr);
+
+        // 赠送积分
+        // 发放分享积分
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
+            applicationContext.publishEvent(new EventBus(taShare, EventBus.EventType.SharePoster));
+        }
+    }
 
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);

src/main/resources/mapper/SysOrgParamsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.SysOrgParamsMapper">
+
+</mapper>

src/main/resources/mapper/SysProjectParamsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.SysProjectParamsMapper">
+
+</mapper>

src/main/resources/mapper/TaCustomerMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaCustomerMessageMapper">
+
+</mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -113,4 +113,29 @@ FROM
     <select id="getConsultantByTel" resultType="java.lang.String">
         select person_id from ta_person where tel = #{tel}
     </select>
+
+    <select id="selectCardListofMine" resultType="java.util.HashMap">
+        SELECT
+        t.person_id AS id,
+        t.name,
+        t.company,
+        t.department,
+        t.post,
+        t.tel AS phone,
+        t.avatarurl AS avatar,
+        t.photo
+        FROM
+        ta_person t
+        WHERE
+        t.person_type = #{personType}
+        AND t.status = #{status}
+        <if test="personIds != null">
+            and t.person_id in
+            <foreach collection="personIds" item="personIds" index="index" open="(" close=")" separator=",">
+                #{ordersId}
+            </foreach>
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -35,10 +35,13 @@ FROM
         SELECT
 	a.*,
 	b.name as consultantName,
-    b.tel as consultTel
+    b.tel as consultTel,
+    c.nickname as recommendName,
+    c.tel as recommendTel
 FROM
 	ta_recommend_customer a
 	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+    LEFT JOIN ta_person c on a.person_id = c.person_id
 	<where>
         a.status > 0
         <if test="building != null and building !=''">

src/main/resources/mapper/TaSaveMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaSaveMapper">
+    <select id="getTargesOfPerson" resultType="string">
+        SELECT
+            t.saved_target
+        FROM
+            ta_save t
+        WHERE
+            t.person_id = #{personId}
+        AND t.tagert_type = #{tagertType}
+    </select>
+</mapper>