更新

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -75,6 +75,16 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         // 查询采购订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<OrderInfo> dataList = baseMapper.getListByCondition(pageView);
+        if (CollectionUtil.isNotEmpty(dataList)) {
+            for (int i = 0; i < dataList.size(); i++) {
+
+                //运费信息
+                FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>().eq(FreightInfo.QueryFiles.ORDER_ID, dataList.get(i).getId()));
+                if (freightInfo != null) {
+                    dataList.get(i).setFreightInfo(freightInfo);
+                }
+            }
+        }
         Page<OrderInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);