From 175dcd8271dc1dd3d8416e016b891177e8645506 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 21 Nov 2024 18:39:57 +0800 Subject: [PATCH] md --- .../impl/EmisCommissionProfitServiceImpl.java | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index 90daa1b88..4929380ac 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -228,20 +228,20 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数 @@ -345,20 +345,20 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数 @@ -457,22 +457,22 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements log.info("按票计算:计算公式:" + calcExprStr + ",票数:1"); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } - // 重量计算 + // 重量计算-结算重量 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getBillWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数 @@ -577,20 +577,20 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数 @@ -689,20 +689,20 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数 @@ -801,11 +801,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements if (exprItem.getStartWeight().doubleValue() < waybill.getSettlementWeight().doubleValue() && exprItem.getEndWeight().doubleValue() >= waybill.getSettlementWeight().doubleValue() ) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -818,10 +818,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements && exprItem.getEndWeight().doubleValue() >= waybill.getTotalVolume().doubleValue() ) { - calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -933,20 +933,20 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数 @@ -1044,20 +1044,20 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().toString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().toString()) + calcExprStr = calcExp.replaceAll("w", waybill.getTotalVolume().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().toString()); + log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } // 包裹数