From 9627e89221190e08d145809333d3a9312f2181e7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 May 2023 12:28:38 +0800
Subject: [PATCH] 会员等级设置

---
 src/main/resources/mapper/modules/MallMemberMapper.xml                         |    3 ++-
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html      |   14 ++++++++++++++
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |    1 +
 3 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 90d0272..2fbfae0 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -14,6 +14,7 @@
                IFNULL(c.total_score,0) totalScore,
                IFNULL(c.voucher_cnt,0) voucherCnt,
                IFNULL(c.voucher_amount,0) voucherAmount,
+               IFNULL(c.voucher_fire_cnt,0) voucherFireCnt,
                d.description levelName
         FROM mall_member m
         left join mall_member a on m.referrer_id = a.invite_id
@@ -87,7 +88,7 @@
     <select id="selectTeamListByInviteId" resultType="cc.mrbird.febs.mall.vo.TeamListVo">
         select
             a.id,
-            a.name,
+            a.account_login name,
             a.phone,
             a.invite_id,
             2 isCurrent,
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 4b46ec5..400ff21 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -304,6 +304,7 @@
                     {field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
                     {field: 'voucherCnt', title: '绿色凭证', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCnt) }}'},
                     {field: 'voucherAmount', title: '凭证现金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherAmount) }}'},
+                    {field: 'voucherFireCnt', title: '能量值', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherFireCnt) }}'},
                     {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                     {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
                     {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
index 1e9fea5..da49fc9 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
@@ -106,6 +106,20 @@
                                 return '<span>线下服务中心补贴</span>'
                             }else if (d.type === 30) {
                                 return '<span>代理商补贴</span>'
+                            }else if (d.type === 31) {
+                                return '<span>联创合伙人释放凭证</span>'
+                            }else if (d.type === 32) {
+                                return '<span>业绩释放联创凭证</span>'
+                            }else if (d.type === 33) {
+                                return '<span>业绩释放合伙人凭证</span>'
+                            }else if (d.type === 34) {
+                                return '<span>业绩释放贡献点凭证</span>'
+                            }else if (d.type === 35) {
+                                return '<span>业绩释放星级凭证</span>'
+                            }else if (d.type === 36) {
+                                return '<span>红豆买入</span>'
+                            }else if (d.type === 37) {
+                                return '<span>红豆卖出</span>'
                             }else{
                                 return ''
                             }

--
Gitblit v1.9.1