|
@@ -159,8 +159,7 @@ public class OrderService {
|
|
|
Asset asset = assetRepo.findById(collection.getAssetId()).orElseThrow(new BusinessException("资产不存在"));
|
|
Asset asset = assetRepo.findById(collection.getAssetId()).orElseThrow(new BusinessException("资产不存在"));
|
|
|
asset.setStatus(AssetStatus.TRADING);
|
|
asset.setStatus(AssetStatus.TRADING);
|
|
|
assetRepo.save(asset);
|
|
assetRepo.save(asset);
|
|
|
- collection.setOnShelf(false);
|
|
|
|
|
- collectionRepo.save(collection);
|
|
|
|
|
|
|
+ collectionRepo.setOnShelf(collection.getId(), false);
|
|
|
}
|
|
}
|
|
|
order = orderRepo.save(order);
|
|
order = orderRepo.save(order);
|
|
|
if (order.getTotalPrice().equals(BigDecimal.ZERO)) {
|
|
if (order.getTotalPrice().equals(BigDecimal.ZERO)) {
|
|
@@ -450,11 +449,12 @@ public class OrderService {
|
|
|
asset.setStatus(AssetStatus.NORMAL);
|
|
asset.setStatus(AssetStatus.NORMAL);
|
|
|
assetRepo.save(asset);
|
|
assetRepo.save(asset);
|
|
|
}
|
|
}
|
|
|
- collection.setOnShelf(true);
|
|
|
|
|
|
|
+ collectionRepo.setOnShelf(collection.getId(), true);
|
|
|
}
|
|
}
|
|
|
collectionRepo.increaseSale(collection.getId(), -order.getQty());
|
|
collectionRepo.increaseSale(collection.getId(), -order.getQty());
|
|
|
collectionRepo.increaseStock(collection.getId(), order.getQty());
|
|
collectionRepo.increaseStock(collection.getId(), order.getQty());
|
|
|
|
|
|
|
|
|
|
+
|
|
|
order.setStatus(OrderStatus.CANCELLED);
|
|
order.setStatus(OrderStatus.CANCELLED);
|
|
|
order.setCancelTime(LocalDateTime.now());
|
|
order.setCancelTime(LocalDateTime.now());
|
|
|
orderRepo.save(order);
|
|
orderRepo.save(order);
|