紫金新能源车

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -1058,7 +1059,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         }
         List<PtlNewCarJudgeRules> ptlNewCarJudgeRulesList =
          ptlNewCarJudgeRulesService.getByCompanyId(ptlAgreementAttribution.getInsCompanyId());
-        if (ptlNewCarJudgeRulesList != null && ptlNewCarJudgeRulesList.size() > 0) {
+        if (ptlNewCarJudgeRulesList != null && !ptlNewCarJudgeRulesList.isEmpty()) {
             PtlNewCarJudgeRules ptlNewCarJudgeRules = ptlNewCarJudgeRulesList.get(0);
             if ("月".equals(ptlNewCarJudgeRules.getUnitTypeCode())) {
                 LocalDate registerDate =
@@ -1162,7 +1163,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
             syNoTaxPremium = insFeeOrder.getSyPremium();
             //如果协议中配置为不含税结算时，计算不含税保费
             if (StringUtils.isNotEmpty(agreement.getWithTax()) && "否".equals(agreement.getWithTax())) {
-                syNoTaxPremium = insFeeOrder.getSyPremium().divide(new BigDecimal(1 + 0.06), BigDecimal.ROUND_HALF_UP, 2);
+                syNoTaxPremium = insFeeOrder.getSyPremium().divide(BigDecimal.valueOf(1 + 0.06), BigDecimal.ROUND_HALF_UP, 2);
             }
             insFeeOrder.setSyNoTaxPremium(syNoTaxPremium);
             //商业险总费用
@@ -1250,7 +1251,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
             List<EsmRetail> esmRetailList = esmRetailService.selectList(" where t.deptid=? and t.status = '1' ",
              new Object[]{sysUser.getDeptId()});
 
-            if (esmRetailList != null && esmRetailList.size() > 0) {
+            if (esmRetailList != null && !esmRetailList.isEmpty()) {
                 EsmRetail esmRetail = esmRetailList.get(0);
                 if (esmRetail != null) {
                     int cycleIndex = 0;
@@ -1284,25 +1285,25 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
 
                     if ("3".equals(esmRetail.getRetailtype())) {//团队配置了三级分销模式
                         if (breakCycle == 99999999 || breakCycle == 3) {
-                            insFeeOrder.setFirstRetailProportion(new BigDecimal(esmRetail.getDisrate1()));
-                            insFeeOrder.setSecondRetailProportion(new BigDecimal(esmRetail.getDisrate2()));
-                            insFeeOrder.setThirdRetailProportion(new BigDecimal(esmRetail.getDisrate3()));
+                            insFeeOrder.setFirstRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate1()));
+                            insFeeOrder.setSecondRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate2()));
+                            insFeeOrder.setThirdRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate3()));
                         } else if (breakCycle == 2) {
-                            insFeeOrder.setSecondRetailProportion(new BigDecimal(esmRetail.getDisrate2()));
-                            insFeeOrder.setThirdRetailProportion(new BigDecimal(esmRetail.getDisrate3()));
+                            insFeeOrder.setSecondRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate2()));
+                            insFeeOrder.setThirdRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate3()));
                         } else if (breakCycle == 1) {
-                            insFeeOrder.setThirdRetailProportion(new BigDecimal(esmRetail.getDisrate3()));
+                            insFeeOrder.setThirdRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate3()));
                         }
                     } else if ("2".equals(esmRetail.getRetailtype())) {//团队配置了二级分销模式
                         if (breakCycle == 99999999 || breakCycle == 3 || breakCycle == 2) {
-                            insFeeOrder.setFirstRetailProportion(new BigDecimal(esmRetail.getDisrate1()));
-                            insFeeOrder.setSecondRetailProportion(new BigDecimal(esmRetail.getDisrate2()));
+                            insFeeOrder.setFirstRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate1()));
+                            insFeeOrder.setSecondRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate2()));
                         } else if (breakCycle == 1) {
-                            insFeeOrder.setSecondRetailProportion(new BigDecimal(esmRetail.getDisrate2()));
+                            insFeeOrder.setSecondRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate2()));
                         }
                     } else if ("1".equals(esmRetail.getRetailtype())) {//团队配置了一级分销模式
                         if (breakCycle == 99999999 || breakCycle == 3 || breakCycle == 2 || breakCycle == 1) {
-                            insFeeOrder.setFirstRetailProportion(new BigDecimal(esmRetail.getDisrate1()));
+                            insFeeOrder.setFirstRetailProportion(BigDecimal.valueOf(esmRetail.getDisrate1()));
                         }
                     }
                     insFeeOrder.setFirstRetailPremiums(getPremium(totalNoTaxPremium, insFeeOrder.getFirstRetailProportion()));
@@ -1356,7 +1357,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
     private BigDecimal getPremium(BigDecimal noTaxPremium, BigDecimal costsProportion) {
         BigDecimal premium = new BigDecimal(0);
         if (costsProportion != null && costsProportion.doubleValue() > 0) {
-            premium = noTaxPremium.multiply(costsProportion).divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP);
+            premium = noTaxPremium.multiply(costsProportion).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP);
         }
         return premium;
     }