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/orderList.html | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 92c616c..6b54e39 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -243,7 +243,7 @@
febs.alert.warn('请选择待发货的订单');
return;
}
- febs.get(ctx + 'admin/order/confirmOrder?orderIds='+ids, null, function () {
+ febs.get(ctx + 'admin/order/confirmLeaderOrder?orderIds='+ids, null, function () {
febs.alert.success('操作成功');
$query.click();
});
@@ -354,11 +354,11 @@
return;
}
window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&orderIds="+ids;
- febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
- febs.alert.success('操作成功');
- $query.click();
-
- });
+ // febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
+ // febs.alert.success('操作成功');
+ // $query.click();
+ //
+ // });
}
if (event == 'exportDeliverTwo') {
@@ -504,11 +504,16 @@
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
- {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
- {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
- {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
- {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
+ {field: 'deliveryType', title: '提货方式',
+ templet: function (d) {
+ if (d.deliveryType === 1) {
+ return '<span style="color:blue;">自提</span>'
+ } else if (d.deliveryType === 2) {
+ return '<span style="color:green;">快递</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -529,6 +534,12 @@
return ''
}
}, minWidth: 80,align:'center'},
+ {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
+ {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
+ {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
+ {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
+ {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
+
// {field: 'deliveryState', title: '配送状态',
// templet: function (d) {
// if (d.deliveryState === 1) {
--
Gitblit v1.9.1