中转单非空判断

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -844,18 +844,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             //藏馆订单中转审核不通过要展示原因
             if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
                 IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
-                distributionOrderDetailVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode());
-                distributionOrderDetailVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()));
-                distributionOrderDetailVo.setFromWaybill(identifyOrder.getFromWaybill());
-                distributionOrderDetailVo.setApproved(identifyOrder.getApproved());
-                distributionOrderDetailVo.setTransferState(identifyOrder.getState());
-                //已取消的藏馆订单查询鉴定单信息
-                if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.REFUNDING.getCode()
-                || distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
-                    distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
-                    distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
-                    distributionOrderDetailVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
-                    distributionOrderDetailVo.setOutWaybill(identifyOrder.getOutWaybill());
+                if (identifyOrder != null) {
+                    distributionOrderDetailVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode());
+                    distributionOrderDetailVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()));
+                    distributionOrderDetailVo.setFromWaybill(identifyOrder.getFromWaybill());
+                    distributionOrderDetailVo.setApproved(identifyOrder.getApproved());
+                    distributionOrderDetailVo.setTransferState(identifyOrder.getState());
+                    //已取消的藏馆订单查询鉴定单信息
+                    if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.REFUNDING.getCode()
+                            || distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
+                        distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+                        distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
+                        distributionOrderDetailVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
+                        distributionOrderDetailVo.setOutWaybill(identifyOrder.getOutWaybill());
+                    }
                 }
             }
             //利润
@@ -959,12 +961,14 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                     && distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
                 //如果藏家订单是取消状态，查询对应鉴定单信息
                 IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
-                distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
-                distributionOrderDetailVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
-                distributionOrderDetailVo.setOutWaybill(identifyOrder.getOutWaybill());
-                distributionOrderDetailVo.setTransferState(identifyOrder.getState());
-                distributionOrderDetailVo.setApproved(distributionOrderDetailVo.getApproved());
-                distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+                if (identifyOrder != null) {
+                    distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
+                    distributionOrderDetailVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
+                    distributionOrderDetailVo.setOutWaybill(identifyOrder.getOutWaybill());
+                    distributionOrderDetailVo.setTransferState(identifyOrder.getState());
+                    distributionOrderDetailVo.setApproved(distributionOrderDetailVo.getApproved());
+                    distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+                }
             }
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();