From c8b658df0004f9698f20d7017703e0901fcf8b15 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 13:00:57 +0800
Subject: [PATCH] 短信认证
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..5662826 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -10,6 +10,7 @@
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
@@ -64,6 +65,7 @@
private final MallTeamLeaderMapper mallTeamLeaderMapper;
private final MallMemberMapper mallMemberMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final RedisUtils redisUtils;
@@ -110,6 +112,15 @@
@ControllerEndpoint(operation = "订单列表-发货", exceptionMessage = "操作失败")
public FebsResponse deliverGoods(@Valid DeliverGoodsDto deliverGoodsDto) {
return adminMallOrderService.deliverGoods(deliverGoodsDto);
+ }
+
+ /**
+ * 订单列表-修改物流编号
+ */
+ @PostMapping("deliverGoodsUpdate")
+ @ControllerEndpoint(operation = "订单列表-修改物流编号", exceptionMessage = "操作失败")
+ public FebsResponse deliverGoodsUpdate(@Valid DeliverGoodsDto deliverGoodsDto) {
+ return adminMallOrderService.deliverGoodsUpdate(deliverGoodsDto);
}
/**
@@ -279,7 +290,9 @@
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
- String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
+// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
+// String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
+ String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "备注", "物流单号", "物流公司", "物流公司码"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -301,9 +314,9 @@
for (MallOrderInfo item : dataList) {
List<Object> temp = new ArrayList<>();
temp.add(item.getOrderNo());
- temp.add(item.getAmount());
- temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
- temp.add("快递配送");
+// temp.add(item.getAmount());
+// temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
+// temp.add("快递配送");
temp.add(item.getName());
temp.add(item.getPhone());
temp.add(item.getAddress());
@@ -312,9 +325,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());
@@ -322,6 +335,7 @@
temp.add("");
}
+ temp.add(item.getRemark());
// temp.add(item.getStatus());
list.add(temp);
}
@@ -627,7 +641,8 @@
if (parentId == null) {
ViewMallOrderController.orderIdsStr = "";
}
- long[] longs = StrUtil.splitToLong(ViewMallOrderController.orderIdsStr, ',');
+ String existToken = redisUtils.getString("ADMIN_GOODS_CNT");
+ long[] longs = StrUtil.splitToLong(existToken, ',');
mallOrderItem.setOrderIdsStr(longs);
Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
return new FebsResponse().success().data(data);
--
Gitblit v1.9.1