Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RecommendListVO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -22,7 +23,7 @@ import java.util.Date;
 @NoArgsConstructor
 @Data
 public class RecommendListVO implements Serializable {
-
+    //会员编号、会员姓名、会员等级、注册业绩、团队人数
     /**
      * 会员编号
      */
@@ -55,4 +56,15 @@ public class RecommendListVO implements Serializable {
      */
     private String phone;
 
+    /**
+     * 注册业绩
+     */
+
+    private BigDecimal consumeAchieve;
+
+    /**
+     * 团队人数
+     */
+    private Integer teamCount;
+
 }

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -2313,19 +2313,40 @@
 
     <!-- 推荐列表 -->
     <select id="listRecommend" resultType="com.hzs.common.domain.member.ext.CuMemberExt">
-        select cm.member_code,
-               cm.member_name,
-               cm.nick_name,
-               cm.creation_time,
-               cm.phone,
-               bg.grade_name settle_grade_val
-        from cu_member cm
-                 left join bd_grade bg
-                           on bg.pk_id = cm.pk_settle_grade
-        where cm.del_flag = 0
-          and cm.category = 0
-          and cm.pk_parent = #{pkMember}
-        order by cm.creation_time desc
+        WITH team_data AS (
+            SELECT
+                connect_by_root pk_id AS root_pk_id,
+                COUNT(*) OVER (PARTITION BY connect_by_root pk_id) - 1 AS team_count
+            FROM
+                cu_member
+            WHERE
+                del_flag = 0
+              AND category = 0
+        START WITH
+            pk_parent = #{pkMember}
+        CONNECT BY
+            PRIOR pk_id = pk_parent
+            )
+        SELECT DISTINCT
+            cm.member_code,
+            cm.member_name,
+            cm.nick_name,
+            cm.consume_achieve,
+            cm.creation_time,
+            cm.phone,
+            bg.grade_name AS settle_grade_val,
+            td.team_count
+        FROM
+            cu_member cm
+                LEFT JOIN
+            bd_grade bg ON bg.pk_id = cm.pk_settle_grade
+                LEFT JOIN
+            team_data td ON cm.pk_id = td.root_pk_id
+        WHERE
+            cm.del_flag = 0
+          AND cm.category = 0
+          AND cm.PK_PARENT = #{pkMember}
+        ORDER BY cm.creation_time desc
     </select>
 
     <!-- 查询分享或空单并且没有订单会员列表 -->

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java

@@ -183,6 +183,11 @@ public class CuMemberExt extends CuMember {
      */
     private String teamName;
 
+    /**
+     * 团队人数
+     */
+    private Integer teamCount;
+
     /**
      * 次数
      */