diff --git a/ch1_firstCase/ch1_switch/customer.cpp b/ch1_firstCase/ch1_switch/customer.cpp index 7ffc1a4..499bf4d 100644 --- a/ch1_firstCase/ch1_switch/customer.cpp +++ b/ch1_firstCase/ch1_switch/customer.cpp @@ -17,13 +17,10 @@ std::__cxx11::string Customer::getName() std::__cxx11::string Customer::statement() { - int frequentRenterPoints = 0; //积分点 - std::string result = "Rental Record for " + getName() + "\n"; std::vector::iterator iter = _rentals.begin(); for(;iter != _rentals.end();++iter) { Rental each = *iter; - frequentRenterPoints+=each.getFrequentRenterPoints(); //添加详单 result += "\t" + each.getMovie().getTitle() + "\t" @@ -31,7 +28,7 @@ std::__cxx11::string Customer::statement() } //添加脚注 result += "Amount owed is " + std::to_string(getTotalCharge()) + "\n"; - result += "You earned " + std::to_string(frequentRenterPoints) + + result += "You earned " + std::to_string(getTotalfrequentRenterPoints()) + " frequent renter points" + "\n"; return result; } @@ -57,3 +54,14 @@ double Customer::getTotalCharge() return result; } +int Customer::getTotalfrequentRenterPoints() +{ + int result = 0; //积分点 + std::vector::iterator iter = _rentals.begin(); + for(;iter != _rentals.end();++iter) { + Rental each = *iter; + result += each.getFrequentRenterPoints(); + } + return result; +} + diff --git a/ch1_firstCase/ch1_switch/customer.h b/ch1_firstCase/ch1_switch/customer.h index 39ca826..94822f5 100644 --- a/ch1_firstCase/ch1_switch/customer.h +++ b/ch1_firstCase/ch1_switch/customer.h @@ -17,6 +17,7 @@ class Customer std::vector& getRentals(); double amountFor(Rental aRental); double getTotalCharge(); + int getTotalfrequentRenterPoints(); private: std::string _name; //顾客名