中转单为空的情况排除

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

@@ -110,8 +110,10 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 EntityMapper.copyAttribute(distributionOrder, distributionOrderVo);
                 //查询藏家退货地址
                 IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrder.getDistributionOrderId());
-                String returnInfo = identifyOrder.getReturnName() + "," + identifyOrder.getReturnPhone() + "," + identifyOrder.getReturnAddress();
-                distributionOrderVo.setReturnAddress(returnInfo);
+                if (identifyOrder != null) {
+                    String returnInfo = identifyOrder.getReturnName() + "," + identifyOrder.getReturnPhone() + "," + identifyOrder.getReturnAddress();
+                    distributionOrderVo.setReturnAddress(returnInfo);
+                }
                 SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
                 distributionOrderVo.setItemName(supplierItem.getName());
                 long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();