From e256a4b20ab92ea7ab6baf3a0e5ebad2c835cfbf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Dec 2022 16:39:20 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java | 3 +++
src/main/resources/mapper/modules/MallMemberMapper.xml | 4 ++--
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
index 0a73aa2..5e8812e 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
@@ -50,4 +50,7 @@
@ApiModelProperty(value = "用户等级")
private String accountLevel;
+ @ApiModelProperty(value = "代理等级")
+ private String level;
+
}
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index de1dd5f..8923899 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -78,13 +78,13 @@
a.phone,
a.invite_id,
a.account_level,
+ a.level,
2 isCurrent,
a.created_time,
(select sum(e.amount)
from mall_order_info e
inner join mall_member b on e.member_id=b.ID
- inner join mall_order_item c on e.id = c.order_id -- and c.is_normal=2
- where e.status = 4 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
+ where e.status = 4 and find_in_set(a.invite_id, b.referrer_ids)) amount,
(select count(1) from mall_order_info b
inner join mall_member e on e.id=b.member_id and b.status = 4
where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index d9accbc..4924c74 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -134,7 +134,7 @@
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'levelName', title: '代理层级', minWidth: 100,align:'left'},
- {field: 'memberNum', title: '下级', minWidth: 100,align:'left'},
+ // {field: 'memberNum', title: '下级', minWidth: 100,align:'left'},
{field: 'allMemberNum', title: '我的团队总数', minWidth: 100,align:'left'},
{field: 'amount', title: '团队业绩', minWidth: 100,align:'left'},
{title: '操作',
--
Gitblit v1.9.1