From a6cf27e733515a20fc14840f5c63b6c6139b1e33 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 11:16:27 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..952cf22 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
@@ -348,15 +348,22 @@
orderPageListVo.setGetCommission(reduce);
String expressJson = orderPageListVo.getExpressJson();
- // {"com":"zhongtong","num":"78853319672621"}
- JSONObject jsonObject = JSONObject.parseObject(expressJson);
+ if (StringUtils.isNotEmpty(expressJson) && !expressJson.equals("NULL")){
+ JSONObject jsonObject = null;
+ try {
+ jsonObject = JSONObject.parseObject(expressJson);
+ String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com"));
+ orderPageListVo.setExpressCompany(companyName);
+ orderPageListVo.setExpressNum(jsonObject.getString("num"));
+ } catch (Exception e) {
+ }
- String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com"));
- orderPageListVo.setExpressCompany(companyName);
- orderPageListVo.setExpressNum(jsonObject.getString("num"));
+ }
+
}
return pageInfo.setRecords(list);
}
+
/**
@@ -931,7 +938,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 +951,7 @@
order.setExpressJson(jsonObject.toJSONString());
order.setDeliverProvinceCode(provinceCode);
order.setDeliverCityCode(cityCode);
+ order.setOrderStatus(2);
this.updateById(order);
}
}
--
Gitblit v1.7.1