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

Merge pull request 'Allow partial discount on supplier orders' (#68) from fix/discount_calculation_in_supplier_service into master 

Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
This commit is contained in:
Jannik 2020-06-13 12:21:26 +02:00
parent ef8aa826a3 9fa2c1f3a7
commit 76550be9e7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 discount = 0;
if(dailyVolume >= s.discount.minimumDailySalesVolumeNetCent) {
discount = (priceNet * s.discount.percentDiscount) / 100;
int discountableNetAmount = 0;
if (dailyVolume >= s.discount.minimumDailySalesVolumeNetCent) {
// 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();
confirmation.articleNumber = order.articleNumber;