藏家订单详情2

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

@@ -1088,7 +1088,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderDetailVo.setIntroduceRebate(PriceUtil.convertPriceFromStr(String.valueOf(rebate)).toString());
                 distributionOrderDetailVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
             }
-
+            distributionOrderDetailVo.setChannelReceiveAddress(CommConsts.SYSTEM_DEFAULT_ADDRESS);
             //查询对应鉴定单状态
             IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
             if (identifyOrder != null) {
@@ -1102,11 +1102,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderDetailVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode());
                 distributionOrderDetailVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()));
                 distributionOrderDetailVo.setFromWaybill(identifyOrder.getFromWaybill());
-                distributionOrderDetailVo.setChannelReceiveAddress(CommConsts.SYSTEM_DEFAULT_ADDRESS);
             } else {
                 distributionOrderDetailVo.setTransferState(DistributionEnum.IdentifyOrderStateEnum.WAIT_SEND.getCode());
             }
-
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
             if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {