Skip to content

GitLab

Q
qk_backend
Commit 07eb6e5d authored by shiyu's avatar shiyu
Browse files
Options

换藏订单兼容上版本

parent 0606a785
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/ExchangeOrderServiceImpl.java
View file @ 07eb6e5d
...@@ -232,10 +232,14 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService { ...@@ -232,10 +232,14 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
} }
exchangeOrderDetailVo.setStateTitle(exchangeOrderDetailVo.getStateName()); exchangeOrderDetailVo.setStateTitle(exchangeOrderDetailVo.getStateName());
if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) { if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_DISAGREE.getCode()) { if (exchangeApplyOrder != null) {
exchangeOrderDetailVo.setStateDesc("藏品检查不通过，订单取消，交换关闭。"); if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_DISAGREE.getCode()) {
exchangeOrderDetailVo.setStateDesc("藏品检查不通过，订单取消，交换关闭。");
} else {
exchangeOrderDetailVo.setStateDesc("超时未寄出，订单取消，交换关闭。");
}
} else { } else {
exchangeOrderDetailVo.setStateDesc("超时未寄出，订单取消，交换关闭。"); exchangeOrderDetailVo.setStateDesc("订单取消，交换关闭。");
} }
} else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_INSPECTION.getCode()) { } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_INSPECTION.getCode()) {
exchangeOrderDetailVo.setStateDesc("请耐心等待，平台收到货后会尽快检查"); exchangeOrderDetailVo.setStateDesc("请耐心等待，平台收到货后会尽快检查");
...@@ -275,8 +279,10 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService { ...@@ -275,8 +279,10 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
if (diffInHours >= 48) { if (diffInHours >= 48) {
//换藏的品取消订单后恢复库存 //换藏的品取消订单后恢复库存
ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByExchangeOrderId(orderId); ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByExchangeOrderId(orderId);
exchangeApplyOrderDao.updateState(exchangeApplyOrder.getExchangeApplyOrderId(), ExchangeApplyOrderEnum.StateEnum.SYSTEM_CANCEL.getCode()); if (exchangeApplyOrder != null) {
exchangeApplyOrderDetailDao.updateInValid(exchangeApplyOrder.getExchangeApplyOrderId()); exchangeApplyOrderDao.updateState(exchangeApplyOrder.getExchangeApplyOrderId(), ExchangeApplyOrderEnum.StateEnum.SYSTEM_CANCEL.getCode());
exchangeApplyOrderDetailDao.updateInValid(exchangeApplyOrder.getExchangeApplyOrderId());
}
distributionOrderDao.updateState(orderId, DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()); distributionOrderDao.updateState(orderId, DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
//查询交换订单商品快照 //查询交换订单商品快照
List<ExchangeOrderSnapshot> list = exchangeOrderSnapshotDao.findByOrderId(orderId); List<ExchangeOrderSnapshot> list = exchangeOrderSnapshotDao.findByOrderId(orderId);
......
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