From 8a30a4b9079665d73b6370ed608f9b765176f1ac Mon Sep 17 00:00:00 2001
From: 9731050 <callpfarcry@gmail.com>
Date: Sun, 7 Apr 2019 21:53:39 +0800
Subject: [PATCH] 2th
---
src/com/restaurant/Order.java | 10 ++++++----
src/com/restaurant/Restaurant.java | 3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/com/restaurant/Order.java b/src/com/restaurant/Order.java
index 2baf97f..a3a4a51 100644
--- a/src/com/restaurant/Order.java
+++ b/src/com/restaurant/Order.java
@@ -4,7 +4,7 @@ public class Order {
private int id;
private Customer customer;
private Food[] foods;
- private int price;
+ private double price;
public Order(int id, Customer customer, Food[] foods) {
this.id = id;
@@ -13,10 +13,8 @@ public class Order {
for (Food food : foods) {
price += food.getPrice();
- System.out.println("price="+price);
}
price *= 1.4;
- System.out.println("price2="+price);
customer.setOrder(this);
}
@@ -24,7 +22,7 @@ public class Order {
return foods;
}
- public int getPrice() {
+ public double getPrice() {
return price;
}
@@ -35,8 +33,12 @@ public class Order {
}
for (int i = 0; i < amount; i++) {
temp[foods.length + i] = food;
+// System.out.println("s="+price);
+// System.out.println("f="+getPrice());
+ price=price+(temp[foods.length+i].getPrice())*1.4;
}
foods = temp;
+
temp = null;
}
diff --git a/src/com/restaurant/Restaurant.java b/src/com/restaurant/Restaurant.java
index 1285420..23f56f5 100644
--- a/src/com/restaurant/Restaurant.java
+++ b/src/com/restaurant/Restaurant.java
@@ -82,8 +82,9 @@ public class Restaurant {
}
public void acceptPayment(Customer customer) {
- int menuCost = customer.getOrder().getPrice();
+ double menuCost = customer.getOrder().getPrice();
currentCustomers.remove(customer);
+
fund += menuCost * 0.9;
totalNumOfFood += customer.getOrder().getFoods().length;
}
--
2.18.1