From 4e88d81927a660254005ff247ea79a42616388b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Aug 2022 17:32:01 +0800
Subject: [PATCH] 20220804 配送限制
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 7 ++++++-
1 files changed, 6 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 b5aa7ad..cfd5b69 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -5,6 +5,8 @@
import cc.mrbird.febs.common.entity.DeptTree;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+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.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
@@ -12,6 +14,7 @@
import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
@@ -280,7 +283,7 @@
ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
return null;
}
-
+ private final MallOrderInfoMapper mallOrderInfoMapper;
@GetMapping("exportOrderListOne")
@ControllerEndpoint(operation = "订单列表", exceptionMessage = "导出失败")
public FebsResponse exportOrderListOne(MallOrderInfo mallOrderInfo, HttpServletResponse response) throws IOException {
@@ -326,6 +329,8 @@
temp.add(item.getAddressArea());
temp.add(item.getProvince()+item.getCity()+item.getTownship()+item.getDetailAddress());
list.add(temp);
+
+ adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
}
}
orderSheet.setDataList(list);
--
Gitblit v1.9.1