From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |  108 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index c812f68..4efe547 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,48 +8,56 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
+                                        <label class="layui-form-label">名称:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label">账号:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="账号" name="phone" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline febs-hide">
+                                        <label class="layui-form-label">账号:</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" placeholder="账号" name="inviteId" data-th-value="${inviteId}" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline  febs-hide">
+                                        <label class="layui-form-label">账号:</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" placeholder="账号" name="referrerId" data-th-value="${referrerId}" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">流水类型</label>
+                                        <label class="layui-form-label">流水类型:</label>
                                         <div class="layui-input-inline">
                                             <select name="type">
                                                 <option value="">请选择</option>
-                                                <option value="1">静态收益</option>
-                                                <option value="2">直推奖</option>
-                                                <option value="3">代理收益</option>
-                                                <option value="4">排名收益</option>
-                                                <option value="5">董事收益</option>
-                                                <option value="6">社区店补</option>
-                                                <option value="7">一代收益</option>
+                                                <option value="1">直推奖</option>
+                                                <option value="3">全网分红</option>
+                                                <option value="4">代理分红</option>
+                                                <option value="5">股东分红</option>
+                                                <option value="6">积分兑换</option>
+                                                <option value="7">推荐奖</option>
                                                 <option value="8">提现</option>
-                                                <option value="9">转账</option>
                                                 <option value="10">支付</option>
                                                 <option value="11">退款</option>
-                                                <option value="12">佣金转竞猜积分</option>
-                                                <option value="13">佣金转余额</option>
-                                                <option value="14">竞猜积分签到</option>
-                                                <option value="15">感恩奖</option>
-                                                <option value="16">系统拨付</option>
+                                                <option value="16">系统</option>
+                                                <option value="14">签到</option>
                                             </select>
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">资金类型</label>
+                                        <label class="layui-form-label">资金类型:</label>
                                         <div class="layui-input-inline">
                                             <select name="flowType">
                                                 <option value="">请选择</option>
                                                 <option value="1">余额</option>
                                                 <option value="2">赠送积分</option>
-                                                <option value="3">竞猜积分</option>
-                                                <option value="4">佣金</option>
+                                                <option value="3">现金积分</option>
                                             </select>
                                         </div>
                                     </div>
@@ -61,6 +69,9 @@
                                 </div>
                                 <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                     <i class="layui-icon">&#xe79b;</i>
+                                </div>
+                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="exportExcel">
+                                    导出
                                 </div>
                             </div>
                         </div>
@@ -83,6 +94,7 @@
             $query = $view.find('#query'),
             $reset = $view.find('#reset'),
             $searchForm = $view.find('form'),
+            $exportExcel = $view.find('#exportExcel'),
             sortObject = {field: 'phone', type: null},
             tableIns;
 
@@ -111,31 +123,33 @@
         });
 
         function initTable() {
+            var inviteId = $searchForm.find('input[name="inviteId"]').val().trim();
+            var referrerId = $searchForm.find('input[name="referrerId"]').val().trim();
             tableIns = febs.table.init({
                 elem: $view.find('table'),
                 id: 'moneyFlowTable',
-                url: ctx + 'admin/mallMember/getMoneyFlowList',
+                url: ctx + 'admin/mallMember/getMoneyFlowList?inviteId='+inviteId +"&referrerId=" + referrerId,
                 cols: [[
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
-                    {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
                     {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+                    {field: 'fromMemberName', title: '来自', minWidth: 150,align:'left'},
                     {field: 'type', title: '流水类型',
                         templet: function (d) {
                             if (d.type === 1) {
-                                return '<span>静态收益</span>'
-                            } else if (d.type === 2) {
                                 return '<span>直推奖</span>'
+                            } else if (d.type === 2) {
+                                return '<span>隔代收益</span>'
                             } else if (d.type === 3) {
-                                return '<span>代理收益</span>'
+                                return '<span>全网分红</span>'
                             } else if (d.type === 4) {
-                                return '<span>排名收益</span>'
+                                return '<span>代理分红</span>'
                             }else if (d.type === 5) {
-                                return '<span>董事收益</span>'
+                                return '<span>股东分红</span>'
                             }else if (d.type === 6) {
-                                return '<span>社区店补</span>'
+                                return '<span>积分兑换</span>'
                             }else if (d.type === 7) {
-                                return '<span>一代收益</span>'
+                                return '<span>推荐奖</span>'
                             }else if (d.type === 8) {
                                 return '<span>提现</span>'
                             }else if (d.type === 9) {
@@ -149,11 +163,39 @@
                             }else if (d.type === 13) {
                                 return '<span>佣金转余额</span>'
                             }else if (d.type === 14) {
-                                return '<span>竞猜积分签到</span>'
+                                return '<span>签到</span>'
                             }else if (d.type === 15) {
                                 return '<span>感恩奖</span>'
                             }else if (d.type === 16) {
                                 return '<span>系统拨付</span>'
+                            }else if (d.type === 17) {
+                                return '<span>抽奖</span>'
+                            }else if (d.type === 18) {
+                                return '<span>积分池收益</span>'
+                            }else if (d.type === 19) {
+                                return '<span>1星合伙人补贴</span>'
+                            }else if (d.type === 20) {
+                                return '<span>2星合伙人补贴</span>'
+                            }else if (d.type === 21) {
+                                return '<span>3星合伙人补贴</span>'
+                            }else if (d.type === 22) {
+                                return '<span>4星合伙人补贴</span>'
+                            }else if (d.type === 23) {
+                                return '<span>5星合伙人补贴</span>'
+                            }else if (d.type === 24) {
+                                return '<span>6星合伙人补贴</span>'
+                            }else if (d.type === 25) {
+                                return '<span>贡献点</span>'
+                            }else if (d.type === 26) {
+                                return '<span>补贴额度</span>'
+                            }else if (d.type === 27) {
+                                return '<span>团队补贴</span>'
+                            }else if (d.type === 28) {
+                                return '<span>平级奖励补贴</span>'
+                            }else if (d.type === 29) {
+                                return '<span>线下服务中心补贴</span>'
+                            }else if (d.type === 30) {
+                                return '<span>代理商补贴</span>'
                             }else{
                                 return ''
                             }
@@ -165,14 +207,13 @@
                             } else if(d.flowType === 2) {
                                 return '赠送积分'
                             } else if(d.flowType === 3) {
-                                return '竞猜积分'
-                            } else if(d.flowType === 4) {
-                                return '佣金'
+                                return '现金积分'
                             } else {
                                 return '-';
                             }
                         }, minWidth: 80,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
+                    {field: 'remark', title: '备注', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });
@@ -188,5 +229,8 @@
             };
         }
 
+        $exportExcel.on('click', function() {
+            febs.download(ctx + 'admin/mallMember/moneyFlow/excel', getQueryParams(), '资金明细表.xlsx');
+        });
     })
 </script>
\ No newline at end of file

--
Gitblit v1.9.1