From b31846bb3d0840d3102a86870c9b0f012443885f Mon Sep 17 00:00:00 2001
From: Administrator <513693417@qq.com>
Date: Sat, 12 Sep 2020 22:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BD=99=E9=A2=9D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-business/memberMenu.sql                 | 23 ++++++
 .../mapper/business/BizMemberMapper.xml       | 12 ++-
 .../mapper/business/BizOrderMapper.xml        |  2 +-
 .../templates/business/member/member.html     | 75 ++++++++++++-------
 .../templates/business/order/order.html       |  4 +-
 5 files changed, 80 insertions(+), 36 deletions(-)
 create mode 100644 ruoyi-business/memberMenu.sql

diff --git a/ruoyi-business/memberMenu.sql b/ruoyi-business/memberMenu.sql
new file mode 100644
index 000000000..e1e39a828
--- /dev/null
+++ b/ruoyi-business/memberMenu.sql
@@ -0,0 +1,23 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, target, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('会员管理', 'menuItem', '0', '6', '/business/member', 'C', '0', 'business:member:view', 'fa fa-user', 'admin', '2018-03-01', 'ry', '2018-03-01', '会员菜单');
+
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('会员查询', @parentId, '1',  '#',  'F', '0', 'business:member:list',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('会员新增', @parentId, '2',  '#',  'F', '0', 'business:member:add',          '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('会员修改', @parentId, '3',  '#',  'F', '0', 'business:member:edit',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('会员删除', @parentId, '4',  '#',  'F', '0', 'business:member:remove',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('会员导出', @parentId, '5',  '#',  'F', '0', 'business:member:export',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
diff --git a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml
index f55cfd73b..f05700b16 100644
--- a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml
+++ b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml
@@ -25,18 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id, mobile, member_name, password, recommend_id, recommend_mobile, recommend_name, member_type, is_delete, is_enable, create_by, create_time, update_by, update_time,
         (select amount from biz_account where member_id = a.id and account_type = 0) douBalance,
         (select amount from biz_account where member_id = a.id and account_type = 1) douPerson,
-        (select amount from biz_account where member_id = a.id and account_type = 0) douTeam,
-        (select amount from biz_account where member_id = a.id and account_type = 0) douField
+        (select amount from biz_account where member_id = a.id and account_type = 2) douTeam,
+        (select amount from biz_account where member_id = a.id and account_type = 3) douField
         from biz_member a
     </sql>
 
     <select id="selectBizMemberList" parameterType="BizMember" resultMap="BizMemberResult">
         <include refid="selectBizMemberVo"/>
-        <where>  
-            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
-            <if test="memberName != null  and memberName != ''"> and member_name like concat('%', #{memberName}, '%')</if>
-            <if test="recommendId != null "> and recommend_id = #{recommendId}</if>
-            <if test="memberType != null "> and member_type = #{memberType}</if>
+        <where>
+            <if test="memberName != null  and memberName != ''"> and (a.member_name like concat('%', #{memberName}, '%') or a.mobile like concat('%', #{memberName}, '%'))</if>
+             and a.is_delete = 0
         </where>
         order by a.id desc
     </select>
diff --git a/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml
index 535803963..3deb1f78c 100644
--- a/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml
+++ b/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBizOrderList" parameterType="BizOrder" resultMap="BizOrderResult">
         <include refid="selectBizOrderVo"/>
         <where>  
-            <if test="memberName != null  and memberName != ''"> and a.member_name like concat('%', #{memberName}, '%')</if>
+            <if test="memberName != null  and memberName != ''"> and (a.member_name like concat('%', #{memberName}, '%') or a.mobile like concat('%', #{memberName}, '%'))</if>
         </where>
         order by a.id desc
     </select>
diff --git a/ruoyi-business/src/main/resources/templates/business/member/member.html b/ruoyi-business/src/main/resources/templates/business/member/member.html
index c7be568c7..83d527f32 100644
--- a/ruoyi-business/src/main/resources/templates/business/member/member.html
+++ b/ruoyi-business/src/main/resources/templates/business/member/member.html
@@ -11,23 +11,8 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>手机号码：</label>
-                                <input type="text" name="mobile"/>
-                            </li>
-                            <li>
-                                <label>用户姓名：</label>
-                                <input type="text" name="memberName"/>
-                            </li>
-                            <li>
-                                <label>推荐人ID：</label>
-                                <input type="text" name="recommendId"/>
-                            </li>
-                            <li>
-                                <label>会员类型：</label>
-                                <select name="memberType">
-                                    <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
-                                </select>
+                                <label>会员搜索：</label>
+                                <input type="text" name="memberName" placeholder="请输入会员姓名或手机号"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -79,25 +64,63 @@
                     title: '会员ID',
                     visible: false
                 },
-                {
-                    field: 'mobile',
-                    title: '手机号码'
-                },
                 {
                     field: 'memberName',
-                    title: '用户姓名'
+                    title: '会员姓名'
                 },
                 {
-                    field: 'recommendId',
-                    title: '推荐人ID'
+                    field: 'mobile',
+                    title: '会员手机号码'
+                },
+                {
+                    field: 'recommendName',
+                    title: '推荐人姓名'
+                },
+                {
+                    field: 'recommendMobile',
+                    title: '推荐人手机号码'
+                },
+                {
+                    field: 'createTime',
+                    title: '注册时间'
+                },
+                {
+                    field: 'douBalance',
+                    align: 'center',
+                    title: '福豆余额'
+                },
+                {
+                    field: 'douPerson',
+                    align: 'center',
+                    title: '个人福豆'
+                },
+                {
+                    field: 'douTeam',
+                    align: 'center',
+                    title: '团队福豆'
+                },
+                {
+                    field: 'douField',
+                    align: 'center',
+                    title: '福豆田'
                 },
                 {
                     field: 'memberType',
-                    title: '会员类型'
+                    title: '会员类型',
+                    formatter: function(value, row, index) {
+                        return  value ? "个人用户" : "经销商";
+                    }
                 },
                 {
                     field: 'isEnable',
-                    title: '是否禁用：0-否，1-是'
+                    title: '是否有效',
+                    formatter: function(value, row, index) {
+                        if(value){
+                            return "<span style='color:#00AA00'>有效</span>";
+                        }else{
+                            return "<span style='color:#AA0000'>失效</span>";
+                        }
+                    }
                 },
                 {
                     title: '操作',
diff --git a/ruoyi-business/src/main/resources/templates/business/order/order.html b/ruoyi-business/src/main/resources/templates/business/order/order.html
index 5e04fa065..5f51657d5 100644
--- a/ruoyi-business/src/main/resources/templates/business/order/order.html
+++ b/ruoyi-business/src/main/resources/templates/business/order/order.html
@@ -11,8 +11,8 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>会员姓名：</label>
-                                <input type="text" name="memberName"/>
+                                <label>订单搜索：</label>
+                                <input type="text" name="memberName" placeholder="请输入会员姓名或手机号"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>