From 253275cbc241493d0fc17f95c5f0ffd7eed3e12d Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 13 Jun 2025 09:55:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=88=90=E6=8C=89=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E9=87=8D=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisCommissionProfitServiceImpl.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 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 d6d8c2995..c31f1f75d 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 @@ -506,9 +506,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - if( isValueInExprScope(waybill.getSettlementWeight().doubleValue(),exprItem) ){ - calcExprStr = getCalcFeeExpStr(waybill.getSettlementWeight(),exprItem); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:" + waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); + if( isValueInExprScope(waybill.getBillWeight().doubleValue(),exprItem) ){ + calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(),exprItem); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:" + waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -623,9 +623,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - if( isValueInExprScope(waybill.getSettlementWeight().doubleValue(),exprItem) ) { - calcExprStr = getCalcFeeExpStr(waybill.getSettlementWeight(),exprItem); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:" + waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); + if( isValueInExprScope(waybill.getBillWeight().doubleValue(),exprItem) ) { + calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(),exprItem); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:" + waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -879,9 +879,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - if( isValueInExprScope(waybill.getSettlementWeight().doubleValue(),exprItem) ) { - calcExprStr = getCalcFeeExpStr(waybill.getSettlementWeight(), exprItem); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); + if( isValueInExprScope(waybill.getBillWeight().doubleValue(),exprItem) ) { + calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(), exprItem); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -1003,9 +1003,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - if( isValueInExprScope(waybill.getSettlementWeight().doubleValue(),exprItem) ) { - calcExprStr = getCalcFeeExpStr(waybill.getSettlementWeight(), exprItem); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); + if( isValueInExprScope(waybill.getBillWeight().doubleValue(),exprItem) ) { + calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(), exprItem); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -1120,10 +1120,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - if( isValueInExprScope(waybill.getSettlementWeight().doubleValue(),exprItem) ) { - calcExprStr = getCalcFeeExpStr(waybill.getSettlementWeight(), exprItem); + if( isValueInExprScope(waybill.getBillWeight().doubleValue(),exprItem) ) { + calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(), exprItem); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); } @@ -1254,11 +1254,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { - calcExprStr = calcExp.replaceAll("w", waybill.getSettlementWeight().stripTrailingZeros().toPlainString()) + calcExprStr = calcExp.replaceAll("w", waybill.getBillWeight().stripTrailingZeros().toPlainString()) .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); - log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getSettlementWeight().stripTrailingZeros().toPlainString()); + log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); }