forked from Yandex-Practicum/Java-Module-Project-YP
-
Notifications
You must be signed in to change notification settings - Fork 0
Проектная работа #1 #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Timmy6996
wants to merge
2
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| public class Calc { | ||
|
|
||
| int personCounter; | ||
|
|
||
| double allPrice; | ||
| double personalPrice; | ||
|
|
||
|
|
||
| double calcPersonPrice(int personCounter, double allPrice) { | ||
|
|
||
| this.allPrice = allPrice; | ||
| this.personCounter = personCounter; | ||
| personalPrice = this.allPrice / this.personCounter; | ||
|
|
||
| return personalPrice; | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| public class Format { | ||
|
|
||
| double allPrice; | ||
|
|
||
| public String formatRuble(double allPrice) { | ||
|
|
||
| this.allPrice = (int)allPrice; | ||
|
|
||
| if((this.allPrice % 100 >= 11) && (this.allPrice % 100 <= 14)) { | ||
|
|
||
| return " рублей"; | ||
|
|
||
| } else { | ||
|
|
||
| switch ((int)this.allPrice % 10) { | ||
| case 1: | ||
| return " рубль"; | ||
| case 2: | ||
| case 3: | ||
| case 4: | ||
| return " рубля"; | ||
| default: | ||
| return " рублей"; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| String roundingAll(double price) { | ||
| return String.format("%.2f", price); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,87 @@ | ||
| import java.util.Scanner; | ||
| public class Main { | ||
|
|
||
| public static void main(String[] args) { | ||
| // ваш код начнется здесь | ||
| // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости | ||
| System.out.println("Привет Мир"); | ||
| ProductsList productsList = new ProductsList(); | ||
| Calc calc = new Calc(); | ||
| Format format = new Format(); | ||
|
|
||
| int inputCount; | ||
| Scanner scanner = new Scanner(System.in); | ||
|
|
||
|
|
||
|
|
||
|
|
||
| System.out.println("На сколько персон вы бы хотели разделить ваш счет ?"); | ||
| while(true) { | ||
| if(!scanner.hasNextInt()) { | ||
|
|
||
| System.out.println("Неправильный ввод количества человек, повторите попытку ввода"); | ||
| scanner.next(); | ||
|
|
||
| } else { | ||
| inputCount = scanner.nextInt(); | ||
| if(inputCount > 1) { | ||
| break; | ||
| } | ||
| System.out.println("Неправильное значение для рассчета"); | ||
| } | ||
| } | ||
| System.out.println("Счет необходимо разделить на " + inputCount + " персон"); | ||
|
|
||
| calc.personCounter = inputCount; | ||
| while(true) { | ||
| System.out.println("Введите название товара или команду Завершить"); | ||
| productsList.prodName = scanner.next(); | ||
|
|
||
| if (productsList.prodName.equalsIgnoreCase("Завершить")) { | ||
| break; | ||
| } | ||
| System.out.println("Введите стоимость блюда"); | ||
| while(!scanner.hasNextDouble()) { | ||
|
|
||
| System.out.println("Неправильный ввод данных, повторите попытку"); | ||
| scanner.next(); | ||
|
|
||
| } | ||
| productsList.prodPrice = scanner.nextDouble(); | ||
|
|
||
| while(productsList.prodPrice <= 0) { | ||
|
|
||
| System.out.println("Некорректная цена блюда, введите корректную цену"); | ||
|
|
||
| while(!scanner.hasNextDouble()) { | ||
|
|
||
| System.out.println("Неправильный ввод данных, повторите попытку"); | ||
| scanner.next(); | ||
|
|
||
| } | ||
|
|
||
| productsList.prodPrice = scanner.nextDouble(); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| calc.allPrice = calc.allPrice + productsList.prodPrice; | ||
|
|
||
|
|
||
| productsList.totalPrice = productsList.addProduct(productsList.prodName, productsList.prodPrice); | ||
|
|
||
|
|
||
|
|
||
| System.out.println("Блюдо добавлено в ваш счет"); | ||
| } | ||
|
|
||
| if (calc.allPrice <= 0) { | ||
| System.out.println("Вы ничего не заказывали, для оплаты нужно что то заказать"); | ||
| } else { | ||
|
|
||
| System.out.println("Добавленные товары: \n" + productsList.totalPrice); | ||
| System.out.println( | ||
| "Каждый человек должен заплатить по: " | ||
| + format.roundingAll(calc.calcPersonPrice(calc.personCounter, calc.allPrice)) | ||
| + format.formatRuble(calc.calcPersonPrice(calc.personCounter, calc.allPrice)) | ||
| ); | ||
| } | ||
| scanner.close(); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Правильное решение закрыть сканер по завершении работы программы 👍 |
||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| public class ProductsList { | ||
| String prodName = ""; | ||
| double prodPrice; | ||
| String totalPrice = ""; | ||
|
|
||
| String addProduct(String prodName, double prodPrice) { | ||
|
|
||
| Format format = new Format(); | ||
|
|
||
| this.prodName = prodName; | ||
|
|
||
| this.prodPrice = prodPrice; | ||
|
|
||
| totalPrice = totalPrice + (prodName + ": " + format.roundingAll(prodPrice) + format.formatRuble(prodPrice) + "\n"); | ||
| return totalPrice; | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Молодец, что эту логику вынес в метод в отдельном классе 👍. Тем самым, стало возможным переиспользовать эту функциональность
🍏 Так как класс является, по сути, утилитарным, то методы в нем можно сделать статичными, чтобы обращаться к ним, не создавая экземпляр класса.