张延森 2 vuotta sitten
vanhempi
commit
e45e4bea18

+ 15
- 0
src/main/java/com/yunzhi/marketing/borker/controller/BorkerController.java Näytä tiedosto

@@ -6,6 +6,7 @@ import com.yunzhi.marketing.base.BaseController;
6 6
 import com.yunzhi.marketing.base.ResponseBean;
7 7
 import com.yunzhi.marketing.borker.entity.BkBankCard;
8 8
 import com.yunzhi.marketing.borker.service.IBkBankCardService;
9
+import com.yunzhi.marketing.borker.vo.BorkerSummery;
9 10
 import com.yunzhi.marketing.borker.vo.BorkerVO;
10 11
 import com.yunzhi.marketing.common.CommConstant;
11 12
 import com.yunzhi.marketing.common.StringUtils;
@@ -45,6 +46,20 @@ public class BorkerController  extends BaseController {
45 46
     }
46 47
 
47 48
 
49
+    @RequestMapping(value="/wx/borker",method= RequestMethod.GET)
50
+    @ApiOperation(value="小程序端经纪人列表", notes = "小程序端经纪人列表", httpMethod = "GET", response = ResponseBean.class)
51
+    public ResponseBean getWxBorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
53
+                                        HttpServletRequest request) throws Exception {
54
+        // 我推荐的经纪人列表
55
+        String personId = getPersonId(request);
56
+
57
+        IPage<BorkerSummery> page = new Page<>(pageNum, pageSize);
58
+        IPage<BorkerSummery> result = iTaPersonService.getWxBorkerPage(page, personId);
59
+        return ResponseBean.success(result);
60
+    }
61
+
62
+
48 63
     @RequestMapping(value="/wx/bindBorker",method= RequestMethod.PUT)
49 64
     @ApiOperation(value="成为经纪人", notes = "成为经纪人", httpMethod = "PUT", response = ResponseBean.class)
50 65
     public ResponseBean bindBorker(@ApiParam("经纪人信息") @RequestBody BorkerVO borkerVO,

+ 44
- 0
src/main/java/com/yunzhi/marketing/borker/vo/BorkerSummery.java Näytä tiedosto

@@ -0,0 +1,44 @@
1
+package com.yunzhi.marketing.borker.vo;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableField;
4
+import com.yunzhi.marketing.borker.entity.BkBankCard;
5
+import io.swagger.annotations.ApiModel;
6
+import io.swagger.annotations.ApiModelProperty;
7
+import lombok.Data;
8
+import lombok.EqualsAndHashCode;
9
+import lombok.experimental.Accessors;
10
+
11
+import java.util.List;
12
+
13
+@Data
14
+@EqualsAndHashCode(callSuper = false)
15
+@Accessors(chain = true)
16
+@ApiModel(value="BorkerSummery", description="全民经纪人概要")
17
+public class BorkerSummery {
18
+
19
+    @ApiModelProperty("人员ID")
20
+    private String personId;
21
+
22
+    @ApiModelProperty("头像")
23
+    private String avatarurl;
24
+
25
+    @ApiModelProperty("姓名")
26
+    private String name;
27
+
28
+    @ApiModelProperty("昵称")
29
+    private String nickname;
30
+
31
+    @ApiModelProperty("电话")
32
+    private String phone;
33
+
34
+    @ApiModelProperty("性别")
35
+    private Integer sex;
36
+
37
+    @TableField(exist = false)
38
+    @ApiModelProperty("客户数")
39
+    Integer customerNum;
40
+
41
+    @TableField(exist = false)
42
+    @ApiModelProperty("经纪人数")
43
+    Integer borkerNum;
44
+}

+ 1
- 1
src/main/java/com/yunzhi/marketing/borker/vo/BorkerVO.java Näytä tiedosto

@@ -68,7 +68,7 @@ public class BorkerVO {
68 68
 
69 69
     @TableField(exist = false)
70 70
     @ApiModelProperty("客户数")
71
-    List<BkBankCard> customerNum;
71
+    Integer customerNum;
72 72
 
73 73
     @TableField(exist = false)
74 74
     @ApiModelProperty("银行卡列表")

+ 5
- 0
src/main/java/com/yunzhi/marketing/mapper/TaPersonMapper.java Näytä tiedosto

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.mapper;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.yunzhi.marketing.borker.vo.BorkerSummery;
6 7
 import com.yunzhi.marketing.borker.vo.BorkerVO;
7 8
 import com.yunzhi.marketing.entity.TaBuildingDynamic;
8 9
 import com.yunzhi.marketing.entity.TaChannel;
@@ -273,4 +274,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
273 274
                                   @Param("recommendPersonName") String recommendPersonName,
274 275
                                   @Param("sortOrder") String sortOrder,
275 276
                                   @Param("sortField") String sortField);
277
+
278
+    IPage<BorkerSummery> getWxBorkerPage(IPage<BorkerSummery> page,
279
+                                         @Param("personType") String personType,
280
+                                         @Param("recommendAgent") String recommendAgent);
276 281
 }

+ 3
- 0
src/main/java/com/yunzhi/marketing/service/ITaPersonService.java Näytä tiedosto

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.service;
3 3
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.yunzhi.marketing.base.ResponseBean;
6
+import com.yunzhi.marketing.borker.vo.BorkerSummery;
6 7
 import com.yunzhi.marketing.borker.vo.BorkerVO;
7 8
 import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
8 9
 import com.yunzhi.marketing.dto.PersonMarketingDTO;
@@ -133,4 +134,6 @@ public interface ITaPersonService extends IService<TaPerson> {
133 134
     ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
134 135
 
135 136
     IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField);
137
+
138
+    IPage<BorkerSummery> getWxBorkerPage(IPage<BorkerSummery> page, String personId);
136 139
 }

+ 6
- 0
src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java Näytä tiedosto

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
8 8
 import com.baomidou.mybatisplus.core.metadata.IPage;
9 9
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10 10
 import com.yunzhi.marketing.base.ResponseBean;
11
+import com.yunzhi.marketing.borker.vo.BorkerSummery;
11 12
 import com.yunzhi.marketing.borker.vo.BorkerVO;
12 13
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
13 14
 import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
@@ -1350,4 +1351,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
1350 1351
     public IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField) {
1351 1352
         return baseMapper.getBorkerPage(page, CommConstant.PERSON_BORKER, name, phone, recommendPersonName, sortOrder, sortField);
1352 1353
     }
1354
+
1355
+    @Override
1356
+    public IPage<BorkerSummery> getWxBorkerPage(IPage<BorkerSummery> page, String personId) {
1357
+        return baseMapper.getWxBorkerPage(page, personId);
1358
+    }
1353 1359
 }

+ 37
- 1
src/main/resources/mapper/TaPersonMapper.xml Näytä tiedosto

@@ -671,7 +671,7 @@ FROM
671 671
                     count( 1 ) as customer_num
672 672
                 FROM xlk_channel_customer a
673 673
                 WHERE a.recommend_person_type = #{personType}
674
-                    AND a.status = 2
674
+                    AND a.`status` = 2
675 675
                 GROUP BY a.recommend_person
676 676
                 ) s ON s.recommend_person = t.person_id
677 677
             LEFT JOIN ta_person m ON m.person_id = t.recommend_agent
@@ -696,6 +696,42 @@ FROM
696 696
             </if>
697 697
             ${sortOrder}
698 698
     </select>
699
+    <select id="getWxBorkerPage" resultType="com.yunzhi.marketing.borker.vo.BorkerSummery">
700
+        SELECT
701
+            t.*,
702
+            s.customer_num,
703
+            m.borker_num
704
+        FROM
705
+            ta_person t
706
+                LEFT JOIN (
707
+                SELECT
708
+                    a.recommend_person,
709
+                    count( 1 ) AS customer_num
710
+                FROM
711
+                    xlk_channel_customer a
712
+                WHERE
713
+                    a.recommend_person_type = #{personType}
714
+                  AND a.`status` = 2
715
+                GROUP BY
716
+                    a.recommend_person
717
+            ) s ON s.recommend_person = t.person_id
718
+                LEFT JOIN (
719
+                SELECT
720
+                    a.recommend_agent,
721
+                    count( 1 ) AS borker_num
722
+                FROM
723
+                    ta_person a
724
+                WHERE
725
+                    a.person_type = #{personType}
726
+                  AND a.`status` > - 1
727
+            ) m ON m.recommend_agent = t.person_id
728
+        WHERE
729
+            t.recommend_agent = #{recommendAgent}
730
+          AND t.person_type = #{personType}
731
+          AND t.`status` &gt; -1
732
+        ORDER BY
733
+            t.create_date DESC
734
+    </select>
699 735
 
700 736
     <insert id="savePersonPosition" parameterType="com.yunzhi.marketing.entity.TaPersonPositon">
701 737
         insert into ta_person_position