Commit cb2acf14 authored by shiyu's avatar shiyu

换藏订单取消后,订单快照设置为无效

parent 8c2d2863
...@@ -786,12 +786,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -786,12 +786,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
int updateStock = currentStock + exchangeOrderSnapshot.getItemNum(); int updateStock = currentStock + exchangeOrderSnapshot.getItemNum();
supplierItemDao.updateStock(exchangeOrderSnapshot.getItemId(), updateStock); supplierItemDao.updateStock(exchangeOrderSnapshot.getItemId(), updateStock);
} }
//订单快照设置为无效
ExchangeOrderSnapshot exchangeOrderSnapshot = new ExchangeOrderSnapshot();
exchangeOrderSnapshot.setDistributionOrderId(dto.getDistributionOrderId());
exchangeOrderSnapshot.setIsValid(false);
exchangeOrderSnapshotDao.update(exchangeOrderSnapshot);
} else { } else {
if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) { if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
return Result.failed("该订单不是待支付状态,无法直接取消"); return Result.failed("该订单不是待支付状态,无法直接取消");
} }
distributionOrderDao.updateState(dto.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()); distributionOrderDao.updateState(dto.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
distributorProfitDao.updateValidState(dto.getDistributionOrderId(), false); distributorProfitDao.updateValidState(dto.getDistributionOrderId(), false);
} }
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
...@@ -1329,6 +1337,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1329,6 +1337,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) { if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) {
SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId()); SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
supplierItemDao.updateStock(distributionOrder.getItemId(), supplierItem.getStock() + distributionOrder.getItemNum()); supplierItemDao.updateStock(distributionOrder.getItemId(), supplierItem.getStock() + distributionOrder.getItemNum());
//订单快照设置为无效
ExchangeOrderSnapshot exchangeOrderSnapshot = new ExchangeOrderSnapshot();
exchangeOrderSnapshot.setDistributionOrderId(distributionOrderId);
exchangeOrderSnapshot.setIsValid(false);
exchangeOrderSnapshotDao.update(exchangeOrderSnapshot);
} }
} }
} }
...@@ -1365,6 +1378,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1365,6 +1378,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) { if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) {
SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId()); SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
supplierItemDao.updateStock(distributionOrder.getItemId(), supplierItem.getStock() + distributionOrder.getItemNum()); supplierItemDao.updateStock(distributionOrder.getItemId(), supplierItem.getStock() + distributionOrder.getItemNum());
//订单快照设置为无效
ExchangeOrderSnapshot exchangeOrderSnapshot = new ExchangeOrderSnapshot();
exchangeOrderSnapshot.setDistributionOrderId(distributionOrder.getDistributionOrderId());
exchangeOrderSnapshot.setIsValid(false);
exchangeOrderSnapshotDao.update(exchangeOrderSnapshot);
} }
} }
} }
......
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