dingxin 5 年之前
父節點
當前提交
c48e3cd42e

+ 23
- 6
src/main/java/com/huiju/estateagents/controller/TaChannelController.java 查看文件

@@ -67,19 +67,19 @@ public class TaChannelController extends BaseController {
67 67
                                     @RequestParam(value ="channelId",required = false) Integer channelId,
68 68
                                     HttpServletRequest request){
69 69
         ResponseBean responseBean = new ResponseBean();
70
-        String orgid = JWTUtils.getSubject(request);
70
+        Integer orgId = getOrgId(request);
71 71
         try {
72 72
             //使用分页插件
73 73
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
74 74
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
75 75
             queryWrapper.eq(null != channelId, "channel_id", channelId);
76
+            queryWrapper.eq("org_id",orgId);
76 77
             queryWrapper.orderByDesc("create_date");
77
-
78 78
             IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
79 79
           HashMap hashMap  = new HashMap<>();
80 80
             hashMap.put("result",result);
81 81
             // 下拉列表的数据 all
82
-            List<TaChannel> taChannelList = taChannelMapper.selectChannelList();
82
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
83 83
             hashMap.put("channelNmae",taChannelList);
84 84
             responseBean.addSuccess(hashMap);
85 85
         }catch (Exception e){
@@ -96,12 +96,14 @@ public class TaChannelController extends BaseController {
96 96
      * @return
97 97
      */
98 98
     @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
99
-    public ResponseBean channelAdd(@RequestBody TaChannel channel){
99
+    public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
100
+        Integer orgId = getOrgId(request);
100 101
         ResponseBean responseBean = new ResponseBean();
101 102
         try {
102 103
             // 生成6位数的渠道码
103 104
             int channelCode= taChannelMapper.channelCode();
104 105
             channel.setChannelCode(String.valueOf(channelCode));
106
+            channel.setOrgId(orgId);
105 107
             if (taChannelService.save(channel)){
106 108
                 responseBean.addSuccess(channel);
107 109
             }else {
@@ -186,8 +188,23 @@ public class TaChannelController extends BaseController {
186 188
     public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
187 189
                                            @RequestParam(value="phone",required = false) String phone,
188 190
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
189
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
190
-        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
191
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
192
+                                           HttpServletRequest request){
193
+        Integer orgid = getOrgId(request);
194
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid);
195
+        return taPerson;
196
+    }
197
+
198
+    /**
199
+     * 渠道邀请经纪人
200
+     */
201
+    @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
202
+    public  ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
203
+                                           @RequestParam(value="phone",required = false) String phone,
204
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
205
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
206
+                                           HttpServletRequest request){
207
+        ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
191 208
         return taPerson;
192 209
     }
193 210
 }

+ 2
- 3
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

@@ -203,10 +203,9 @@ public class TaRecommendCustomerController extends BaseController {
203 203
                                          @RequestParam(value ="entryType",required = false) String entryType,
204 204
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
205 205
                                          @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
206
-        String personId = JWTUtils.getSubject(request);
207
-        TaPerson taPerson = taPersonService.getById(personId);
206
+        Integer orgid = getOrgId(request);
208 207
         try{
209
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
208
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,orgid));
210 209
         }catch (Exception e){
211 210
             e.printStackTrace();
212 211
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaPerson.java 查看文件

@@ -252,4 +252,10 @@ public class TaPerson implements Serializable {
252 252
      */
253 253
     @TableField(exist = false)
254 254
     private String channelName;
255
+
256
+    /**
257
+     * 邀请客户总数
258
+     */
259
+    @TableField(exist = false)
260
+    private int inviteCount;
255 261
 }

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java 查看文件

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

+ 9
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java 查看文件

@@ -170,5 +170,13 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
170 170
      * @param phone
171 171
      * @return
172 172
      */
173
-    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone);
173
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid);
174
+
175
+    /**
176
+     * 渠道邀请经纪人
177
+     * @param pg
178
+     * @param id
179
+     * @return
180
+     */
181
+    IPage<TaPerson> InviteClientsList(IPage<TaChannel> pg, @Param("id") String id);
174 182
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java 查看文件

@@ -28,7 +28,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
28 28
 
29 29
     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);
30 30
     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);
31
-    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);
31
+    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);
32 32
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
33 33
 
34 34
     /**

+ 11
- 1
src/main/java/com/huiju/estateagents/service/ITaPersonService.java 查看文件

@@ -73,5 +73,15 @@ public interface ITaPersonService extends IService<TaPerson> {
73 73
      * @param phone
74 74
      * @return
75 75
      */
76
-    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize);
76
+    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid);
77
+
78
+    /**
79
+     * 渠道下邀请经纪人
80
+     * @param id
81
+     * @param phone
82
+     * @param pageNum
83
+     * @param pageSize
84
+     * @return
85
+     */
86
+    ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize);
77 87
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java 查看文件

@@ -32,7 +32,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
32 32
 
33 33
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
34 34
 
35
-    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
35
+    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);
36 36
 
37 37
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
38 38
 

+ 30
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java 查看文件

@@ -612,10 +612,38 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
612 612
     }
613 613
 
614 614
     @Override
615
-    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize) {
615
+    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid) {
616 616
         ResponseBean responseBean = new ResponseBean<>();
617 617
         IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
618
-        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone);
618
+        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone,orgid);
619
+        List<TaPerson> taPersonList= IPage.getRecords();
620
+        for (TaPerson taPerson:taPersonList){
621
+            QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
622
+            taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
623
+            /*推荐客户总数*/
624
+            int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
625
+            taPerson.setRecommendCount(recommendCount);
626
+
627
+            // 邀请客户总数
628
+            QueryWrapper<TaPerson> taPersonQueryWrapper= new QueryWrapper<>();
629
+            taPersonQueryWrapper.eq("recommend_agent",taPerson.getPersonId());
630
+            int  inviteCount= taPersonMapper.selectCount(taPersonQueryWrapper);
631
+            taPerson.setInviteCount(inviteCount);
632
+        }
633
+        HashMap hashMap= new HashMap<>();
634
+        hashMap.put("list",taPersonList);
635
+        hashMap.put("total",IPage.getTotal());
636
+        hashMap.put("pageNum",IPage.getCurrent());
637
+        hashMap.put("pageSize",IPage.getSize());
638
+        responseBean.addSuccess(hashMap);
639
+        return responseBean;
640
+    }
641
+
642
+    @Override
643
+    public ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize) {
644
+        ResponseBean responseBean = new ResponseBean<>();
645
+        IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
646
+        IPage<TaPerson> IPage = taPersonMapper.InviteClientsList(pg,id);
619 647
         responseBean.addSuccess(IPage);
620 648
         return responseBean;
621 649
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java 查看文件

@@ -361,9 +361,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
361 361
 
362 362
 
363 363
     @Override
364
-    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
364
+    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){
365 365
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
366
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
366
+        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex,orgid);
367 367
     }
368 368
 
369 369
     @Override

+ 1
- 0
src/main/resources/mapper/TaChannelMapper.xml 查看文件

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

+ 5
- 0
src/main/resources/mapper/TaPersonMapper.xml 查看文件

@@ -492,6 +492,7 @@ FROM
492 492
 
493 493
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
494 494
         select
495
+        p.person_id,
495 496
         p.avatarurl,
496 497
         p.tel,
497 498
         p.sex,
@@ -508,8 +509,12 @@ FROM
508 509
             and rc.phone = #{phone}
509 510
         </if>
510 511
             and p.person_type = 'estate agent'
512
+            and p.org_id= #{orgid}
511 513
         </where>
512 514
         GROUP BY p.person_id
513 515
     </select>
514 516
 
517
+    <select id="InviteClientsList" resultType="com.huiju.estateagents.entity.TaPerson">
518
+        select * from ta_person WHERE recommend_agent = #{id}
519
+    </select>
515 520
 </mapper>

+ 1
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

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