后台中转单列表新增字段展示藏家发货的物流信息2

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/SysDistributionOrderVo.java

@@ -125,11 +125,11 @@ public class SysDistributionOrderVo implements Entity {
     /**
      * 中转单寄出的物流公司编码
      */
-    private String outLogisticsCode;
+    private String fromLogisticsCode;
 
-    private String outLogisticsName;
+    private String fromLogisticsName;
 
-    private String outWaybill;
+    private String fromWaybill;
 
     /**
      * 运单号

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

@@ -131,9 +131,9 @@ public class SysIdentifyOrderServiceImpl implements SysIdentifyOrderService {
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 distributionOrderVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
-                distributionOrderVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
-                distributionOrderVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
-                distributionOrderVo.setOutWaybill(identifyOrder.getOutWaybill());
+                distributionOrderVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode());
+                distributionOrderVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()));
+                distributionOrderVo.setFromWaybill(identifyOrder.getFromWaybill());
                 distributionOrderVo.setBuyerName(cacheUtil.getAppletUserNameById(distributionOrder.getBuyerId()));
                 distributionOrderVo.setTransferState(identifyOrder.getState());
                 distributionOrderVo.setTransferStateName(DistributionEnum.IdentifyOrderStateEnum.getNameByCode(identifyOrder.getState()));