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/order/invoiceList.html |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/invoiceList.html b/src/main/resources/templates/febs/views/modules/order/invoiceList.html
index 5a19dee..595a776 100644
--- a/src/main/resources/templates/febs/views/modules/order/invoiceList.html
+++ b/src/main/resources/templates/febs/views/modules/order/invoiceList.html
@@ -127,7 +127,19 @@
                     updateInvoiceDetail(data.id);
                 });
             }
+            if (layEvent === 'updateOrderDetail') {
+                febs.modal.confirm('更新', '是否更新订单状态信息?', function () {
+                    updateOrderDetail(data.id);
+                });
+            }
         });
+
+        function updateOrderDetail(id) {
+            febs.get(ctx + 'admin/order/updateOrderDetail/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
 
         function updateInvoiceDetail(id) {
             febs.get(ctx + 'admin/order/updateInvoiceDetail/' + id, null, function () {
@@ -212,9 +224,10 @@
                             templet: function (d) {
                                 if(d.status === 4){
                                     return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeInvoiceDetail" shiro:hasPermission="user:update">开票信息</button>' +
+                                       '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateOrderDetail" shiro:hasPermission="user:update">更新订单状态</button>'+
                                         '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateInvoiceDetail" shiro:hasPermission="user:update">更新抬头</button>'
                                 }else{
-                                    return ''
+                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateOrderDetail" shiro:hasPermission="user:update">更新订单状态</button>'
                                 }
                             },minWidth: 300,align:'center', fixed:'right'}
                 ]]

--
Gitblit v1.9.1