From ac9126763134c6eaf7eb96c6ed597809a6d7fc8b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 10:04:51 +0800
Subject: [PATCH] feat(mall): 添加会员公司信息展示功能

---
 src/main/java/cc/mrbird/febs/mall/entity/MallMember.java                       |    4 ++++
 src/main/resources/mapper/modules/MallMemberMapper.xml                         |    3 +++
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |    3 ++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index 92fbfc9..21713f6 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -22,6 +22,10 @@
     private String memberUuid;
 
     private String companyId;
+    @TableField(exist = false)
+    private String companyName;
+    @TableField(exist = false)
+    private String companyCode;
 
     /**
      * 姓名
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 500c516..d4f5d33 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -50,12 +50,15 @@
                d.prize_score prizeScore,
                d.commission commission,
                d.total_score totalScore,
+               e.name companyName,
+               e.code companyCode,
                b.name storeMasterName,
                c.name directorName
         FROM mall_member a
         left join happy_sale_level b on b.code = a.store_master
         left join happy_member_level c on c.code = a.director
         left join mall_member_wallet d on d.member_id = a.id
+        left join ai_company e on e.id = a.company_id
         <where>
             and a.phone is not null
             <if test="record != null" >
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 4e54b76..1f1d1a2 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -398,6 +398,7 @@
                     {field: 'name', title: '用户名', minWidth: 100,align:'center'},
                     {field: 'realName', title: '真实姓名', minWidth: 100,align:'center'},
                     {field: 'phone', title: '联系方式', minWidth: 150,align:'center'},
+                    {field: 'companyName', title: '公司', minWidth: 150,align:'center'},
                     // {field: 'balance', title: '余额', minWidth: 150,align:'center'},
                     // {field: 'score', title: '会员经验', minWidth: 150,align:'center'},
                     // {field: 'prizeScore', title: '积分', minWidth: 150,align:'center'},
@@ -405,7 +406,7 @@
                     // {field: 'totalScore', title: '总佣金', minWidth: 150,align:'center'},
                     // {field: 'directorName', title: '会员等级', minWidth: 150,align:'center'},
                     // {field: 'storeMasterName', title: '分销等级', minWidth: 150,align:'center'},
-                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'center'},
+                    {field: 'companyCode', title: '公司码', minWidth: 100,align:'center'},
                     {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
                 ]]
             });

--
Gitblit v1.9.1