From cf23f00f49b69193945f6ea8c81d4737af539b61 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 26 Sep 2022 11:28:44 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 16 ++++++++++------
src/main/resources/templates/febs/views/modules/order/orderList.html | 8 ++++----
src/main/java/cc/mrbird/febs/common/utils/excl/ExcelUtil.java | 4 ++++
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/utils/excl/ExcelUtil.java b/src/main/java/cc/mrbird/febs/common/utils/excl/ExcelUtil.java
index 51af891..7efbe2f 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/excl/ExcelUtil.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/excl/ExcelUtil.java
@@ -254,6 +254,10 @@
Cell cellHeader = row.createCell(i);
cellHeader.setCellStyle(getStyle(STYLE_HEADER, wb));
cellHeader.setCellValue(headers[i]);
+ // 调整每一列宽度
+ sheet.autoSizeColumn((short) i);
+ // 解决自动设置列宽中文失效的问题
+ sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 16 / 10);
}
}
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..08902f1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -371,7 +371,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 +433,10 @@
List<ExcelSheetPO> res = new ArrayList<>();
ExcelSheetPO orderSheet = new ExcelSheetPO();
String title = "订单列表";
+
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"订单编号", "商品名称", "订单金额", "提货码", "配送方式", "收货姓名", "收货电话", "团长名称", "团长手机号码", "自提点名称","详细地址"};
+ String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话", "团长名称", "团长手机号码", "自提点名称"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -447,11 +448,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());
@@ -478,7 +481,6 @@
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 +488,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;
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 4db20d2..4f0bb5b 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -172,10 +172,10 @@
var checkStatus = table.checkStatus(id);
if(event === 'confirmOrder'){
let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
- if(uniqueCodeValue == '' || uniqueCodeValue == null){
- febs.alert.warn('请选择团长');
- return;
- }
+ // if(uniqueCodeValue == '' || uniqueCodeValue == null){
+ // febs.alert.warn('请选择团长');
+ // return;
+ // }
var data = checkStatus.data;
let ids = "";
for(let i = 0;i < data.length;i++){
--
Gitblit v1.9.1