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

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

@@ -67,19 +67,19 @@ public class TaChannelController extends BaseController {
                                     @RequestParam(value ="channelId",required = false) Integer channelId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String orgid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
         try {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(null != channelId, "channel_id", channelId);
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
-
             IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
           HashMap hashMap  = new HashMap<>();
             hashMap.put("result",result);
             // 下拉列表的数据 all
-            List<TaChannel> taChannelList = taChannelMapper.selectChannelList();
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
             hashMap.put("channelNmae",taChannelList);
             responseBean.addSuccess(hashMap);
         }catch (Exception e){
@@ -96,12 +96,14 @@ public class TaChannelController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
-    public ResponseBean channelAdd(@RequestBody TaChannel channel){
+    public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         try {
             // 生成6位数的渠道码
             int channelCode= taChannelMapper.channelCode();
             channel.setChannelCode(String.valueOf(channelCode));
+            channel.setOrgId(orgId);
             if (taChannelService.save(channel)){
                 responseBean.addSuccess(channel);
             }else {
@@ -186,8 +188,23 @@ public class TaChannelController extends BaseController {
     public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
                                            @RequestParam(value="phone",required = false) String phone,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        Integer orgid = getOrgId(request);
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid);
+        return taPerson;
+    }
+
+    /**
+     * 渠道邀请经纪人
+     */
+    @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
+    public  ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
         return taPerson;
     }
 }

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

@@ -9,8 +9,10 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaGoods;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaGoodsService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.invoke.ConstantCallSite;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -45,6 +50,9 @@ public class TaGoodsController extends BaseController {
     @Autowired
     public ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -211,8 +219,15 @@ public class TaGoodsController extends BaseController {
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
-                                    @RequestParam(value = "orgId",required = false) Integer orgId){
+                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         try {
             //使用分页插件
             IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
@@ -228,6 +243,9 @@ public class TaGoodsController extends BaseController {
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
+            Map<String,Object> data = new HashMap<>();
+            data.put("goods",result);
+            data.put("person",person);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -88,7 +88,7 @@ public class TaNewsController extends BaseController {
                                      HttpServletRequest request
     ){
         List<String> targets = new ArrayList<>();
-
+        Integer orgId = getOrgId(request);
         if (null != mine && mine) {
             String openid = JWTUtils.getSubject(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
@@ -99,7 +99,7 @@ public class TaNewsController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
         }
 
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine);
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine,orgId);
         return ResponseBean.success(results);
     }
 

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

@@ -59,7 +59,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPointsRecords",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.GET)
     public ResponseBean taPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -79,12 +79,47 @@ public class TaPointsRecordsController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+    public ResponseBean taWxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            Integer orgId = getOrgId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            //使用分页插件
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param taPointsRecords 实体对象
      * @return
      */
-    @RequestMapping(value="/taPointsRecords",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.POST)
     public ResponseBean taPointsRecordsAdd(@RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -106,7 +141,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPointsRecords/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taPointsRecords/{id}", method= RequestMethod.DELETE)
     public ResponseBean taPointsRecordsDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -129,7 +164,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param taPointsRecords 实体对象
      * @return
      */
-    @RequestMapping(value="/taPointsRecords/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.PUT)
     public ResponseBean taPointsRecordsUpdate(@PathVariable Integer id,
                                         @RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
@@ -152,7 +187,7 @@ public class TaPointsRecordsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taPointsRecords/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
     public ResponseBean taPointsRecordsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -165,34 +200,34 @@ public class TaPointsRecordsController extends BaseController {
         return responseBean;
     }
     
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
-    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            String openid = JWTUtils.getSubject(request);
-            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
-            //使用分页插件
-            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("person_id",taPerson.getPersonId());
-            queryWrapper.orderByDesc("create_date");
-            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsRecordsList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+//    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+//                                            HttpServletRequest request){
+//        ResponseBean responseBean = new ResponseBean();
+//        try {
+//            String openid = JWTUtils.getSubject(request);
+//            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
+//            //使用分页插件
+//            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.eq("person_id",taPerson.getPersonId());
+//            queryWrapper.orderByDesc("create_date");
+//            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+//            responseBean.addSuccess(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            logger.error("taPointsRecordsList -=- {}",e.toString());
+//            responseBean.addError(e.getMessage());
+//        }
+//        return responseBean;
+//    }
 
     /**
      * 分页查询列表
@@ -200,7 +235,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/mine/taPointsRecords/{id}",method= RequestMethod.GET)
     public ResponseBean CustomerPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @PathVariable(value = "id") String id){

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

@@ -203,10 +203,9 @@ 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, HttpServletRequest request){
-        String personId = JWTUtils.getSubject(request);
-        TaPerson taPerson = taPersonService.getById(personId);
+        Integer orgid = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,orgid));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -20,6 +20,8 @@ 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;
+
 /**
  * <p>
     * 积分获取规则字典表  前端控制器
@@ -48,14 +50,55 @@ public class TdPointsRulesController extends BaseController {
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @RequestParam(value ="buildingId", required = false) String buildingId,
-                                          @RequestParam(value = "type", required = false) String type){
+                                          @RequestParam(value = "type", required = false) String type,
+                                          HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
+            Integer orgId = getOrgId(request);
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+            if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
+                queryWrapper.isNull("building_id");
+            } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {
+                queryWrapper.isNotNull("building_id");
+            }
+
+            IPage<TdPointsRules> result = iTdPointsRulesService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdPointsRulesList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/tdPointsRules",method= RequestMethod.GET)
+    public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="buildingId", required = false) String buildingId,
+                                            @RequestParam(value = "type", required = false) String type,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
+
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+            Integer orgId = getOrgId(request);
+            queryWrapper.eq("org_id",orgId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
                 queryWrapper.isNull("building_id");
             } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {

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

@@ -252,4 +252,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String channelName;
+
+    /**
+     * 邀请客户总数
+     */
+    @TableField(exist = false)
+    private int inviteCount;
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaChannel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,5 +28,5 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * 渠道页面下拉列表的所有数据
      * @return
      */
-    List<TaChannel> selectChannelList();
+    List<TaChannel> selectChannelList(@Param("orgId")Integer orgId);
 }

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

@@ -170,5 +170,13 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param phone
      * @return
      */
-    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone);
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid);
+
+    /**
+     * 渠道邀请经纪人
+     * @param pg
+     * @param id
+     * @return
+     */
+    IPage<TaPerson> InviteClientsList(IPage<TaChannel> pg, @Param("id") String id);
 }

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

@@ -28,7 +28,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     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);
     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);
-    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);
+    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);
 
     /**

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

@@ -70,5 +70,5 @@ public interface ITaNewsService extends IService<TaNews> {
      */
     ResponseBean wxTaPvNum(Integer id);
 
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine);
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine,Integer orgId);
 }

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

@@ -73,5 +73,15 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @param phone
      * @return
      */
-    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize);
+    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid);
+
+    /**
+     * 渠道下邀请经纪人
+     * @param id
+     * @param phone
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize);
 }

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

@@ -32,7 +32,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
 
-    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
+    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex,Integer orgid);
 
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 

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

@@ -200,13 +200,14 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     }
 
     @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine) {
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine,Integer orgId) {
         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(null != cityId && cityId != 0,"city_id",cityId);
+        taNewsQueryWrapper.eq("org_id",orgId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq("news_status", 0);
         taNewsQueryWrapper.orderByDesc("create_date");

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

@@ -612,10 +612,38 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize) {
+    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone);
+        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone,orgid);
+        List<TaPerson> taPersonList= IPage.getRecords();
+        for (TaPerson taPerson:taPersonList){
+            QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
+            taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
+            /*推荐客户总数*/
+            int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
+            taPerson.setRecommendCount(recommendCount);
+
+            // 邀请客户总数
+            QueryWrapper<TaPerson> taPersonQueryWrapper= new QueryWrapper<>();
+            taPersonQueryWrapper.eq("recommend_agent",taPerson.getPersonId());
+            int  inviteCount= taPersonMapper.selectCount(taPersonQueryWrapper);
+            taPerson.setInviteCount(inviteCount);
+        }
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",taPersonList);
+        hashMap.put("total",IPage.getTotal());
+        hashMap.put("pageNum",IPage.getCurrent());
+        hashMap.put("pageSize",IPage.getSize());
+        responseBean.addSuccess(hashMap);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> IPage = taPersonMapper.InviteClientsList(pg,id);
         responseBean.addSuccess(IPage);
         return responseBean;
     }

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

@@ -361,9 +361,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
+    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex,Integer orgid){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex,orgid);
     }
 
     @Override

src/main/resources/mapper/TaChannelMapper.xml

@@ -25,5 +25,6 @@
     
     <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
         select * from ta_channel
+        where org_id = #{orgId}
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -492,6 +492,7 @@ FROM
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
+        p.person_id,
         p.avatarurl,
         p.tel,
         p.sex,
@@ -508,8 +509,12 @@ FROM
             and rc.phone = #{phone}
         </if>
             and p.person_type = 'estate agent'
+            and p.org_id= #{orgid}
         </where>
         GROUP BY p.person_id
     </select>
 
+    <select id="InviteClientsList" resultType="com.huiju.estateagents.entity.TaPerson">
+        select * from ta_person WHERE recommend_agent = #{id}
+    </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -133,6 +133,7 @@ FROM
             </if>
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
+                and a.org_id = #{orgid}
             </if>
         </where>
         order by a.create_date desc