From 15a6f5b0a38f0cd19c777c75c3fc4ff498fbc8dc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 18 Aug 2023 10:17:58 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 2 +-
src/main/resources/templates/febs/views/modules/product/categoryList.html | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 9b7ada7..e5f7e59 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -117,7 +117,7 @@
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
- where flow_type =1 and type in (2) and rt_member_id=#{memberId}
+ where flow_type =1 and type in (2) and member_id=#{memberId}
and status = 2
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryList.html b/src/main/resources/templates/febs/views/modules/product/categoryList.html
index 6be61b3..f64d902 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryList.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryList.html
@@ -28,7 +28,7 @@
</div>
</div>
</form>
- <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ <table lay-filter="categoryTable" lay-data="{id: 'categoryTable'}"></table>
<style type="text/css">
.layui-table-cell{
text-align:center;
@@ -78,7 +78,7 @@
initTable();
// 初始化表格操作栏各个按钮功能
- table.on('tool(userTable)', function (obj) {
+ table.on('tool(categoryTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
@@ -150,7 +150,7 @@
function initTable() {
tableIns = febs.table.init({
elem: $view.find('table'),
- id: 'userTable',
+ id: 'categoryTable',
url: ctx + 'admin/goodsCategory/categoryList',
cols: [[
{field: 'name', title: '名称', minWidth: 150,align:'left'},
--
Gitblit v1.9.1