From f673fd85f198a8d99f531ae6ca16246bcc3bdea9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 14:53:02 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index d385ba9..da4e94d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -937,11 +937,12 @@
public void importExpress(String url) {
URL url1 = new URL(url);
try (InputStream fileInputStream = url1.openStream()) {
- Workbook workbook = new SXSSFWorkbook(new XSSFWorkbook(fileInputStream));
+ Workbook workbook = new XSSFWorkbook(fileInputStream);
Sheet sheet = workbook.getSheetAt(0); // 获取第一个Sheet
int lastRowNum = sheet.getLastRowNum();
for (int i = 2; i <= lastRowNum; i++) {
Row row = sheet.getRow(i);
+ row.getCell(1).setCellType(CellType.STRING);
String orderNum = row.getCell(1).getStringCellValue();
// 快递单号
row.getCell(7).setCellType(CellType.STRING);
@@ -957,14 +958,23 @@
String cityCode = row.getCell(12).getStringCellValue();
Order order = this.getOne(new LambdaQueryWrapper<Order>()
.eq(Order::getOrderNumber, orderNum)
- .eq(Order::getOrderType, 2)
- .eq(Order::getDistributionMode,2)
- .eq(Order::getOrderStatus, 1)
);
if (order == null){
throw new ServiceException("订单不存在："+orderNum, 500);
}
+ Integer orderType = order.getOrderType();
+ if (orderType != 2){
+ throw new ServiceException("该订单："+orderNum+"类型不为单品订单", 500);
+ }
+ if (order.getDistributionMode() != 2){
+ throw new ServiceException("该订单："+orderNum+"配送方式不为快递", 500);
+ }
+ Integer orderStatus = order.getOrderStatus();
+ if (orderStatus != 1){
+ throw new ServiceException("该订单："+orderNum+"状态不为待发货", 500);
+ }
+
String companyNameByCode = ExpressCompanyMap.getCompanyNameByCode(expressName);
if(StringUtils.isEmpty(companyNameByCode)){
throw new ServiceException("快递公司编码错误："+expressName, 500);
--
Gitblit v1.7.1