合并

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

@@ -182,22 +182,22 @@ public class CommConstant {
     /**
      * 客户报备
      */
-    public static final String CUSTOMER_REPORT = "1";
+    public static final Integer CUSTOMER_REPORT = 1;
 
     /**
      * 客户到访
      */
-    public static final String CUSTOMER_VISITE = "2";
+    public static final Integer CUSTOMER_VISITE = 2;
 
     /**
      * 客户认购
      */
-    public static final String CUSTOMER_PREORDER = "3";
+    public static final Integer CUSTOMER_PREORDER = 3 ;
 
     /**
      * 客户签约
      */
-    public static final String CUSTOMER_SIGNED = "4";
+    public static final Integer CUSTOMER_SIGNED = 4;
 
 
     /**

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

@@ -71,13 +71,13 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender) {
+    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender,HttpServletRequest request) {
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         try {
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
-
+            Integer orgId =getOrgId(request);
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
@@ -86,13 +86,14 @@ public class MiniAppController {
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
             personQueryWrapper.eq("mini_openid",session.getOpenid());
+            personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
             if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid());
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(),orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -221,14 +222,13 @@ public class MiniAppController {
 
         // 更新用户绑定手机
         String openid = JWTUtils.getSubject(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber());
+        Integer orgId = getOrgId(request);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-        taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
@@ -262,23 +262,6 @@ public class MiniAppController {
 //            if(list.size()<=0){
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
-        } else{
-            TaRecommendCustomer reCustomer = new TaRecommendCustomer();
-            reCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            reCustomer.setName(person.getNickname());
-            reCustomer.setPhone(phoneNoInfo.getPhoneNumber());
-            reCustomer.setSex(Integer.valueOf(person.getGender()));
-            reCustomer.setPersonId(person.getPersonId());
-            reCustomer.setPicture(person.getAvatarurl());
-            reCustomer.setCountry(person.getCountry());
-            reCustomer.setCity(person.getCity());
-            reCustomer.setProvince(person.getProvince());
-            reCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-            reCustomer.setCreateDate(LocalDateTime.now());
-            reCustomer.setReportRecommendStatus(CommConstant.READY);
-            if(!taRecommendCustomerService.save(reCustomer)){
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
         }
         return ResponseBean.success(phoneNoInfo);
     }
@@ -312,4 +295,15 @@ public class MiniAppController {
             return ResponseBean.error("获取二维码参数失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
+
+
+    public Integer getOrgId(HttpServletRequest request){
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")){
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
 }

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

@@ -204,6 +204,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
     ){
+        Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
             String openid = JWTUtils.getSubject(request);
@@ -220,7 +221,7 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
     }
 
 

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

@@ -103,6 +103,7 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
         ResponseBean  responseBean = new ResponseBean();
         if(mine){
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -112,7 +113,7 @@ public class TaBuildingDynamicController extends BaseController {
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
         }
 
         return responseBean;

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 {
@@ -143,11 +145,12 @@ public class TaChannelController extends BaseController {
      * @param channel 实体对象
      * @return
      */
-    @RequestMapping(value="/channel/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.PUT)
     public ResponseBean channelUpdate(@PathVariable Integer id,
                                         @RequestBody TaChannel channel){
         ResponseBean responseBean = new ResponseBean();
         try {
+            channel.setChannelId(id);
             if (taChannelService.updateById(channel)){
                 responseBean.addSuccess(channel);
             }else {
@@ -165,7 +168,7 @@ public class TaChannelController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/channel/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.GET)
     public ResponseBean channelGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -185,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
@@ -58,7 +66,7 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
                                     @RequestParam(value ="priceLesser",required = false) Integer priceLesser,
                                     @RequestParam(value ="priceGreater",required = false) Integer priceGreater,
-                                    @RequestParam(value ="status",required = false) Integer status){
+                                    @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -68,6 +76,7 @@ public class TaGoodsController extends BaseController {
             queryWrapper.lt(null!=priceGreater,"point_price",priceGreater);
             queryWrapper.gt(null != priceLesser,"point_price",priceLesser);
             queryWrapper.eq(null != status,"status",status);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.orderByDesc("create_date");
 
@@ -87,13 +96,13 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
-    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.save(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -135,13 +144,13 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -161,7 +170,7 @@ public class TaGoodsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
-    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
@@ -169,6 +178,7 @@ public class TaGoodsController extends BaseController {
             }else {
                 taGoods.setStatus(CommConstant.STATUS_NORMAL);
             }
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -209,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);
@@ -226,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,6 +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);
@@ -98,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/TaPersonController.java

@@ -70,6 +70,7 @@ public class TaPersonController extends BaseController {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        Integer orgId = getOrgId(request);
         if (mine){
             String openid = JWTUtils.getSubject(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -80,7 +81,7 @@ public class TaPersonController extends BaseController {
             IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId);
             return ResponseBean.success(result);
         }
 
@@ -88,7 +89,8 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerConsultant")
-    public ResponseBean registerConsultant(@RequestParam Integer orgId,HttpServletRequest request) {
+    public ResponseBean registerConsultant(HttpServletRequest request) {
+        Integer orgId =getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -114,8 +116,9 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerAgent")
-    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,@RequestParam Integer orgId,HttpServletRequest request) {
+    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -57,7 +58,7 @@ public class TaPointsExchangeController extends BaseController {
                                              @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
                                              @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
                                              @RequestParam(value ="status",required = false) Integer status,
-                                             @RequestParam(value ="tel",required = false) String tel){
+                                             @RequestParam(value ="tel",required = false) String tel, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -72,6 +73,7 @@ public class TaPointsExchangeController extends BaseController {
             taPointsExchange.setEndVerifyDate(endVerifyDate);
             taPointsExchange.setStatus(status);
             taPointsExchange.setTel(tel);
+            taPointsExchange.setOrgId(getOrgId(request));
             
             responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 

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

@@ -95,7 +95,8 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/new")
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.recommendCust(paramStr, openid);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
     }
 
     /**
@@ -107,7 +108,8 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/report")
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.reportCust(paramStr, openid);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
     }
 
     @PostMapping("/wx/customer/recommend")
@@ -149,8 +151,7 @@ public class TaRecommendCustomerController extends BaseController {
 
     // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
-    public ResponseBean getCustomerList (HttpServletRequest request,
-                                         @RequestParam(value ="name",required = false) String name,
+    public ResponseBean getCustomerList (@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,
@@ -203,10 +204,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, getOrgId(request)));
+            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/TaChannel.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -81,5 +82,9 @@ public class TaChannel implements Serializable {
      */
     private String buildingId;
 
-
+    /**
+     * 说明描述
+     */
+    @TableField(value = "`explain`")
+    private String explain;
 }

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

@@ -228,7 +228,7 @@ public class TaPerson implements Serializable {
 
     private String fromCode;
 
-    private String orgId;
+    private Integer orgId;
 
     private Integer userId;
 
@@ -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/entity/TaRecommendCustomer.java

@@ -105,7 +105,7 @@ public class TaRecommendCustomer implements Serializable {
      * 状态
      */
     @TableField(value = "`status`")
-    private String status;
+    private Integer status;
 
     /**
      * 推荐人
@@ -147,6 +147,8 @@ public class TaRecommendCustomer implements Serializable {
 
     private Integer reportRecommendStatus;
 
+    private Integer orgId;
+
     @TableField(exist = false)
     private List<TaPersonVisitRecord> visitRecords;
 

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

@@ -75,6 +75,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("houseTypeList") String[] houseTypeList,
                                          @Param("buildingTypeList") String[] buildingTypeList,
                                          @Param("priceList") List<String[]> priceList,
-                                         @Param("areaList") List<String[]> areaList);
+                                         @Param("areaList") List<String[]> areaList,
+                                         @Param("orgId")Integer orgId);
 
 }

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

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId);
+    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId,@Param("orgId")Integer orgId);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 
@@ -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/service/ITaBuildingDynamicService.java

@@ -38,7 +38,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId);
 
     /**
      * 微信小程序 项目详情

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

@@ -126,7 +126,8 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
-            List<String[]> areaList);
+            List<String[]> areaList,
+            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

@@ -22,9 +22,9 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone);
+    TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 
@@ -42,7 +42,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
 
-    TaPerson newPersonByOpenid(String openid);
+    TaPerson newPersonByOpenid(String openid,Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);
 
@@ -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

@@ -22,9 +22,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean updateCustByJSON(String paramStr);
 
-    ResponseBean recommendCust(String paramStr, String openid);
+    ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
 
-    ResponseBean reportCust(String paramStr, String openid);
+    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
@@ -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, Integer orgId);
 
-    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> 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/TaBuildingDynamicServiceImpl.java

@@ -93,7 +93,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -107,6 +107,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
+        buildingDynamicQueryWrapper.eq("org_id",orgId);
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();

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

@@ -391,7 +391,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
-            List<String[]> areaList) {
+            List<String[]> areaList,
+            Integer orgId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         if(CollectionUtils.isEmpty(targets) && mine){
@@ -409,7 +410,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {

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

@@ -123,7 +123,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson updatePersonPhone(String miniOpenid, String phone) {
+    public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
         // 先查询是否存在用户
         TaPerson person = null;
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
@@ -145,9 +145,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
-        wrapper.set("person_type",CommConstant.PERSON_ESTATE_AGENT);
+        wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);
         wrapper.eq("mini_openid", miniOpenid);
-        wrapper.isNull("person_type");
+        wrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         taPersonMapper.update(new TaPerson(), wrapper);
 
         person.setPhone(phone);
@@ -155,7 +155,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             person.setTel(phone);
         }
 
-        iTaRecommendCustomerService.newByPerson(person);
+       // iTaRecommendCustomerService.newByPerson(person);
         
         // 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
@@ -164,13 +164,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId) {
+    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId) {
         Page<Map<String, Object>> page = new Page<>();
         page.setSize(pageSize);
         page.setPages(pageNumber);
         page.setCurrent(pageNumber);
 
-        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId);
+        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId,orgId);
         page.setRecords(result);
 
         return page;
@@ -398,13 +398,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson newPersonByOpenid(String openid) {
+    public TaPerson newPersonByOpenid(String openid,Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             TaPerson taPerson = new TaPerson();
             taPerson.setMiniOpenid(openid);
             taPerson.setNickname("匿名用户");
+            taPerson.setOrgId(orgId);
             taPerson.setAvatarurl(CommConstant.MINIAPP_DEFAULT_AVATAR);
+            taPerson.setPersonType(CommConstant.PERSON_ESTATE_DRIFT);
             taPerson.setStatus(CommConstant.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
             if (taPersonMapper.insert(taPerson) > 0) {
@@ -610,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

@@ -140,7 +140,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public ResponseBean recommendCust(String paramStr, String openid) {
+    public ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -186,8 +186,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
         String status = params.getString("status");
-        if (null == status) status = "1";
-        taRecommendCustomer.setStatus(status);
+        int statusInt = 0;
+        if (null == status) statusInt = Integer.parseInt(status);
+        taRecommendCustomer.setStatus(statusInt);
         taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
         // 报备有 10 天有效期
@@ -218,7 +219,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public ResponseBean reportCust(String paramStr, String openid) {
+    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -235,7 +236,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-
+        taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setName(taPerson.getNickname());
         taRecommendCustomer.setPicture(taPerson.getAvatarurl());
         taRecommendCustomer.setPhone(params.getString("phone"));
@@ -243,7 +244,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
-        taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
 
@@ -260,8 +261,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDemandType(params.getString("demandType"));
 //        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-        taRecommendCustomer.setStatus(CommConstant.STATUS_NORMAL + "");
+        taRecommendCustomer.setVerifyStatus(CommConstant.READY);
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
 
 
 //        String status = params.getString("status");

src/main/resources/mapper/TaBuildingMapper.xml

@@ -92,6 +92,7 @@
              select * from  ta_building
                 WHERE
                 `status` = 1
+                and org_id = #{orgId}
                 <if test="cityId != null">
                     AND city_id = #{cityId}
                 </if>

src/main/resources/mapper/TaChannelMapper.xml

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

src/main/resources/mapper/TaPersonMapper.xml

@@ -17,6 +17,7 @@
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
+        and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and p.building_id = #{buildingId}
         </if>
@@ -491,23 +492,29 @@ FROM
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
+        p.person_id,
         p.avatarurl,
-        p.name,
         p.tel,
         p.sex,
+        rc.`name`,
+        rc.phone,
         COUNT(rc.person_id) as recommendCount
         from ta_person p
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
         <where>
         <if test="name !=null and name !=''">
-            and name = #{name}
+            and rc.`name` = #{name}
         </if>
         <if test="phone !=null and phone !=''">
-            and tel = #{phone}
+            and rc.phone = #{phone}
         </if>
-        and person_type = 'estate agent'
+            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/TaPointsExchangeMapper.xml

@@ -28,6 +28,9 @@
         <if test="taPointsExchange.status != null and taPointsExchange.status != '' or taPointsExchange.status ==0">
             and  t.`status` = #{taPointsExchange.status}
         </if>
+        <if test="taPointsExchange.orgId != null and taPointsExchange.orgId != ''">
+            and  t.org_id = #{taPointsExchange.orgId}
+        </if>
         <if test="taPointsExchange.personName != null and taPointsExchange.personName != ''">
             and  t.person_name like concat('%',#{taPointsExchange.personName},'%')
         </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -139,6 +139,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