diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 9fe123a..1c8d361 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index a858327..938131b 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.5/fileHashes/fileHashes.bin b/.gradle/8.5/fileHashes/fileHashes.bin index 3e44fff..2486ea5 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.bin and b/.gradle/8.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock index eb70893..f4d4634 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.lock and b/.gradle/8.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.5/fileHashes/resourceHashesCache.bin b/.gradle/8.5/fileHashes/resourceHashesCache.bin index bcca034..2edc789 100644 Binary files a/.gradle/8.5/fileHashes/resourceHashesCache.bin and b/.gradle/8.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index dd39d5d..f53b183 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/DemoApplication.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/DemoApplication.class.uniqueId2 index 80b261e..b969137 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/DemoApplication.class.uniqueId2 and b/build/tmp/compileJava/compileTransaction/stash-dir/DemoApplication.class.uniqueId2 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/OrderEntity.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/OrderEntity.class.uniqueId4 index 631ab43..d01d307 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/OrderEntity.class.uniqueId4 and b/build/tmp/compileJava/compileTransaction/stash-dir/OrderEntity.class.uniqueId4 differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index c94757c..23e8dc3 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/build/tmp/compileTestJava/compileTransaction/stash-dir/OrderServiceTests.class.uniqueId0 b/build/tmp/compileTestJava/compileTransaction/stash-dir/OrderServiceTests.class.uniqueId0 index ea44bf2..74df079 100644 Binary files a/build/tmp/compileTestJava/compileTransaction/stash-dir/OrderServiceTests.class.uniqueId0 and b/build/tmp/compileTestJava/compileTransaction/stash-dir/OrderServiceTests.class.uniqueId0 differ diff --git a/build/tmp/compileTestJava/previous-compilation-data.bin b/build/tmp/compileTestJava/previous-compilation-data.bin index e0d93d4..07817fb 100644 Binary files a/build/tmp/compileTestJava/previous-compilation-data.bin and b/build/tmp/compileTestJava/previous-compilation-data.bin differ diff --git a/data.mv.db b/data.mv.db index 69e9d42..7b69f5d 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/com/example/demo/orders/api/OrderController.java b/src/main/java/com/example/demo/orders/api/OrderController.java index d49f405..7f64d21 100644 --- a/src/main/java/com/example/demo/orders/api/OrderController.java +++ b/src/main/java/com/example/demo/orders/api/OrderController.java @@ -56,8 +56,8 @@ public class OrderController { for (OrderLineDto lineDto : dto.getLines()) { OrderLineEntity orderLineEntity = modelMapper.map(lineDto, OrderLineEntity.class); orderLineEntity.setId(null); - // Здесь нужно установить ProductEntity для OrderLineEntity - ProductEntity product = productService.get(lineDto.getProductId()); // Получаем продукт по его ID + + ProductEntity product = productService.get(lineDto.getProductId()); orderLineEntity.setProduct(product); // Устанавливаем продукт для строки заказа entity.addOrderLine(orderLineEntity); } diff --git a/src/main/java/com/example/demo/orders/model/OrderEntity.java b/src/main/java/com/example/demo/orders/model/OrderEntity.java index daf7a95..b2ff836 100644 --- a/src/main/java/com/example/demo/orders/model/OrderEntity.java +++ b/src/main/java/com/example/demo/orders/model/OrderEntity.java @@ -70,11 +70,4 @@ public class OrderEntity extends BaseEntity { && Objects.equals(other.getLines(), lines); } - public Double calculateTotalOrderPrice() { - Double totalPrice = 0.0; - for (OrderLineEntity orderLine : lines) { - totalPrice += orderLine.getProduct().getPrice() * orderLine.getCount(); - } - return totalPrice; - } }