localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Allow partial discount on supplier orders #68

Merged
Seil0 merged 1 commits from fix/discount_calculation_in_supplier_service into master 2020-06-13 12:21:27 +02:00
Conversation 1 Commits 1 Files Changed 1 +8 -3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fa2c1f3a7 - Show all commits

11
supplier/src/main/java/org/hso/ecommerce/supplier/RequestController.java
View File

@ -62,10 +62,15 @@ public class RequestController {
} }
int priceNet = a.pricePerUnitNet * order.quantity; int priceNet = a.pricePerUnitNet * order.quantity;
int discount = 0; int discountableNetAmount = 0;
if(dailyVolume >= s.discount.minimumDailySalesVolumeNetCent) { if (dailyVolume >= s.discount.minimumDailySalesVolumeNetCent) {
discount = (priceNet * s.discount.percentDiscount) / 100; // grant discount on the full price
discountableNetAmount = priceNet;
} else if (dailyVolume + priceNet > s.discount.minimumDailySalesVolumeNetCent) {
// grant partial discount
discountableNetAmount = dailyVolume + priceNet - s.discount.minimumDailySalesVolumeNetCent;
} }
int discount = (discountableNetAmount * s.discount.percentDiscount) / 100;
OrderConfirmation confirmation = new OrderConfirmation(); OrderConfirmation confirmation = new OrderConfirmation();
confirmation.articleNumber = order.articleNumber; confirmation.articleNumber = order.articleNumber;