|
@@ -2804,10 +2804,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
BigDecimal noTaxEntranceTotalProportion = entranceTotalProportion.divide(taxRate,2,RoundingMode.DOWN);
|
|
BigDecimal noTaxEntranceTotalProportion = entranceTotalProportion.divide(taxRate,2,RoundingMode.DOWN);
|
|
|
//出口的总比例
|
|
//出口的总比例
|
|
|
BigDecimal exportTotalProportion = noTaxEntranceTotalProportion.subtract(deptTotalProportion).subtract(retailTotalProportion);
|
|
BigDecimal exportTotalProportion = noTaxEntranceTotalProportion.subtract(deptTotalProportion).subtract(retailTotalProportion);
|
|
|
-// if(exportTotalProportion.compareTo(BigDecimal.ZERO) < 0 ){
|
|
|
|
|
-// //出口比例为负数了
|
|
|
|
|
-// exportTotalProportion = new BigDecimal(0);
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if(exportTotalProportion.compareTo(BigDecimal.ZERO) < 0 && premium.compareTo(BigDecimal.ZERO) == 0){
|
|
|
|
|
+ //出口比例为负数了
|
|
|
|
|
+ exportTotalProportion = new BigDecimal(0);
|
|
|
|
|
+ }
|
|
|
//如果手续费 大于 总比例 则出口手续费等于总比例
|
|
//如果手续费 大于 总比例 则出口手续费等于总比例
|
|
|
if(superviseCostsProportion.compareTo(exportTotalProportion) >= 0 ){
|
|
if(superviseCostsProportion.compareTo(exportTotalProportion) >= 0 ){
|
|
|
superviseCostsProportion = exportTotalProportion;
|
|
superviseCostsProportion = exportTotalProportion;
|
|
@@ -2822,6 +2822,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
exportFee.setSuperviseCostsPremiums(premium.multiply(exportFee.getSuperviseCosts().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
exportFee.setSuperviseCostsPremiums(premium.multiply(exportFee.getSuperviseCosts().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
exportFee.setOtherCostsPremiums(premium.multiply(exportFee.getOtherCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
exportFee.setOtherCostsPremiums(premium.multiply(exportFee.getOtherCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
exportFee.setTotalAmount(premium.multiply(exportFee.getTotalProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
exportFee.setTotalAmount(premium.multiply(exportFee.getTotalProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
|
|
+
|
|
|
return exportFee;
|
|
return exportFee;
|
|
|
}
|
|
}
|
|
|
|
|
|