From ccad384233cedb89bc5895976b2326f3d1a34f85 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 18 Dec 2024 11:23:35 +0800
Subject: [PATCH] refactor(mall): 重构会员充值相关功能

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |  142 ++++++----------------------------------------
 1 files changed, 20 insertions(+), 122 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 30223e5..3f9007c 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,12 +8,6 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">用户昵称</label>
-                                        <div class="layui-input-inline">
-                                            <input type="text" placeholder="用户昵称" name="name" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">手机号码</label>
                                         <div class="layui-input-inline">
                                             <input type="text" placeholder="手机号码" name="phone" autocomplete="off" class="layui-input">
@@ -22,30 +16,8 @@
                                     <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">流水类型</label>
                                         <div class="layui-input-inline">
-                                            <select name="type">
+                                            <select name="type" class="money-flow-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="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="17">抽奖</option>-->
-                                                <option value="18">充值</option>
-                                                <option value="20">赠送金额</option>
-                                                <option value="21">微信支付</option>
-                                                <option value="22">微信退款</option>
-<!--                                                <option value="19">收益</option>-->
                                             </select>
                                         </div>
                                     </div>
@@ -54,12 +26,11 @@
                                         <div class="layui-input-inline">
                                             <select name="flowType">
                                                 <option value="">请选择</option>
-                                                <option value="1">余额</option>
-                                                <option value="3">积分</option>
+                                                <option value="1">碳币</option>
+                                                <option value="2">碳积分</option>
                                             </select>
                                         </div>
                                     </div>
-
                                     <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">开始时间</label>
                                         <div class="layui-input-inline">
@@ -120,6 +91,19 @@
 
         form.render();
 
+        //(下拉框)
+        $.get(ctx + 'admin/runVip/allMoneyType', function (res) {
+            var data = res.data;
+            for (var k in data)
+            {
+                $(".money-flow-type").append("<option value='" + data[k].type + "'>" + data[k].remark + "</option>");
+            }
+            layui.use('form', function () {
+                var form = layui.form;
+                form.render();
+            });
+        });
+
         // 表格初始化
         initTable();
 
@@ -149,106 +133,21 @@
                 url: ctx + 'admin/mallMember/getMoneyFlowList',
                 totalRow : true,
                 cols: [[
+                    {field: 'orderNo', 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:true},
-                    {field: 'type', title: '流水类型',
-                        templet: function (d) {
-                            if (d.flowType === 3) {
-                                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 === 16) {
-                                    return '<span>拨付积分</span>'
-                                }else{
-                                    return '<span>-</span>'
-                                }
-                            }
-                            if (d.flowType === 5) {
-                                if (d.type === 21) {
-                                    return '<span>微信支付</span>'
-                                } else if (d.type === 22) {
-                                    return '<span>微信退款</span>'
-                                } else{
-                                    return '<span>-</span>'
-                                }
-                            }
-                            if (d.flowType === 2) {
-                                if (d.type === 16) {
-                                    return '<span>拨付积分</span>'
-                                }else{
-                                    return '<span>-</span>'
-                                }
-                            }
-
-                            if (d.flowType === 1) {
-                                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) {
-                                    return '<span>总监收益</span>'
-                                }else if (d.type === 6) {
-                                    return '<span>社区店补</span>'
-                                }else if (d.type === 7) {
-                                    return '<span>一代收益</span>'
-                                }else if (d.type === 8) {
-                                    return '<span>提现</span>'
-                                }else if (d.type === 9) {
-                                    return '<span>转账</span>'
-                                }else if (d.type === 10) {
-                                    return '<span>余额支付</span>'
-                                }else if (d.type === 11) {
-                                    return '<span>退款</span>'
-                                }else if (d.type === 12) {
-                                    return '<span>佣金转竞猜积分</span>'
-                                }else if (d.type === 13) {
-                                    return '<span>佣金转余额</span>'
-                                }else if (d.type === 14) {
-                                    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>收益</span>'
-                                }else if (d.type === 20) {
-                                    return '<span>赠送金额</span>'
-                                }else if (d.type === 21) {
-                                    return '<span>微信支付</span>'
-                                }else if (d.type === 22) {
-                                    return '<span>微信退款</span>'
-                                }else{
-                                    return '<span>-</span>'
-                                }
-                            }
-                        }, minWidth: 80,align:'center'},
+                    {field: 'description', title: '流水类型', minWidth: 150,align:'left', totalRow:true},
                     {field: 'flowType', title: '资金类型',
                         templet: function (d) {
                             if (d.flowType === 1) {
-                                return '余额';
-                            } else if(d.flowType === 3) {
-                                return '积分'
+                                return '碳币';
                             } else if(d.flowType === 2) {
-                                return '系统'
-                            }  else if(d.flowType === 5) {
-                                return '微信'
+                                return '碳积分'
                             } else {
                                 return '-';
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });
@@ -265,7 +164,6 @@
             return {
                 startTime: $searchForm.find('input[name="startTime"]').val().trim(),
                 endTime: $searchForm.find('input[name="endTime"]').val().trim(),
-                name: $searchForm.find('input[name="name"]').val().trim(),
                 phone: $searchForm.find('input[name="phone"]').val().trim(),
                 type: $searchForm.find("select[name='type']").val(),
                 flowType: $searchForm.find("select[name='flowType']").val(),

--
Gitblit v1.9.1