weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-02-28 17:33:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

feat: 修复新增订单计算百分比折扣bug

Browse source
This commit is contained in:
wst 2024-12-06 21:52:34 +08:00
parent 8240edd095
commit cda982993b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java
View file

@ -223,13 +223,13 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl<OrderDao, Order>
// 折扣上限的折后价 // 折扣上限的折后价
String limitPrice = CalculationUtil.subtract(targetOrderItem.getPrice(), discountLimitPrice, CommonNumConstants.NUM_SIX); String limitPrice = CalculationUtil.subtract(targetOrderItem.getPrice(), discountLimitPrice, CommonNumConstants.NUM_SIX);
// 是否超过折扣上限 // 是否超过折扣上限
boolean priceCompare = CalculationUtil.getMax(percentDiscountPrice, discountLimitPrice, CommonNumConstants.NUM_SIX).equals(percentDiscountPrice); String highPrice = CalculationUtil.getMax(percentDiscountPrice, discountLimitPrice, CommonNumConstants.NUM_SIX);
// 设置应支付价格和优惠价格 // 设置应支付价格和优惠价格
if (priceCompare) { // 未超过优惠价 if (Double.parseDouble(highPrice) == Double.parseDouble(discountLimitPrice)) { // 未超过优惠价
item.setPayPrice(percentPrice); item.setPayPrice(percentPrice);
item.setCouponPrice(percentDiscountPrice); item.setCouponPrice(percentDiscountPrice);
// 修改总单总价 // 修改总单总价
order.setPayPrice(CalculationUtil.subtract(order.getPayPrice(), discountPercentInt, CommonNumConstants.NUM_SIX)); order.setPayPrice(CalculationUtil.subtract(order.getPayPrice(), percentDiscountPrice, CommonNumConstants.NUM_SIX));
order.setCouponPrice(percentDiscountPrice); order.setCouponPrice(percentDiscountPrice);
} else {// 超过优惠价 } else {// 超过优惠价
item.setPayPrice(limitPrice); item.setPayPrice(limitPrice);