From a88d521568399ae5caa7405248a67e3a54d57250 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 11:23:43 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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..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,17 +348,24 @@
             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);
     }
 
 
+
     /**
      * 小程序取消订单
      * @param orderId

--
Gitblit v1.7.1