From f61293e97bb2cb21c8f49e88b1ae5a3cbadefb6a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 25 Dec 2023 16:40:09 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 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 9efa5ee..ac9a274 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -9,6 +9,7 @@
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
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.SpringContextHolder;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
@@ -25,6 +26,7 @@
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.system.entity.Dept;
+import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@@ -371,7 +373,7 @@
long orderId = Long.parseLong(id);
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByIdAndTakeUniqueCode(orderId,mallOrderInfoDto.getTakeUniqueCode());
if(ObjectUtil.isEmpty(mallOrderInfo)){
- return new FebsResponse().fail().message("订单不存在");
+ return new FebsResponse().fail().message("请确认订单是否属于该团长");
}
Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
@@ -433,9 +435,12 @@
List<ExcelSheetPO> res = new ArrayList<>();
ExcelSheetPO orderSheet = new ExcelSheetPO();
String title = "订单列表";
+
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"订单编号", "商品名称", "订单金额", "提货码", "配送方式", "收货姓名", "收货电话", "团长名称", "团长手机号码", "自提点名称","详细地址"};
+// String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
+
+ String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -447,11 +452,13 @@
for(String id : ids){
long orderId = Long.parseLong(id);
MallOrderInfo mallOrderInfo1 = mallOrderInfoMapper.selectAllOrderInfoByIdAndTakeUniqueCode(orderId,mallOrderInfo.getTakeUniqueCode());
- dataList.add(mallOrderInfo1);
+ if(ObjectUtil.isNotEmpty(mallOrderInfo1)){
+ dataList.add(mallOrderInfo1);
+ }
}
// List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
List<List<Object>> list = new ArrayList<>();
- if (dataList.size() > 0) {
+ if (CollUtil.isNotEmpty(dataList)) {
for (MallOrderInfo item : dataList) {
List<Object> temp = new ArrayList<>();
temp.add(item.getOrderNo());
@@ -471,14 +478,14 @@
}
temp.add(item.getAmount());
temp.add(item.getTakeCode());
- temp.add("自提");
+// temp.add("自提");
temp.add(item.getName());
temp.add(item.getPhone());
+ temp.add(item.getAddress());
temp.add(item.getLeaderName());
temp.add(item.getLeaderPhone());
temp.add(item.getAddressArea());
- temp.add(item.getDetailAddress());
list.add(temp);
// adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
}
@@ -486,8 +493,10 @@
orderSheet.setDataList(list);
res.add(orderSheet);
response = ResponseHeadUtil.setExcelHead(response);
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(mallOrderInfo.getTakeUniqueCode());
+ String name = mallTeamLeader.getName();
response.setHeader("Content-Disposition",
- "attachment;filename=" + URLEncoder.encode(title + DateUtil.format(new Date(), "yyyyMMDDHHmmss") + ".xlsx".trim(), "UTF-8"));
+ "attachment;filename=" + URLEncoder.encode(name+"-"+title + DateUtil.format(new Date(), "yyyyMMDDHHmmss") + ".xlsx".trim(), "UTF-8"));
OutputStream os = response.getOutputStream();
ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
return null;
@@ -599,4 +608,18 @@
return adminMallOrderService.showStateSwitchOff(id);
}
+ /**
+ * 订单列表-统计商品份数
+ */
+ @GetMapping("goodsStatistics")
+ public FebsResponse goodsStatistics(MallOrderItem mallOrderItem, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewMallOrderController.orderIdsStr = "";
+ }
+ long[] longs = StrUtil.splitToLong(ViewMallOrderController.orderIdsStr, ',');
+ mallOrderItem.setOrderIdsStr(longs);
+ Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
+ return new FebsResponse().success().data(data);
+ }
+
}
--
Gitblit v1.9.1