This commit is contained in:
linfso 2025-07-03 11:31:51 +08:00
parent eaf74a5405
commit dc1a9442a3

View File

@ -1755,7 +1755,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
calcWaybillFee(checkFeeWaybill);
if(checkFeeWaybill.getFreight().compareTo(emisWaybillSave.getFreight()) > 0 ){
log.error("费用异常,请检查运费=111=>check:{},new:{}",
checkFeeWaybill.getFreight().stripTrailingZeros().toPlainString(),
emisWaybillSave.getFreight().stripTrailingZeros().toPlainString()
);
if( emisWaybillSave.getFreight().doubleValue() < checkFeeWaybill.getFreight().doubleValue() ){
throw new EmisBizError(EmisBizErrorType.FAIL, "费用异常,请检查运费!");
}
}
@ -3182,7 +3187,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
calcWaybillFee(checkFeeWaybill);
if(checkFeeWaybill.getFreight().compareTo(emisWaybillSave.getFreight()) > 0 ){
log.error("费用异常,请检查运费=222=>check:{},new:{}",
checkFeeWaybill.getFreight().stripTrailingZeros().toPlainString(),
emisWaybillSave.getFreight().stripTrailingZeros().toPlainString()
);
if( emisWaybillSave.getFreight().doubleValue() < checkFeeWaybill.getFreight().doubleValue() ){
throw new EmisBizError(EmisBizErrorType.FAIL, "费用异常,请检查运费!");
}
}
@ -3626,7 +3636,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
// 再次检查费用是否和标准计费是否一致:非特殊报价和一口价
if(!"1".equals(emisWaybillSave.getBlSpecialQuote()) && !"3".equals(emisWaybillSave.getCalcFeeType())){
if(!"1".equals(emisWaybillSave.getBlSpecialQuote()) && !"3".equals(emisWaybillSave.getCalcFeeType()) ){
EmisWaybill checkFeeWaybill=new EmisWaybill();
checkFeeWaybill.setProductType(emisWaybillSave.getProductType());
@ -3643,7 +3653,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
calcWaybillFee(checkFeeWaybill);
if(checkFeeWaybill.getFreight().compareTo(emisWaybillSave.getFreight()) > 0 ){
log.error("费用异常,请检查运费=333=>check:{},new:{}",
checkFeeWaybill.getFreight().stripTrailingZeros().toPlainString(),
emisWaybillSave.getFreight().stripTrailingZeros().toPlainString()
);
if( emisWaybillSave.getFreight().doubleValue() < checkFeeWaybill.getFreight().doubleValue() ){
throw new EmisBizError(EmisBizErrorType.FAIL, "费用异常,请检查运费!");
}
}