Commit e904f89f authored by shiyu's avatar shiyu

订单详情

parent 190671df
...@@ -204,7 +204,9 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService { ...@@ -204,7 +204,9 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
} }
List<SupplierItemVo> supplierItemVos = new ArrayList<>(); List<SupplierItemVo> supplierItemVos = new ArrayList<>();
for (ExchangeOrderSnapshot exchangeOrderSnapshot : exchangeOrderSnapshotList) { for (ExchangeOrderSnapshot exchangeOrderSnapshot : exchangeOrderSnapshotList) {
SupplierItem supplierItem = supplierItemDao.findById(exchangeOrderSnapshot.getItemId());
SupplierItemVo supplierItemVo = new SupplierItemVo(); SupplierItemVo supplierItemVo = new SupplierItemVo();
EntityMapper.copyAttribute(supplierItem, supplierItemVo);
supplierItemVo.setItemId(exchangeOrderSnapshot.getItemId()); supplierItemVo.setItemId(exchangeOrderSnapshot.getItemId());
supplierItemVo.setName(exchangeOrderSnapshot.getItemName()); supplierItemVo.setName(exchangeOrderSnapshot.getItemName());
supplierItemVo.setItemNum(exchangeOrderSnapshot.getItemNum()); supplierItemVo.setItemNum(exchangeOrderSnapshot.getItemNum());
...@@ -238,7 +240,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService { ...@@ -238,7 +240,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
exchangeOrderDetailVo.setStateDesc("请耐心等待,平台收到货后会尽快验货"); exchangeOrderDetailVo.setStateDesc("请耐心等待,平台收到货后会尽快验货");
} else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) { } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
exchangeOrderDetailVo.setStateTitle("待平台发货"); exchangeOrderDetailVo.setStateTitle("待平台发货");
exchangeOrderDetailVo.setStateDesc("两方的藏品都验货通过,将在24小时内发货,请耐心等待"); exchangeOrderDetailVo.setStateDesc("两方的藏品都验货通过,将在48小时内发货,请耐心等待");
} else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode()) { } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode()) {
exchangeOrderDetailVo.setStateDesc("已发货,请查收"); exchangeOrderDetailVo.setStateDesc("已发货,请查收");
} }
......
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