fix: 利润率计算公式修复/导出勾选项修复

谢茂盛
1 parent e13bd966
Showing 4 changed files with 6 additions and 6 deletions
src/main/java/com/order/erp/common/utils/ProfitUtils.java
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
src/main/java/com/order/erp/domain/vo/order/ProfitCalculateVO.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
@@ -73,7 +73,7 @@ public class ProfitUtils {
         if (v.intValue() <= 0) {
             return 0;
         }
-
-        return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).divide(v))).doubleValue();
+        BigDecimal result = productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).divide(v, 4, BigDecimal.ROUND_HALF_UP);
+        return new BigDecimal(1).subtract(result).doubleValue();
     }
 }
@@ -34,5 +34,5 @@ public class OrderProfitAnalysisVo implements Serializable {
      * 汇率
      */
     @NotNull(message = "请选择当天汇率进行计算")
-    private Double exchangeRate;
+    private String exchangeRate;
 }
@@ -39,7 +39,7 @@ public class ProfitCalculateVO implements Serializable {
     /**
      * 默认 0 公式1，1 公式2
      */
-    private int profitType;
+    private Integer profitType;
 }
@@ -179,8 +179,8 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
         profitAnalysisVO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
         profitAnalysisVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue());
         profitAnalysisVO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
-                .profitType(StringUtils.isBlank(profitAnalysisVo.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisVO.getProfitType()))
-                .exchangeRate(profitAnalysisVo.getExchangeRate())
+                .profitType(StringUtils.isBlank(profitAnalysisVo.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisVo.getProfitType()))
+                .exchangeRate(Double.parseDouble(profitAnalysisVo.getExchangeRate()))
                 .productionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue())
                 .packetTotalPrice(packetTotalPrice.doubleValue())
                 .customerTotalPrice(customerTotalPrice.doubleValue()).build()));