|
|
@ -1177,6 +1177,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
|
|
|
|
throw new RuntimeException(response.getReason());
|
|
|
|
throw new RuntimeException(response.getReason());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
log.info("cancelPurchaseOrder: " + skuIds);
|
|
|
|
if (skuIds.isEmpty()) {
|
|
|
|
if (skuIds.isEmpty()) {
|
|
|
|
cancelPurchaseOrderByOrderId(shopId, orderId, source);
|
|
|
|
cancelPurchaseOrderByOrderId(shopId, orderId, source);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
@ -1265,13 +1266,15 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
|
|
|
|
dataSourceTransactionManager.commit(transactionStatus);
|
|
|
|
dataSourceTransactionManager.commit(transactionStatus);
|
|
|
|
} catch (Throwable e) {
|
|
|
|
} catch (Throwable e) {
|
|
|
|
dataSourceTransactionManager.rollback(transactionStatus);
|
|
|
|
dataSourceTransactionManager.rollback(transactionStatus);
|
|
|
|
log.error("doCancelPurchaseOrderItem transaction error: " + e.getMessage());
|
|
|
|
log.error("doCancelPurchaseOrderItem transaction", e);
|
|
|
|
throw new RuntimeException("处理异常");
|
|
|
|
throw new RuntimeException("处理异常");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
opOrderDsService.updateOpOrderDsFilterStatus(orderId, PurchaseOrderConst.PURCHASE_PLATFORM1688_D_S);
|
|
|
|
opOrderDsService.updateOpOrderDsFilterStatus(orderId, PurchaseOrderConst.PURCHASE_PLATFORM1688_D_S);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void doCancelPurchaseOrderItem(String orderId, List<Long> needCancelPurchaseOrderIds, List<Long> needCancelPurchaseOrderItemIds, List<PurchaseOrderCancelLog> logs) {
|
|
|
|
public void doCancelPurchaseOrderItem(String orderId, List<Long> needCancelPurchaseOrderIds, List<Long> needCancelPurchaseOrderItemIds, List<PurchaseOrderCancelLog> logs) {
|
|
|
|
|
|
|
|
log.info("doCancelPurchaseOrderItem_needCancelPurchaseOrderIds" + needCancelPurchaseOrderIds);
|
|
|
|
|
|
|
|
log.info("doCancelPurchaseOrderItem_needCancelPurchaseOrderItemIds" + needCancelPurchaseOrderItemIds);
|
|
|
|
if (!needCancelPurchaseOrderIds.isEmpty()) {
|
|
|
|
if (!needCancelPurchaseOrderIds.isEmpty()) {
|
|
|
|
purchaseOrderService.updateStatusByIds(StatusConst.cancel, needCancelPurchaseOrderIds);
|
|
|
|
purchaseOrderService.updateStatusByIds(StatusConst.cancel, needCancelPurchaseOrderIds);
|
|
|
|
}
|
|
|
|
}
|
|
|
|