From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |  105 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 78 insertions(+), 27 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 07791c0..f2d5ce9 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,25 +8,52 @@
                             <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">
-                                        <label class="layui-form-label layui-form-label-sm">账户状态</label>
+                                        <label class="layui-form-label">订单编号:</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <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="8">提现</option>
+                                                <option value="9">转账</option>
+                                                <option value="10">支付</option>
+                                                <option value="11">退款</option>
+                                                <option value="14">签到</option>
+                                                <option value="16">系统拨付</option>
+                                                <option value="19">套餐获取H金劵补贴</option>
+                                                <option value="20">直推现金补贴</option>
+                                                <option value="21">直推H金劵补贴</option>
+                                                <option value="22">董事现金补贴</option>
+                                                <option value="23">合伙人现金补贴</option>
+                                                <option value="24">代理现金补贴</option>
+                                                <option value="25">代理H金劵补贴</option>
+                                                <option value="26">H金劵转余额</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">资金类型:</label>
+                                        <div class="layui-input-inline">
+                                            <select name="flowType">
+                                                <option value="">请选择</option>
+                                                <option value="1">余额</option>
+                                                <option value="2">H金劵</option>
                                             </select>
                                         </div>
                                     </div>
@@ -92,34 +119,56 @@
                 elem: $view.find('table'),
                 id: 'moneyFlowTable',
                 url: ctx + 'admin/mallMember/getMoneyFlowList',
+                totalRow: true ,// 开启合计行
                 cols: [[
-                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
-                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
-                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+                    {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计:'},
+                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+                    {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                     {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 === 3) {
-                                return '<span>订单支付</span>'
-                            } else if (d.type === 4) {
-                                return '<span>退款</span>'
-                            } else if (d.type === 5) {
+                            if (d.type === 8) {
+                                return '<span>提现</span>'
+                            } else if (d.type === 9) {
                                 return '<span>转账</span>'
-                            } else{
-                                return ''
+                            } else if (d.type === 10) {
+                                return '<span>支付</span>'
+                            } else if (d.type === 11) {
+                                return '<span>退款</span>'
+                            }else if (d.type === 14) {
+                                return '<span>签到</span>'
+                            }else if (d.type === 16) {
+                                return '<span>系统拨付</span>'
+                            }else if (d.type === 19) {
+                                return '<span>套餐获取H金劵补贴</span>'
+                            }else if (d.type === 20) {
+                                return '<span>直推现金补贴</span>'
+                            }else if (d.type === 21) {
+                                return '<span>直推H金劵补贴</span>'
+                            }else if (d.type === 22) {
+                                return '<span>董事现金补贴</span>'
+                            }else if (d.type === 23) {
+                                return '<span>合伙人现金补贴</span>'
+                            }else if (d.type === 24) {
+                                return '<span>代理现金补贴</span>'
+                            }else if (d.type === 25) {
+                                return '<span>代理H金劵补贴</span>'
+                            }else if (d.type === 26) {
+                                return '<span>H金劵转余额</span>'
+                            }else{
+                                return '-'
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'type', title: '支付方式',
+                    {field: 'flowType', title: '资金类型',
                         templet: function (d) {
-                            if (d.type === 3) {
-                                return '<span>'+d.payMethod+'</span>'
-                            } else{
-                                return ''
+                            if (d.flowType === 1) {
+                                return '余额';
+                            } else if(d.flowType === 2) {
+                                return 'H金劵'
+                            } else {
+                                return '-';
                             }
                         }, minWidth: 80,align:'center'},
+                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });
@@ -130,7 +179,9 @@
             return {
                 name: $searchForm.find('input[name="name"]').val().trim(),
                 phone: $searchForm.find('input[name="phone"]').val().trim(),
+                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                 type: $searchForm.find("select[name='type']").val(),
+                flowType: $searchForm.find("select[name='flowType']").val(),
             };
         }
 

--
Gitblit v1.9.1