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

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

@@ -121,6 +121,16 @@ public class SysDistributionOrderVo implements Entity {
 
     private String logisticsName;
 
+
+    /**
+     * 中转单寄出的物流公司编码
+     */
+    private String outLogisticsCode;
+
+    private String outLogisticsName;
+
+    private String outWaybill;
+
     /**
      * 运单号
      */

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

@@ -131,6 +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.setBuyerName(cacheUtil.getAppletUserNameById(distributionOrder.getBuyerId()));
                 distributionOrderVo.setTransferState(identifyOrder.getState());
                 distributionOrderVo.setTransferStateName(DistributionEnum.IdentifyOrderStateEnum.getNameByCode(identifyOrder.getState()));
@@ -176,7 +179,7 @@ public class SysIdentifyOrderServiceImpl implements SysIdentifyOrderService {
             //查询物流信息
             String fromLogisticsInfo = LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()) + "," +identifyOrder.getFromWaybill();
             String deliveryLogisticsInfo = LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()) + "," +distributionOrder.getWaybill();
-            if (identifyOrder.getApproved() != 1) {
+            if (identifyOrder.getApproved() != null && identifyOrder.getApproved() != 1) {
                 String returnLogisticsInfo = LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()) + "," + identifyOrder.getOutWaybill();
                 map.put("returnLogisticsInfo", returnLogisticsInfo.length() < 11 ? null : returnLogisticsInfo);
             }