From 633300e453b960fb1b92fb8936d72d18748a83f3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Feb 2023 14:35:02 +0800
Subject: [PATCH] 备注字段添加
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 4 +++-
src/main/resources/templates/febs/views/modules/order/orderList.html | 2 ++
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 3 +++
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 7e04677..429954c 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -280,7 +280,8 @@
orderSheet.setTitle(title);
// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
- String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
+// String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
+ String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "备注", "物流单号", "物流公司", "物流公司码"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -323,6 +324,7 @@
temp.add("");
}
+ temp.add(item.getRemark());
// temp.add(item.getStatus());
list.add(temp);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index 5c6dae2..abca442 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -73,6 +73,9 @@
@ApiModelProperty(value = "运费")
private BigDecimal carriage;
+ @ApiModelProperty(value = "备注")
+ private BigDecimal remark;
+
public Integer getPayMethodType() {
if (this.payMethod == null) {
return 0;
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 919521b..95b47e3 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -395,6 +395,7 @@
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
+ {field: 'remark', title: '备注', minWidth: 160,align:'left'},
{field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
{field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
{field: 'amount', title: '总金额', minWidth: 100,align:'left'},
@@ -529,6 +530,7 @@
// "<div>地址：" + data.address + "</div><br><br>" +
// "<div>编号：" + data.orderNo + "</div><br><br>" +
"<div>商品：" + data.goodsName + "</div><br><br>" +
+ "<div>备注：" + data.remark + "</div><br><br>" +
"</div>"
contentHtml += template;
--
Gitblit v1.9.1