From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 168 ++++++++++++++++++++++++-------------------------------
1 files changed, 74 insertions(+), 94 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 9021e12..25281b1 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,52 +8,44 @@
<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">
- <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>
<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>-->
</select>
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label layui-form-label-sm">资金类型</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>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">资金类型</label>
+ <div class="layui-input-inline">
+ <select name="flowType">
+ <option value="">请选择</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">
+ <input type="text" name="startTime" id="febs-money-flow-start" lay-verify="date"
+ placeholder="yyyy-MM-dd" 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" name="endTime" id="febs-money-flow-end" lay-verify="date"
+ placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -75,7 +67,7 @@
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs','laydate'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -85,9 +77,32 @@
$reset = $view.find('#reset'),
$searchForm = $view.find('form'),
sortObject = {field: 'phone', type: null},
+ laydate = layui.laydate,
tableIns;
+ //日期范围
+ laydate.render({
+ elem: '#febs-money-flow-start'
+ });
+
+ laydate.render({
+ elem: '#febs-money-flow-end'
+ });
+
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();
@@ -116,65 +131,23 @@
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: 'type', title: '流水类型',
+ {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: 'description', title: '流水类型', minWidth: 150,align:'left'},
+ {field: 'flowType', 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) {
- 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{
- return ''
+ if (d.flowType === 1) {
+ return '碳币';
+ } else if(d.flowType === 2) {
+ return '碳积分'
+ } else {
+ return '-';
}
}, minWidth: 80,align:'center'},
- // {field: 'flowType', title: '资金类型',
- // templet: function (d) {
- // if (d.flowType === 1) {
- // return '余额';
- // } else if(d.flowType === 2) {
- // return '赠送积分'
- // } else if(d.flowType === 3) {
- // return '竞猜积分'
- // } else if(d.flowType === 4) {
- // return '佣金'
- // } else {
- // return '-';
- // }
- // }, minWidth: 80,align:'center'},
- {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
{field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
]]
});
@@ -182,11 +155,18 @@
// 获取查询参数
function getQueryParams() {
+ let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
+ let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
+ if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
+ febs.alert.warn('开始时间需要小于结束时间');
+ return{};
+ }
return {
- name: $searchForm.find('input[name="name"]').val().trim(),
+ startTime: $searchForm.find('input[name="startTime"]').val().trim(),
+ endTime: $searchForm.find('input[name="endTime"]').val().trim(),
phone: $searchForm.find('input[name="phone"]').val().trim(),
type: $searchForm.find("select[name='type']").val(),
- // flowType: $searchForm.find("select[name='flowType']").val(),
+ flowType: $searchForm.find("select[name='flowType']").val(),
};
}
--
Gitblit v1.9.1