Commit 39bbf74f by weijiguang

.

parent 848ca276
...@@ -210,7 +210,7 @@ public class CouponUserServiceImpl implements ICouponUserService { ...@@ -210,7 +210,7 @@ public class CouponUserServiceImpl implements ICouponUserService {
couponVo.setNotFitableDesc("未达到满减要求"); couponVo.setNotFitableDesc("未达到满减要求");
return; return;
} }
couponVo.setCouponAmount(couponVo.getPriceDiscount().min(orderTotalAmount)); couponVo.setCouponAmount(couponVo.getPriceDiscount().min(orderTotalOrigDiscount));
} else { } else {
List<OrderDetail> fitOrderDetails = orderDetails.stream().filter(orderDetail -> fitCouponGoodsIdList.contains(orderDetail.getGoodsId())).collect(Collectors.toList()); List<OrderDetail> fitOrderDetails = orderDetails.stream().filter(orderDetail -> fitCouponGoodsIdList.contains(orderDetail.getGoodsId())).collect(Collectors.toList());
BigDecimal fitGoodsAmount = fitOrderDetails.stream().map(OrderDetail::getAmountShould).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal fitGoodsAmount = fitOrderDetails.stream().map(OrderDetail::getAmountShould).reduce(BigDecimal.ZERO, BigDecimal::add);
......
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