中转单详情

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysIdentifyOrderServiceImpl.java

@@ -176,10 +176,13 @@ public class SysIdentifyOrderServiceImpl implements SysIdentifyOrderService {
             //查询物流信息
             String fromLogisticsInfo = LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()) + "," +identifyOrder.getFromWaybill();
             String deliveryLogisticsInfo = LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()) + "," +distributionOrder.getWaybill();
-            String returnLogisticsInfo = LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()) + "," + identifyOrder.getOutWaybill();
+            if (identifyOrder.getApproved() != 1) {
+                String returnLogisticsInfo = LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()) + "," + identifyOrder.getOutWaybill();
+                map.put("returnLogisticsInfo", returnLogisticsInfo.length() < 11 ? null : returnLogisticsInfo);
+            }
             map.put("fromLogisticsInfo", fromLogisticsInfo.length() < 11 ? null : fromLogisticsInfo);
             map.put("deliveryLogisticsInfo", deliveryLogisticsInfo.length() < 11 ? null : deliveryLogisticsInfo);
-            map.put("returnLogisticsInfo", returnLogisticsInfo.length() < 11 ? null : returnLogisticsInfo);
+
             return Result.success(map);
         } catch (Exception e) {
             logger.error("鉴定单详情 error:{}", e);