藏家订单新增中转单状态

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/DistributionOrderVo.java

@@ -170,5 +170,17 @@ public class DistributionOrderVo implements Entity {
      * 介绍佣金
      */
     private String introduceAmount;
+
+
+    /**
+     * 藏馆订单中转状态
+     */
+    private Integer transferState;
+
+    /**
+     * 审核结果
+     * 0不通过； 1通过
+     */
+    private Integer approved;
 }
 

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

@@ -1030,6 +1030,14 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
+
+                //如果藏家订单是取消状态，查询对应鉴定单状态
+                IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrder.getDistributionOrderId());
+                if (identifyOrder != null) {
+                    distributionOrderVo.setTransferState(identifyOrder.getState());
+                    distributionOrderVo.setApproved(identifyOrder.getApproved());
+                }
+
                 //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
@@ -1078,12 +1086,14 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
             //如果藏家订单是取消状态，查询对应鉴定单状态
             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(identifyOrder.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(identifyOrder.getApproved());
+                distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+            }
 
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();