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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -219,6 +219,30 @@ public class TaUserController extends BaseController {
         }
     }
 
+
+    /**
+     * 业务端  修改密码
+     * @return
+     */
+    @PutMapping(value = "/admin/update/password")
+    public ResponseBean updatePassword(
+                                        @RequestParam String newPassword,
+                                        HttpServletRequest request) {
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(newPassword) || newPassword.length() < 6) {
+            return ResponseBean.error("新密不能小于6位", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Integer userId = getUserId(request);
+        try {
+            iTaUserService.resetPassword(userId, newPassword);
+            return ResponseBean.success("操作成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 获取当前用户信息
      * @param request

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -200,7 +200,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	}
 	
 	@Override
-	public TaUser addAdminUser(TaUser taUser) throws Exception {
+	public TaUser  addAdminUser(TaUser taUser) throws Exception {
 		if (StringUtils.isEmpty(taUser.getPhone())) {
 			throw new Exception("电话号码不能为空");
 		}

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

@@ -32,4 +32,9 @@ public class DateUtils {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(day + " 00:00:00",df);
     }
+
+    public static LocalDateTime dayToLocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day,df);
+    }
 }

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

@@ -10,6 +10,8 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
@@ -58,6 +60,18 @@ public class MiniAppController extends BaseController {
     @Autowired
     private ITaSharePersonFromService taSharePersonFromService;
 
+    @Autowired
+    private ITaBuildingDynamicService buildingDynamicService;
+
+    @Autowired
+    private  ITaNewsService newsService;
+
+    @Autowired
+    private ITaUserService userService;
+
+    @Autowired
+    private ITaPersonBuildingService personBuildingService;
+
 
 
 
@@ -109,7 +123,7 @@ public class MiniAppController extends BaseController {
 
             if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
-                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
+                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
             }
 
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
@@ -142,16 +156,46 @@ public class MiniAppController extends BaseController {
                 taSharePersonFrom.setOrgId(getOrgId(request));
                 taSharePersonFrom.setPersonId(taPerson.getPersonId());
                 taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
+                taSharePersonFrom.setTargetId(targetId);
+                taSharePersonFrom.setTargetType(from);
                 if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
                     taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
                 }else {
                     taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
                 }
-                if(from.equals("activity_share")){
+                QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
+                sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
+                if(from.equals("dynamic_share")){ // activity_share
                     taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
                 }else {
                     taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                 }
+                if (from.contains("card")){
+                    // 因为targetId 是 personId ，需要查询出 userId
+                    TaPerson person = taPersonService.getById(targetId);
+
+                    QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
+                    personBuildingQueryWrapper.eq("user_id",person.getUserId());
+                    TaPersonBuilding personBuilding = personBuildingService.getOne(personBuildingQueryWrapper);
+                    taSharePersonFrom.setBuildingId(personBuilding.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id",personBuilding.getBuildingId());
+                }else if (from.contains("news")){
+                    TaNews news = newsService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(news.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id",news.getBuildingId());
+                }else if (from.contains("building")){
+                    taSharePersonFrom.setBuildingId(targetId);
+                    sharePersonFromQueryWrapper.eq("building_id",targetId);
+                }
+                Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
+                if(isFirstTime>0){
+                    taSharePersonFrom.setIsFirstTime(false);
+                }else {
+                    taSharePersonFrom.setIsFirstTime(true);
+                }
                 taSharePersonFromService.save(taSharePersonFrom);
             }
 

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

@@ -237,16 +237,24 @@ public class TaBuildingDynamicController extends BaseController {
 
         // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
 
+        // 检验 个人最大报名人数
+        if (taActivityDynamicEnlist.getAttendNum() > buildingDynamic.getMaxEnlistByPerson().intValue()) {
+            return ResponseBean.error("报名失败，超过活动报名的个人最大报名人数！", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         // 当前活动已报名的总人数
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
-        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
+        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum().intValue()) {
             return ResponseBean.error("报名失败，超过活动报名的最大人数！", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+        TaPerson person = taPersons.get(0);
+
         // 反向更新TaSharePersonFrom 的 status
         QueryWrapper<TaSharePersonFrom> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("target_id", taActivityDynamicEnlist.getPersonId());
+        queryWrapper.eq("target_id", taActivityDynamicEnlist.getDynamicId());
         queryWrapper.eq("target_type", "dynamic_share");
+        queryWrapper.eq("person_id", person.getPersonId());
         queryWrapper.orderByDesc("create_date");
         queryWrapper.last("limit 1");
         TaSharePersonFrom taSharePersonFrom = taSharePersonFromMapper.selectOne(queryWrapper);
@@ -255,10 +263,6 @@ public class TaBuildingDynamicController extends BaseController {
             taSharePersonFromMapper.updateById(taSharePersonFrom);
         }
 
-
-
-
-        TaPerson person = taPersons.get(0);
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
         taActivityDynamicEnlist.setOrgId(orgId);
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist, orgId);

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

@@ -176,6 +176,7 @@ public class TaCustomerMessageController extends BaseController {
             taCustomerMessage.setCreateDate(LocalDateTime.now());
             taCustomerMessage.setPersonId(taPersons.getPersonId());
             taCustomerMessage.setNickname(taPersons.getNickname());
+            taCustomerMessage.setOrgId(getOrgId(request));
             if (iTaCustomerMessageService.save(taCustomerMessage)){
                 responseBean.addSuccess(taCustomerMessage);
             }else {

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

@@ -7,6 +7,7 @@ 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.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -73,7 +74,8 @@ public class TaNewsController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsTypeId", paramType = "query",value = "资讯类型id"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题")
     })
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(HttpServletRequest request,
@@ -81,8 +83,9 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus);
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
+                                   @RequestParam(value = "title", required = false) String title){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus,title);
         return responseBean;
     }
 
@@ -182,6 +185,28 @@ public class TaNewsController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "资讯置顶", notes = "资讯置顶")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "newsId", paramType = "query",value = "资讯ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
+    })
+    @RequestMapping(value = "/admin/taNews/weight" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicWeight(@RequestParam Integer newsId,@RequestParam Integer weight,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaNews taNews = iTaNewsService.getById(newsId);
+        taNews.setWeight(weight);
+        taNews.setOrgId(getOrgId(request));
+        QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+        newsQueryWrapper.eq("news_id",newsId);
+        if (iTaNewsService.updateById(taNews)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
+
+
     /**
      * 微信 根据id查询对象
      * @param id  实体ID

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

@@ -112,6 +112,7 @@ public class TaPersonController extends BaseController {
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone",phone);
         queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("is_consultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
         if(users.size()>0){
             TaUser user = users.get(0);
@@ -129,7 +130,7 @@ public class TaPersonController extends BaseController {
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("您不是置业顾问。");
+            responseBean.addError("手机号不存在。");
         }
         return responseBean;
     }
@@ -334,15 +335,16 @@ public class TaPersonController extends BaseController {
     }
 
     /**
-     * 个人签到
+     * 个人getPersonId(request);
      * @param request
      * @return
      */
     @PostMapping("/wx/user/signin")
     public ResponseBean userSign(HttpServletRequest request) {
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
 
-        return taPersonService.getWxUserSign(openid);
+        return taPersonService.getWxUserSign(openid, orgId);
     }
 
 

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

@@ -97,6 +97,7 @@ public class TaPersonVisitRecordController extends BaseController {
             taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
+            taEventProperty.setOrgId(getOrgId(request));
             if (!taEventPropertiesService.save(taEventProperty)){
                 return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -121,6 +122,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 intentionRecord.setEventId(buildingIntention.getEventId());
                 intentionRecord.setEventName(buildingIntention.getEventName());
                 intentionRecord.setIntention(buildingIntention.getIntention());
+                intentionRecord.setOrgId(getOrgId(request));
                 intentionRecord.setPersonId(person.getPersonId());
                 intentionRecord.setPersonName(person.getNickname());
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);

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

@@ -11,15 +11,12 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaChannelPerson;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
-import com.huiju.estateagents.excel.AgentsRecommendCustomer;
-import com.huiju.estateagents.excel.ExcelRecommendCustomer;
-import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.excel.*;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.huiju.estateagents.service.TaChannelPersonService;
@@ -41,6 +38,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -70,6 +68,13 @@ public class TaRecommendCustomerController extends BaseController {
     @Autowired
     private TaChannelPersonService taChannelPersonService;
 
+    @Autowired
+    private TaRecommendCustomerMapper taRecommendCustomerMapper;
+
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -255,9 +260,22 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
-                                         @RequestParam(value = "customerType") String customerType){ // public 公  private 私
+                                         @RequestParam(value = "customerType") String customerType,// public 公  private 私
+                                         @RequestParam(value = "status",required = false) Integer status){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
+
+            // TODO 目前如果是公客，就取当前操作人员的 buildingId
+            if ("public".equals(customerType)) {
+                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
+                String userId = (String) map.get("userId");
+                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("user_id", userId);
+                queryWrapper.orderByDesc("create_date");
+                queryWrapper.last("limit 1");
+                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
+                buildingId = personBuilding.getBuildingId();
+            }
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -485,15 +503,15 @@ 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(required = false) String verifyRemark){
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam(required = false) String verifyRemark, HttpServletRequest request){
         if (null == verifyStatus) {
             return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-
+        Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY) ){
+            if(null == taRecommendCustomer.getVerifyStatus()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
@@ -505,7 +523,7 @@ public class TaRecommendCustomerController extends BaseController {
 
                     // 审核通过增加积分
                     if (CommConstant.VERIFY_AGREE == verifyStatus) {
-                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
+                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer, orgId));
                     }
 
                     responseBean.addSuccess(taRecommendCustomer);
@@ -535,7 +553,7 @@ public class TaRecommendCustomerController extends BaseController {
 
         Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
 
-        Integer pageCode = 1;
+        Integer pageCode = 0;
         Integer pageSize = 100;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
@@ -544,7 +562,7 @@ public class TaRecommendCustomerController extends BaseController {
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
         do {
-            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -568,7 +586,7 @@ public class TaRecommendCustomerController extends BaseController {
 
         Integer count = taRecommendCustomerService.getRepCustomerReportCount(getOrgId(request));
 
-        Integer pageCode = 1;
+        Integer pageCode = 0;
         Integer pageSize = 100;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
@@ -578,7 +596,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode, pageSize);
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -601,7 +619,7 @@ public class TaRecommendCustomerController extends BaseController {
 
         Integer count = taRecommendCustomerService.getIndependentAgentsCount(getOrgId(request));
 
-        Integer pageCode = 1;
+        Integer pageCode = 0;
         Integer pageSize = 100;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
@@ -611,7 +629,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode, pageSize);
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -622,4 +640,99 @@ public class TaRecommendCustomerController extends BaseController {
 
     }
 
+
+
+    // 客户列表 公客/私客
+
+    /**
+     * 导出数据 客户列表 公客/私客
+     * @param request
+     * @param response
+     * @param name
+     * @param tel
+     * @param buildingId
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param customerType
+     * @param status
+     * @throws IOException
+     */
+    @GetMapping("/admin/customer/recommend/export")
+    public void getCustomerExportList (HttpServletRequest request,
+                                         HttpServletResponse response,
+                                         @RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                                         @RequestParam(value = "sex",required = false)Integer sex,
+                                         @RequestParam(value = "customerType") String customerType,
+                                         @RequestParam(value = "status",required = false) Integer status) throws IOException { // public 公  private 私
+
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=经纪人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+        if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+            /**
+             * 公客
+             */
+
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), PublicCustomerExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-公客").build();
+
+            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<PublicCustomerExport> publicList = null;
+            do {
+                publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode ++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        } else {
+            /**
+             * 私客
+             */
+
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), PrivateCustomerExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
+
+            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<PrivateCustomerExport> privateList = null;
+            do {
+                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+                excelWriter.write(privateList, writeSheet);
+
+                pageCode ++;
+            } while (pageCode <= pageCount);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+
+        }
+
+
+    }
+
 }

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

@@ -36,7 +36,7 @@ public class TaSaveController extends BaseController {
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
         String openid = getOpenId(request);
 
-        return iTaSaveService.postLike(openid, typeOf, id);
+        return iTaSaveService.postLike(openid, typeOf, id,getOrgId(request));
     }
 
     /**

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

@@ -49,7 +49,8 @@ public class TaShareController extends BaseController {
     @PutMapping("/wx/{typeOf}/share/{id}")
     public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
         String openid = getOpenId(request);
-        taShareService.makeSure(openid, typeOf, id);
+        Integer orgId = getOrgId(request);
+        taShareService.makeSure(openid, typeOf, id, orgId);
         return ResponseBean.success("");
     }
 }

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

@@ -167,7 +167,7 @@ public class TaBuildingDynamic implements Serializable {
     /**
      * 活动人数
      */
-    private  String personNum;
+    private Integer personNum;
 
     private Integer cityId;
 

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

@@ -107,6 +107,11 @@ public class TaNews implements Serializable {
      */
     private Integer shareNum;
 
+    /**
+     * 权重
+     */
+    private Integer weight;
+
     /**
      * 类型
      */

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

@@ -266,4 +266,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
+
+    /**
+     * 推广人
+     */
+    @TableField(exist = false)
+    private String sharePersonName;
 }

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

@@ -175,4 +175,10 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private String recommendTel;
+
+    /**
+     * 推广人
+     */
+    @TableField(exist = false)
+    private String sharePersonName;
 }

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

@@ -72,5 +72,7 @@ public class TaSharePersonFrom implements Serializable {
 
     private Integer status;
 
+    private Boolean isFirstTime;
+
 
 }

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

@@ -11,10 +11,12 @@ import org.springframework.context.ApplicationEvent;
 @Data
 public class EventBus extends ApplicationEvent {
 	EventType type;
+	private Integer orgId;
 	
-	public EventBus(Object source, EventType type) {
+	public EventBus(Object source, EventType type, Integer orgId) {
 		super(source);
 		this.type = type;
+		this.orgId = orgId;
 	}
 
 	public enum EventType {

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

@@ -30,19 +30,19 @@ public class EventLisenter {
 	public void handler(EventBus event) {
 		switch (event.getType()) {
 			case SharePoster:
-				getSharePoints((TaShare) event.getSource());
+				getSharePoints((TaShare) event.getSource(), event.getOrgId());
 				break;
 			case DailyCheckin:
-				getCheckinPoints((TaPersonSign) event.getSource());
+				getCheckinPoints((TaPersonSign) event.getSource(), event.getOrgId());
 				break;
 			case RecommendCustomer:
-				getRecommendCustPoints((TaRecommendCustomer) event.getSource());
+				getRecommendCustPoints((TaRecommendCustomer) event.getSource(), event.getOrgId());
 				break;
 			case SignUpAgent:
-				getSignUpPoints((TaPerson) event.getSource());
+				getSignUpPoints((TaPerson) event.getSource(), event.getOrgId());
 				break;
 			case SharePosterAll:
-				getSharePointsAll((String) event.getSource());
+				getSharePointsAll((String) event.getSource(), event.getOrgId());
 				break;
 			default:
 				break;
@@ -50,21 +50,21 @@ public class EventLisenter {
 	}
 
 	// 分享赚积分
-	private void getSharePoints(TaShare taShare) {
-		taPointsRecordsService.sharePoints(taShare);
+	private void getSharePoints(TaShare taShare, Integer orgId) {
+		taPointsRecordsService.sharePoints(taShare, orgId);
 	}
 
 	// 无限制 分享赚积分
-	private void getSharePointsAll(String recommenderId) {
-		taPointsRecordsService.sharePosterAll(recommenderId);
+	private void getSharePointsAll(String recommenderId, Integer orgId) {
+		taPointsRecordsService.sharePosterAll(recommenderId, orgId);
 	}
 
 	// 签到赚积分
-	private void getCheckinPoints(TaPersonSign taPersonSign) { taPointsRecordsService.checkinPoints(taPersonSign); }
+	private void getCheckinPoints(TaPersonSign taPersonSign, Integer orgId) { taPointsRecordsService.checkinPoints(taPersonSign, orgId); }
 
 	// 注册送积分
-	private void getSignUpPoints(TaPerson taPerson) { taPointsRecordsService.signUpPoints(taPerson);}
+	private void getSignUpPoints(TaPerson taPerson, Integer orgId) { taPointsRecordsService.signUpPoints(taPerson, orgId);}
 
 	// 推荐客户送积分
-	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer); }
+	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer, orgId); }
 }

src/main/java/com/huiju/estateagents/excel/AgentsRecommendCustomer.java

@@ -45,4 +45,18 @@ public class AgentsRecommendCustomer {
     @ExcelProperty(value = "所属渠道", index = 4)
     private String channelName;
 
+    /**
+     * 推荐客户(总数)
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推荐客户(总数)", index = 5)
+    private String recommedCount;
+
+    /**
+     * 邀请经纪人（数量）
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "邀请经纪人（数量）", index = 6)
+    private String agentCount;
+
 }

src/main/java/com/huiju/estateagents/excel/ExcelRecommendCustomer.java

@@ -43,15 +43,33 @@ public class ExcelRecommendCustomer {
     private String intention;
 
     /**
-     * 置业顾问
+     * 推荐人姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推荐人", index = 4)
+    @ExcelProperty(value = "推荐人姓名", index = 4)
     private String recommend;
 
+    /**
+     * 推荐人电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推荐人电话", index = 5)
+    private String recommendTel;
+
     @ColumnWidth(15)
     @DateTimeFormat("yyyy年MM月dd日")
-    @ExcelProperty(value = "推荐时间", index = 5)
+    @ExcelProperty(value = "推荐时间", index = 6)
     private Date createDate;
 
+    /**
+     * 审核状态名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "审核状态名", index = 7)
+    private String verifyStatusName;
+
+
+
+
+
 }

src/main/java/com/huiju/estateagents/excel/PrivateCustomerExport.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 公客导出
+ */
+@Data
+public class PrivateCustomerExport {
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String name;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String sex;
+
+    /**
+     * 置业顾问姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问姓名", index = 3)
+    private String consultantName;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 4)
+    private String consultTel;
+
+}

src/main/java/com/huiju/estateagents/excel/PublicCustomerExport.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 公客导出
+ */
+@Data
+public class PublicCustomerExport {
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String sex;
+
+}

src/main/java/com/huiju/estateagents/excel/ReporRecommendCustomer.java

@@ -45,14 +45,14 @@ public class ReporRecommendCustomer {
      * 置业顾问
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问", index = 25)
+    @ExcelProperty(value = "置业顾问", index = 4)
     private String consultantName;
 
     /**
      * 置业顾问手机号
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问手机号", index = 25)
+    @ExcelProperty(value = "置业顾问手机号", index = 5)
     private String consultTel;
 
 }

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

@@ -108,7 +108,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 性别比例

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

@@ -37,7 +37,8 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
                                          @Param("buildingId") String buildingId,
                                          @Param("eventType") String eventType,
                                          @Param("event") String event,
-                                         @Param("activity") String activity);
+                                         @Param("activity") String activity,
+                                         @Param("orgId") Integer orgId);
 
 
     /**

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.excel.AgentsRecommendCustomer;
-import com.huiju.estateagents.excel.ExcelRecommendCustomer;
-import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,7 +29,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
@@ -46,49 +44,110 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
 
     /**
-     * 获取推荐用户数据
+     * 导出数据 获取推荐用户数据
      * @param orgId
      * @return
      */
     List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
-     * 获取推荐用户数据 总数
+     * 导出数据 获取推荐用户数据 总数
      * @param orgId
      * @return
      */
     Integer getRecCustomerExportCount(@Param("orgId") Integer orgId);
 
     /**
-     * 获取报备客户数据 总数
+     * 导出数据 获取报备客户数据 总数
      * @param orgId
      * @return
      */
     Integer getRepCustomerReportCount(@Param("orgId")Integer orgId);
 
     /**
-     * 获取报备客户数据
+     * 导出数据 获取报备客户数据
      * @param orgId
      * @return
      */
     List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
-     * 获取经纪人数据 总数
+     * 导出数据 获取经纪人数据 总数
      * @param orgId
      * @return
      */
     Integer getIndependentAgentsCount(@Param("orgId") Integer orgId);
 
     /**
-     * 获取经纪人数据
+     * 导出数据 获取经纪人数据
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
     List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 导出数据 公客总数
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @param consultTel
+     * @return
+     */
+    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+
+    /**
+     * 导出数据 公客
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @param consultTel
+     * @return
+     */
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel);
+
+    /**
+     * 导出数据 私客总数
+     * @param buildingId
+     * @param name
+     * @param tel
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @param status
+     * @return
+     */
+    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status);
+
+    /**
+     * 导出数据 私客
+     * @param pageCode
+     * @param pageSize
+     * @param buildingId
+     * @param name
+     * @param tel
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @param status
+     * @return
+     */
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status);
+
 }

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

@@ -26,7 +26,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title);
 
     /**
      * 根据Id查询资讯数据

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

@@ -36,7 +36,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     ResponseBean getWxUser(String openid);
 
-    ResponseBean getWxUserSign(String openid);
+    ResponseBean getWxUserSign(String openid, Integer orgId);
 
     TaPerson getPersonByTel(String userPhone);
 

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

@@ -14,15 +14,15 @@ import com.huiju.estateagents.entity.*;
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
-	void sharePoints(TaShare taShare);
+	void sharePoints(TaShare taShare, Integer orgId);
 
-	void checkinPoints(TaPersonSign taPersonSign);
+	void checkinPoints(TaPersonSign taPersonSign, Integer orgId);
 
-	void signUpPoints(TaPerson taPerson);
+	void signUpPoints(TaPerson taPerson, Integer orgId);
 
-	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer);
+	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId);
 
-	void consumeGoodsPoints(TaGoods taGoods);
+	void consumeGoodsPoints(TaGoods taGoods, Integer orgId);
 
 	IPage<TaPointsRecords> getWxRecords(Integer pageNum,Integer pageSize,String personId);
 
@@ -30,5 +30,5 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * 分享积分增加  人员不限制
 	 * @param recommenderId
 	 */
-    void sharePosterAll(String recommenderId);
+    void sharePosterAll(String recommenderId, Integer orgId);
 }

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

@@ -33,7 +33,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
 

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

@@ -17,7 +17,7 @@ import java.util.List;
 public interface ITaSaveService extends IService<TaSave> {
 
 
-    ResponseBean postLike(String openid, String typeOf, String like);
+    ResponseBean postLike(String openid, String typeOf, String like,Integer orgId);
 
     ResponseBean cancelLike(String openid, String typeOf, String like);
 

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

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

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

@@ -178,7 +178,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId, eventType, event, activity);
 
         IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
-        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, startDate, endDate, buildingId, eventType, event, activity);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, startDate, endDate, buildingId, eventType, event, activity, orgId);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);

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

@@ -78,16 +78,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
         IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId);
-        List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
-        for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
-            QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();
-            taActivityDynamicEnlist.eq("dynamic_id",taBuildingDynamic.getDynamicId());
-            int singCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
-            taBuildingDynamic.setCount(singCount);
-        }
 
         HashMap hashMap= new HashMap<>();
-        hashMap.put("list",buildingDynamicList);
+        hashMap.put("list",buildingDynamic.getRecords());
         hashMap.put("total",buildingDynamic.getTotal());
         hashMap.put("pageNum",buildingDynamic.getCurrent());
         hashMap.put("pageSize",buildingDynamic.getSize());
@@ -155,9 +148,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         // 活动已报名人数
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(buildingDynamic.getDynamicId(), orgId);
         buildingDynamic.setEnlisted(enlistCount);
+        buildingDynamic.setEnlistNum(buildingDynamic.getPersonNum());
 
         // 活动海报
         buildingDynamic.setPosters(taPosterService.getPostersForTarget(buildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+        buildingDynamic.setShareContents(taShareContentService.getPostersForTarget(buildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
         return ResponseBean.success(buildingDynamic);
     }
@@ -233,7 +228,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
 
         // 当报名人数已满时，活动为已结束
-        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
+        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum()) {
             taBuildingDynamic.setIsEnlist("2");
             buildingDynamicMapper.updateById(taBuildingDynamic);
             responseBean.addError("当前报名人数已满");
@@ -251,7 +246,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
                 .setBuildingId(taBuildingDynamic.getDynamicId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
-        int joinNum = taBuildingDynamic.getEnlistNum() == null ? 1:taBuildingDynamic.getEnlistNum()+1;
+        int joinNum = taBuildingDynamic.getEnlistNum() == null ? taActivityDynamicEnlist.getAttendNum():taBuildingDynamic.getEnlistNum()+taActivityDynamicEnlist.getAttendNum();
         taBuildingDynamic.setEnlistNum(joinNum);
         buildingDynamicMapper.updateById(taBuildingDynamic);
         return ResponseBean.success(state);
@@ -344,21 +339,28 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
             empty.orderBy(true,false,"start_date");
             IPage<TaBuildingDynamic> result = buildingDynamicMapper.selectPage(page,empty);
             for(int i=0;i<result.getRecords().size();i++){
-                result.getRecords().get(i).setIsSign(CommConstant.STATUS_NORMAL);
+                TaBuildingDynamic taBuildingDynamic = result.getRecords().get(i);
+                taBuildingDynamic.setIsSign(CommConstant.STATUS_NORMAL);
                 // 获取报名总数
                 QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
                 taActivityDynamicEnlist.eq("dynamic_id", result.getRecords().get(i).getDynamicId());
                 taActivityDynamicEnlist.eq("building_id", result.getRecords().get(i).getBuildingId());
                 int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
-                result.getRecords().get(i).setCount(applyCount);
+                taBuildingDynamic.setCount(applyCount);
 
                 // 是否收藏
                 TaSave taSave = iTaSaveService.getInfoBy(person.getPersonId(), CommConstant.FAVOR_ACTIVITY, result.getRecords().get(i).getDynamicId());
                 if (null == taSave) {
-                    result.getRecords().get(i).setIsSaved(0);
+                    taBuildingDynamic.setIsSaved(0);
                 } else {
-                    result.getRecords().get(i).setIsSaved(1);
+                    taBuildingDynamic.setIsSaved(1);
                 }
+
+                // 获取海报图 和 分享图
+                taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+                taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+
+
             }
             return result;
         }else {

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

@@ -188,6 +188,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingProjectType> buildingProjectTypes = taBuildingProjectTypeMapper.selectList(projectTypeQueryWrapper);
         building.setBuildingProjectType(buildingProjectTypes);
 
+        // 海报和分享
+        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+
         return ResponseBean.success(building);
     }
 

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

@@ -58,7 +58,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -71,7 +71,8 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
-        taNewsQueryWrapper.orderByDesc("create_date");
+        taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
         injectType(taNewsIPage.getRecords());
@@ -217,7 +218,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("org_id",orgId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq("news_status", 0);
-        taNewsQueryWrapper.orderByDesc("create_date");
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
         injectType(taNewsIPage.getRecords());

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

@@ -167,7 +167,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
        // iTaRecommendCustomerService.newByPerson(person);
         
         // 发放积分
-        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
         
         return person;
     }
@@ -368,7 +368,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean getWxUserSign(String openid) {
+    public ResponseBean getWxUserSign(String openid, Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -380,7 +380,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
 
         if (todaySigned) {
-            return ResponseBean.error("请不要重复签到", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("请不要重复getPersonId(request);", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;
@@ -396,8 +396,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
 
         sign.setPerson(taPerson);
-        pointsRecordsService.checkinPoints(sign);
-        applicationContext.publishEvent(new EventBus(sign, EventBus.EventType.DailyCheckin));
+        pointsRecordsService.checkinPoints(sign, orgId);
+        applicationContext.publishEvent(new EventBus(sign, EventBus.EventType.DailyCheckin, orgId));
 
         return ResponseBean.success("success");
     }
@@ -718,7 +718,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         double r = Math.random();
         int i = (int)(r*100000);
         String str = String.valueOf(i);
-        if(str.length()>6){
+        if(str.length()<6){
             int need = 6-str.length();
             for(int j=0;j<need;j++){
                 str += "0";

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

@@ -69,7 +69,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 	@Override
-	public void sharePoints(TaShare taShare) {
+	public void sharePoints(TaShare taShare, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
 		if (pointsAmount == 0) {
@@ -92,13 +92,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void sharePosterAll(String recommenderId) {
+	public void sharePosterAll(String recommenderId, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
 		if (pointsAmount == 0) {
@@ -114,13 +114,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson person = taPersonMapper.selectById(recommenderId);
-		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void checkinPoints(TaPersonSign taPersonSign) {
+	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
 		if (pointsAmount == 0) {
@@ -153,13 +153,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void signUpPoints(TaPerson taPerson) {
+	public void signUpPoints(TaPerson taPerson, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
 		if (pointsAmount == 0) {
@@ -180,13 +180,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 
 		// 发放积分
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer) {
+	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
 		if (pointsAmount == 0) {
@@ -211,7 +211,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
@@ -223,7 +223,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 	@Override
-	public void consumeGoodsPoints(TaGoods taGoods) {
+	public void consumeGoodsPoints(TaGoods taGoods, Integer orgId) {
 		Integer minusPoints = taGoods.getPointPrice();
 		if (null == minusPoints || minusPoints <= 0) {
 			return;
@@ -249,12 +249,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		Integer pointsAmount = 0 - minusPoints;
-		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount)) {
+		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
 
-	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount) {
+	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount, Integer orgId) {
 		TaPointsRecords taPointsRecords = new TaPointsRecords();
 		taPointsRecords.setPersonId(person.getPersonId());
 		taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(),person.getNickname()));
@@ -264,6 +264,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		taPointsRecords.setChangeParams(changeParams);
 		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
 		taPointsRecords.setCreateDate(LocalDateTime.now());
+		taPointsRecords.setOrgId(orgId);
 
 		return taPointsRecordsMapper.insert(taPointsRecords) > 0;
 	}
@@ -282,7 +283,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 //		}
 //	}
 	
-	private void sendPoints(TaPerson person,Integer rulesId,String shareType) {
+	private void sendPoints(TaPerson person,Integer rulesId,String shareType, Integer orgId) {
 		//发放积分
 		QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("rule_id",rulesId);
@@ -301,6 +302,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 			taPointsRecords.setChangeParams(jsonObject.toJSONString());
 			taPointsRecords.setCreateDate(LocalDateTime.now());
 			taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+			taPointsRecords.setOrgId(orgId);
 			taPointsRecordsMapper.insert(taPointsRecords);
 			//添加积分
 			UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();

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

@@ -171,11 +171,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
+        taRecommendCustomer.setOrgId(orgId);
 
         // 时间格式 yyyy-MM-dd
         String at = params.getString("appointmentTime");
         if (!StringUtils.isEmpty(at)) {
-            taRecommendCustomer.setAppointmentTime(DateUtils.day2LocalDateime(at));
+            taRecommendCustomer.setAppointmentTime(DateUtils.dayToLocalDateime(at));
         }
 
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
@@ -185,13 +186,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setDemandType(params.getString("demandType"));
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
+        // taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
 
 
         String status = params.getString("status");
         int statusInt = 0;
-        if (null == status) statusInt = Integer.parseInt(status);
-        taRecommendCustomer.setStatus(statusInt);
+        if (StringUtils.isEmpty(status)){
+            taRecommendCustomer.setStatus(statusInt);
+        }else{
+            taRecommendCustomer.setStatus(Integer.parseInt(status));
+        }
+
         taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
         // 报备有 10 天有效期
@@ -250,6 +255,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setReportRecommendStatus(CommConstant.READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
+        taRecommendCustomer.setPersonId(taPerson.getPersonId());
 
         // 时间格式 yyyy-MM-dd
 //        String at = params.getString("appointmentTime");
@@ -334,16 +340,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
         }
 
     }

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

@@ -45,7 +45,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
     @Override
-    public ResponseBean postLike(String openid, String typeOf, String like) {
+    public ResponseBean postLike(String openid, String typeOf, String like,Integer orgId) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -71,6 +71,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         taSave.setNameOrnick(taPerson.getNickname());
         taSave.setPersonId(taPerson.getPersonId());
         taSave.setPhotoOravatar(taPerson.getAvatarurl());
+        taSave.setOrgId(orgId);
         taSave.setTagertType(typeOf);
 
         int row = taSaveMapper.insert(taSave);

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

@@ -124,7 +124,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public void makeSure(String openid, String typeOf, String id) {
+    public void makeSure(String openid, String typeOf, String id, Integer orgId) {
         // 查找分享记录
         TaShare taShare = taShareMapper.selectById(id);
         if (null == taShare) {
@@ -161,7 +161,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         // 赠送积分
         // 发放分享积分
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
-            applicationContext.publishEvent(new EventBus(taShare, EventBus.EventType.SharePoster));
+            applicationContext.publishEvent(new EventBus(taShare, EventBus.EventType.SharePoster, orgId));
         }
     }
 

src/main/resources/application-v3.yml

@@ -4,14 +4,14 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
+   username: estateagents
+   password: DQ@0lW##kBb2+-jPZ
+   url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+   driver-class-name: com.mysql.cj.jdbc.Driver
+   initial-size: 10 # 初始化连接数
+   max-active: 20 # 最大连接数
+   min-idle: 8 # 最小空闲数
+   max-idle: 8 # 最大空闲数
   servlet:
     multipart:
       max-file-size: 10MB

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -2,15 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
-             SELECT
-                tade.*,
-                tp.name as sharePersonName,
-                tao.name as orgName
-            FROM
-                ta_activity_dynamic_enlist tade LEFT JOIN ta_person tp on tade.share_person = tp.person_id
-                LEFT JOIN ta_org tao on tade.org_id = tao.org_id
-            WHERE
-                tade.dynamic_id = #{dynamicId}
+
+                SELECT
+                    tade.*,
+                    tp.NAME AS sharePersonName,
+                    tp.company AS orgName
+                FROM
+                    ta_activity_dynamic_enlist tade
+                    LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
+                    LEFT JOIN ta_person tp ON tspf.share_person = tp.user_id
+                WHERE
+                    tade.dynamic_id = #{dynamicId}
                 AND tade.org_id = #{orgId}
 
         </select>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -17,29 +17,32 @@
           )
     </insert>
     <select id="buildingDynamicList" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">
-        select * from ta_building_dynamic where status>-1
+        select
+        *,
+        (select sum(tade.attend_num) from ta_activity_dynamic_enlist tade where tade.dynamic_id = tbd.dynamic_id ) as count
+        from ta_building_dynamic tbd where tbd.status>-1
         <if test="name != null and name !=''">
-            and title like CONCAT('%', #{name} , '%')
+            and tbd.title like CONCAT('%', #{name} , '%')
         </if>
         <if test="buildingId != null and buildingId !=''">
-            and building_id = #{buildingId}
+            and tbd.building_id = #{buildingId}
         </if>
         <if test="isEnlist != null and isEnlist !=''">
-            and is_enlist = #{isEnlist}
+            and tbd.is_enlist = #{isEnlist}
         </if>
         <if test="cityId != 0 and cityId != null">
-            and city_id = #{cityId}
+            and tbd.city_id = #{cityId}
         </if>
         <if test="title != null and title != ''">
-            and title = #{title}
+            and tbd.title like CONCAT('%', #{title} , '%')
         </if>
         <if test="orgId != null and orgId != ''">
-            and org_id = #{orgId}
+            and tbd.org_id = #{orgId}
         </if>
         <if test="time != null">
-            and TO_DAYS(create_date) = TO_DAYS(#{time})
+            and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
-        ORDER BY create_date DESC
+        ORDER BY tbd.create_date DESC
   </select>
 
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">

src/main/resources/mapper/TaPersonMapper.xml

@@ -14,7 +14,7 @@
             u.description as description
         FROM
             ta_person t left join ta_user u on t.user_id = u.user_id
-        LEFT JOIN ta_person_building p ON t.person_id = p.person_id
+        LEFT JOIN ta_person_building p ON u.user_id = p.user_id
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
@@ -141,8 +141,8 @@ FROM
         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 collection="personIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
             </foreach>
         </if>
         ORDER BY
@@ -296,7 +296,7 @@ FROM
                         tp.create_date as create_date
                     FROM
                       ta_person tp
-                    where ifnull(tp.person_type, '') != #{personType}
+                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
                     and tp.phone is NOT NULL
                     <if test="startDate != null or endDate != null">
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -334,7 +334,7 @@ FROM
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>
@@ -503,12 +503,8 @@ FROM
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
-        p.person_id,
-        p.avatarurl,
-        p.sex,
-        rc.`name` as name,
-        rc.phone as tel,
-        COUNT(rc.person_id) as recommendCount
+        p.*,
+        COUNT(rc.person_id) AS recommendCount
         from ta_channel_person tch
         left join  ta_person p on  tch.person_id = p.person_id
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -17,8 +17,8 @@
             tpvr.event as event,
             tpvr.event_type as eventType,
             tpvr.visit_duration as visitDuration,
-            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as visitTime,
-            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as leaveTime,
+            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as visitTime,
+            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as leaveTime,
             ifnull(tp.name, tp.nickname) as userName,
             tbe.event_name as eventName,
             COUNT(1) as accessCount
@@ -27,6 +27,8 @@
             LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
             LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
             <trim prefix="where" prefixOverrides="and | or">
+                tpvr.org_id = #{orgId}
+                and tp.org_id = #{orgId}
                 <if test="startDate != null and endDate != null">
                     and tpvr.visit_time between #{startDate} and #{endDate}
                 </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -151,14 +151,15 @@ FROM
         b.name as consultantName,
         b.tel as consultTel,
         c.nickname as recommendName,
-        c.tel as recommendTel
+        c.tel as recommendTel,
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{building} and tspf.is_first_time = 1) as sharePersonName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
-            and realty_consultant is not null
+            and a.realty_consultant is not null
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
@@ -183,6 +184,9 @@ FROM
             <if test="verifyStatus != null and verifyStatus !=''">
                 and a.verify_status = #{verifyStatus}
             </if>
+            <if test="status != null and status !=''">
+                and a.status = #{status}
+            </if>
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
@@ -201,7 +205,8 @@ FROM
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-        b.*
+        b.*,
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
         FROM
         ta_person b
         <where>
@@ -237,7 +242,9 @@ FROM
         a.intention as intention,
         a.create_date as createDate,
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
-        concat(c.nickname, c.phone) as recommend
+        c.nickname as recommend,
+        c.phone as recommendTel,
+        if(a.verify_status = 0, '未通过', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '已驳回', ''))) as verifyStatusName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
@@ -330,13 +337,31 @@ FROM
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
         if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
-        tc.channel_name  as channelName
+        tc.channel_name  as channelName,
+        (
+            SELECT
+              count( 1 )
+            FROM
+              ta_recommend_customer tarc
+            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
+            WHERE
+              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') = 'customer'
+        ) AS recommedCount,
+        (
+            SELECT
+              count( 1 )
+            FROM
+              ta_recommend_customer tarc
+            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
+            WHERE
+              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') in ('channel agent', 'estate agent')
+        ) AS agentCount
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id
         left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
-            a.person_type = 'estate agent'
+            ifnull(a.person_type, '') in ('channel agent', 'estate agent')
             and a.status >0
             <if test="orgId != null">
                 and a.org_id = #{orgId}
@@ -346,6 +371,167 @@ FROM
 
         ORDER BY
         a.create_date DESC
+        limit #{pageCode}, #{pageSize}
+    </select>
+
+
+    <select id="getPublicCustomerExportListCount" resultType="Integer">
+        SELECT
+        count(1)
+        FROM
+        ta_person b
+        <where>
+            b.status > 0
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            <if test="name != null and name !=''">
+                and b.nickname like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            <if test="orgId != null">
+                and b.org_id = #{orgId}
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+    </select>
+
+    <select id="getPublicCustomerExportList" resultType="com.huiju.estateagents.excel.PublicCustomerExport">
+        SELECT
+          b.nickname as nickname,
+          b.phone as phone,
+          if(b.sex = 1, '男', if(b.sex = 2, '女', '未知')) as sex
+        FROM
+        ta_person b
+        <where>
+            b.status > 0
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            <if test="name != null and name !=''">
+                and b.nickname like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            <if test="orgId != null">
+                and b.org_id = #{orgId}
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+        limit #{pageCode}, #{pageSize}
+    </select>
+
+    <select id="getCustomerExportListCount" resultType="Integer" >
+        SELECT
+            count(1)
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            and realty_consultant is not null
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and b.name like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="status != null and status !=''">
+                and a.status = #{status}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+        </where>
+        order by a.create_date desc
+    </select>
+
+
+    <select id="getCustomerExportList" resultType="com.huiju.estateagents.excel.PrivateCustomerExport">
+        SELECT
+        a.name AS name,
+        a.phone as phone,
+        if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
+        b.name as consultantName,
+        b.tel as consultTel
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            and realty_consultant is not null
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and b.name like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="status != null and status !=''">
+                and a.status = #{status}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+        </where>
+        order by a.create_date desc
+        limit #{pageCode}, #{pageSize}
     </select>
 
 </mapper>