From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 3 ++-
1 files changed, 2 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 e1f9f86..d621963 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
@@ -202,7 +202,7 @@
if(StringUtils.isNotEmpty(order.getExpressResult())){
MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
- orderDetailVO.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
+ orderDetailVO.setExpress(null != data && data.size() > 0 ? data.get(0).getContext() : "");
}
if(order.getOrderType() == 1){
@@ -283,6 +283,7 @@
if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
order.setTechnicianId(Integer.valueOf(technicianId));
}
+ // TODO
orderMapper.updateById(order);
}
--
Gitblit v1.7.1