From 48a40ea665ed42713e472d429cf7e311c52d86a5 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 19 六月 2025 14:54:02 +0800
Subject: [PATCH] update 解决商户端无法查看物流信息的问题

---
 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
index 92319c0..d82f943 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.order.order.serviceimpl;
 
+import cn.hutool.core.util.ArrayUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.order.order.entity.dos.OrderPackage;
@@ -8,9 +9,11 @@
 import cn.lili.modules.order.order.mapper.OrderPackageMapper;
 import cn.lili.modules.order.order.service.OrderPackageItemService;
 import cn.lili.modules.order.order.service.OrderPackageService;
+import cn.lili.modules.system.entity.dos.Logistics;
 import cn.lili.modules.system.entity.vo.Traces;
 import cn.lili.modules.system.service.LogisticsService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,8 +57,16 @@
             orderPackageVO.setOrderPackageItemList(orderPackageItemList);
             String str = orderPackage.getConsigneeMobile();
             str = str.substring(str.length() - 4);
-//            Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
-//            orderPackageVO.setTraces(traces);
+            //涓嶉渶瑕佸彇鏄惁鎵撳紑鐨勫彲鑳藉瓨鍦ㄧ幇鍦ㄤ笉鍙戦�佸揩閫掗渶瑕佹煡璇㈢墿娴佷俊鎭�
+            List<Logistics> list = logisticsService.list(Wrappers.<Logistics>lambdaQuery()
+                    .eq(Logistics::getCode,
+                            orderPackage.getLogisticsCode()));
+            String logisticsId = orderPackage.getLogisticsCode();
+            if (ArrayUtil.isNotEmpty(list)) {
+                logisticsId = list.get(0).getId();
+            }
+            Traces traces = logisticsService.getLogisticTrack(logisticsId, orderPackage.getLogisticsNo(), str);
+            orderPackageVO.setTraces(traces);
             orderPackageVOS.add(orderPackageVO);
         });
 

--
Gitblit v1.8.0