藏家订单新增中转单状态2

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

@@ -235,4 +235,9 @@ public class DistributionOrderDetailVo implements Entity {
      * 0不通过； 1通过
      */
     private Integer approved;
+
+    /**
+     * 鉴定单号
+     */
+    private String identifyOrderId;
 }

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

@@ -171,6 +171,10 @@ public class DistributionOrderVo implements Entity {
      */
     private String introduceAmount;
 
+    /**
+     * 鉴定单号
+     */
+    private String identifyOrderId;
 
     /**
      * 藏馆订单中转状态

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

@@ -968,6 +968,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                     distributionOrderDetailVo.setTransferState(identifyOrder.getState());
                     distributionOrderDetailVo.setApproved(identifyOrder.getApproved());
                     distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+                    distributionOrderDetailVo.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
                 }
             }
             //一口价支付截止时间为下单半小时后，竞拍为24小时
@@ -1034,6 +1035,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 //如果藏家订单是取消状态，查询对应鉴定单状态
                 IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrder.getDistributionOrderId());
                 if (identifyOrder != null) {
+                    distributionOrderVo.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
                     distributionOrderVo.setTransferState(identifyOrder.getState());
                     distributionOrderVo.setApproved(identifyOrder.getApproved());
                 }
@@ -1093,6 +1095,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderDetailVo.setTransferState(identifyOrder.getState());
                 distributionOrderDetailVo.setApproved(identifyOrder.getApproved());
                 distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+                distributionOrderDetailVo.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
             }
 
             //一口价支付截止时间为下单半小时后，竞拍为24小时