From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/resources/templates/febs/views/modules/order/refundList.html | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/order/refundList.html b/src/main/resources/templates/febs/views/modules/order/refundList.html
index cca5d22..7803d80 100644
--- a/src/main/resources/templates/febs/views/modules/order/refundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/refundList.html
@@ -6,23 +6,27 @@
<form class="layui-form layui-table-form" lay-filter="user-table-form">
<div class="layui-form-item">
<div class="layui-col-md10">
+
<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">
</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">
</div>
</div>
<div class="layui-inline">
+ <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 layui-form-label-sm">订单状态</label>
+ <label class="layui-form-label">订单状态：</label>
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
@@ -86,7 +90,12 @@
var data = obj.data,
layEvent = obj.event;
if (layEvent === 'refunding') {
- febs.modal.open( '退款进度', 'modules/order/seeRefund/' + data.id, {
+ febs.modal.open( '退款进度', 'modules/order/refunding/' + data.id, {
+ maxmin: true,
+ });
+ }
+ if (layEvent === 'refundOrderDetail') {
+ febs.modal.open( '订单详情', 'modules/order/refundOrderDetail/' + data.id, {
maxmin: true,
});
}
@@ -114,6 +123,11 @@
if (layEvent === 'refundConfirm') {
febs.modal.confirm('退款确认', '确认已退款？', function () {
refundConfirm(data.id);
+ });
+ }
+ if (layEvent === 'paymentInfo') {
+ febs.modal.open( '收款信息', 'modules/order/refundPayInfo/' + data.id, {
+ maxmin: true,
});
}
});
@@ -160,7 +174,28 @@
cols: [[
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
{field: 'buyName', title: '用户名', minWidth: 150,align:'left'},
- {field: 'buyPhone', title: '电话', minWidth: 150,align:'left'},
+ {field: 'buyPhone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'beforeStatus', title: '发货状态',
+ templet: function (d) {
+ if (d.beforeStatus === 1) {
+ return '<span style="color:red;">待支付</span>'
+ } else if (d.beforeStatus === 2) {
+ return '<span style="color:green;">待发货</span>'
+ }else if (d.beforeStatus === 3) {
+ return '<span style="color:green;">待收货</span>'
+ }else if (d.beforeStatus === 4) {
+ return '<span style="color:green;">已完成</span>'
+ }else if (d.beforeStatus === 5) {
+ return '<span style="color:green;">退款中</span>'
+ }else if (d.beforeStatus === 6) {
+ return '<span style="color:green;">已退款</span>'
+ }else if (d.beforeStatus === 7) {
+ return '<span style="color:green;">已取消</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'amount', title: '退款金额', minWidth: 150,align:'left'},
{field: 'type', title: '退款类型',
templet: function (d) {
if (d.type === 1) {
@@ -197,23 +232,33 @@
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}else if(d.type === 2){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agreeWithAddress" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" 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="agree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}
}else if(d.status === 4){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundConfirm" shiro:hasPermission="user:update">退款确认</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" 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="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}
- },minWidth: 300,align:'center'}
+ },minWidth: 400,align:'center'}
]]
});
}
--
Gitblit v1.9.1