From 4b3b36140aacd09b8ebc489d11dd399168303316 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 11:48:07 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 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 3eac7b1..f6062ef 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);
}
+
/**
@@ -933,7 +940,7 @@
String cityCode = row.getCell(12).getStringCellValue();
Order order = this.getOne(new LambdaQueryWrapper<Order>()
.eq(Order::getOrderNumber, orderNum)
- .eq(Order::getOrderType, 1)
+ .eq(Order::getOrderType, 2)
.eq(Order::getDistributionMode,2)
.eq(Order::getOrderStatus, 1)
);
--
Gitblit v1.7.1