Commit 131d5cbd authored by shiyu's avatar shiyu

藏家订单详情

parent 2481518b
...@@ -240,4 +240,9 @@ public class DistributionOrderDetailVo implements Entity { ...@@ -240,4 +240,9 @@ public class DistributionOrderDetailVo implements Entity {
* 鉴定单号 * 鉴定单号
*/ */
private String identifyOrderId; private String identifyOrderId;
/**
* 平台收货地址
*/
private String channelReceiveAddress;
} }
...@@ -1099,11 +1099,10 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1099,11 +1099,10 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
distributionOrderDetailVo.setApproved(identifyOrder.getApproved()); distributionOrderDetailVo.setApproved(identifyOrder.getApproved());
distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark()); distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
distributionOrderDetailVo.setIdentifyOrderId(identifyOrder.getIdentifyOrderId()); distributionOrderDetailVo.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
distributionOrderDetailVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode()); distributionOrderDetailVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode());
distributionOrderDetailVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode())); distributionOrderDetailVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()));
distributionOrderDetailVo.setFromWaybill(identifyOrder.getFromWaybill()); distributionOrderDetailVo.setFromWaybill(identifyOrder.getFromWaybill());
distributionOrderDetailVo.setReceiverAddress(CommConsts.SYSTEM_DEFAULT_ADDRESS); distributionOrderDetailVo.setChannelReceiveAddress(CommConsts.SYSTEM_DEFAULT_ADDRESS);
} else { } else {
distributionOrderDetailVo.setTransferState(DistributionEnum.IdentifyOrderStateEnum.WAIT_SEND.getCode()); distributionOrderDetailVo.setTransferState(DistributionEnum.IdentifyOrderStateEnum.WAIT_SEND.getCode());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment