|
|
@@ -188,18 +188,12 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
|
|
|
return bdUnitfee;
|
|
|
}
|
|
|
//数量,大于
|
|
|
- if (itemFieldValue.compareTo(bdValue) > 0
|
|
|
- && condition.equals("3")) {
|
|
|
- if (bdValue.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- if (isaccumulation.equals("1")) {
|
|
|
- //累加
|
|
|
- BigDecimal scale = itemFieldValue.divide(bdValue, 0, BigDecimal.ROUND_HALF_UP);
|
|
|
- return bdUnitfee.multiply(scale);
|
|
|
- } else {
|
|
|
- //不累加
|
|
|
- return bdUnitfee;
|
|
|
- }
|
|
|
- }
|
|
|
+ if ( condition.equals("3") && isaccumulation.equals("1")) {
|
|
|
+ //累加
|
|
|
+ BigDecimal scale = itemFieldValue.divide(bdValue, 0, BigDecimal.ROUND_HALF_UP);
|
|
|
+ return bdUnitfee.multiply(scale);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
return BigDecimal.valueOf(0);
|
|
|
}
|