Commit dca91832 by ping.wu

加价购活动优惠为0,不记录订单级别优惠

parent b9b87053
...@@ -16,10 +16,7 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -16,10 +16,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -220,6 +217,10 @@ public class CalculationSharingEquallyService { ...@@ -220,6 +217,10 @@ public class CalculationSharingEquallyService {
int discountAmount = (discount.getDiscount() == null) ? 0 : discount.getDiscount(); int discountAmount = (discount.getDiscount() == null) ? 0 : discount.getDiscount();
Integer discountType = discount.getType(); Integer discountType = discount.getType();
if (discountType != null && discountAmount >= 0) { if (discountType != null && discountAmount >= 0) {
//加价购金额为0不记录
if(Objects.equals(ActivityTypeEnum.TYPE_81.getCode(),discountType) && discountAmount == 0){
continue;
}
ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto(); ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
activityDiscountsDto.setActivityCode(discount.getActivityCode()); activityDiscountsDto.setActivityCode(discount.getActivityCode());
activityDiscountsDto.setActivityName(discount.getActivityName()); activityDiscountsDto.setActivityName(discount.getActivityName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment