canrd-outside / order-erp · Commits

Commit b2821c683f741364effbdcb734e834e1c329d10a

Authored by 谢茂盛
1 parent e29b1565
build: skipped

fix: 修复导出/编辑利润率/审核列表

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
src/main/java/com/order/erp/common/utils/ProfitUtils.java
  View file @b2821c6
@@ -43,6 +43,10 @@ public class ProfitUtils { @@ -43,6 +43,10 @@ public class ProfitUtils {
43 43
44 BigDecimal packetTotalPrice = new BigDecimal(calculateVO.getPacketTotalPrice()); 44 BigDecimal packetTotalPrice = new BigDecimal(calculateVO.getPacketTotalPrice());
45 45
  46 + if (calculateVO.getCustomerTotalPrice() <= Constant.ZERO) {
  47 + return 0;
  48 + }
  49 +
46 BigDecimal customerTotalPrice = new BigDecimal(calculateVO.getCustomerTotalPrice()); 50 BigDecimal customerTotalPrice = new BigDecimal(calculateVO.getCustomerTotalPrice());
47 51
48 return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).add(packetTotalPrice)).divide(customerTotalPrice, 4, BigDecimal.ROUND_HALF_UP)).doubleValue(); 52 return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).add(packetTotalPrice)).divide(customerTotalPrice, 4, BigDecimal.ROUND_HALF_UP)).doubleValue();
@@ -67,7 +71,7 @@ public class ProfitUtils { @@ -67,7 +71,7 @@ public class ProfitUtils {
67 BigDecimal v = customerTotalPrice.subtract(packetTotalPrice); 71 BigDecimal v = customerTotalPrice.subtract(packetTotalPrice);
68 72
69 if (v.intValue() <= 0) { 73 if (v.intValue() <= 0) {
70 - throw new BusinessException("客户金额小于包装费用"); 74 + return 0;
71 } 75 }
72 76
73 return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).divide(v))).doubleValue(); 77 return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).divide(v))).doubleValue();