From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询，加入了积分金额和积分价格的计算
---
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 4f60714..2cdb915 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -9,12 +9,12 @@
<div class="layui-form-item">
<div class="layui-inline">
<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">
<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">
@@ -119,10 +119,12 @@
id: 'moneyFlowChargeTable',
url: ctx + 'admin/mallMember/getMoneyChargeList',
cols: [[
- {field: 'name', title: '名称', minWidth: 100,align:'left'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left'},
+ {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: 'amountFee', title: '手续费', minWidth: 150,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -141,9 +143,9 @@
if (d.status === 1) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeAgree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
}else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
+ return ''
}
},minWidth: 300,align:'center'}
]]
--
Gitblit v1.9.1