From c7e87148adcbcb292a7c1af62b1271fa3703a9e3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Feb 2023 11:50:40 +0800
Subject: [PATCH] 商品单位
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 ae86f42..4650bc3 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -279,6 +279,7 @@
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
+// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
orderSheet.setHeaders(header);
@@ -303,7 +304,7 @@
temp.add(item.getOrderNo());
temp.add(item.getAmount());
temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
- temp.add("快递配送");
+// temp.add("快递配送");
temp.add(item.getName());
temp.add(item.getPhone());
temp.add(item.getAddress());
@@ -312,9 +313,9 @@
for (MallOrderItem itemItem : item.getItems()) {
if (StrUtil.isNotBlank(sb)) {
- sb.append(";" + itemItem.getGoodsName() + "*" + itemItem.getCnt());
+ sb.append(";" + itemItem.getGoodsName()+"-"+itemItem.getSkuName() + "*" + itemItem.getCnt());
} else {
- sb.append(itemItem.getGoodsName() + "*" + itemItem.getCnt());
+ sb.append(itemItem.getGoodsName()+"-"+itemItem.getSkuName() + "*" + itemItem.getCnt());
}
}
temp.add(sb.toString());
--
Gitblit v1.9.1