From c981d660b0b47f2b4e6f59c08d0d06c5ce908456 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 16:33:06 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 c650ba0..3eac7b1 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
@@ -931,7 +931,12 @@
String provinceCode = row.getCell(10).getStringCellValue();
// 市区划代码
String cityCode = row.getCell(12).getStringCellValue();
- Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, orderNum));
+ Order order = this.getOne(new LambdaQueryWrapper<Order>()
+ .eq(Order::getOrderNumber, orderNum)
+ .eq(Order::getOrderType, 1)
+ .eq(Order::getDistributionMode,2)
+ .eq(Order::getOrderStatus, 1)
+ );
if (order != null){
JSONObject jsonObject = new JSONObject();
jsonObject.put("com", expressName);
@@ -939,6 +944,7 @@
order.setExpressJson(jsonObject.toJSONString());
order.setDeliverProvinceCode(provinceCode);
order.setDeliverCityCode(cityCode);
+ order.setOrderStatus(2);
this.updateById(order);
}
}
--
Gitblit v1.7.1