调整费用bug修改

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

@@ -123,11 +123,14 @@ public class CostsCalServiceImpl implements CostsCalcService {
             if (esmRetail != null) {
 //                BigDecimal sumPremium = insFeeOrderNew.getJqPremium().add(insFeeOrderNew.getSyPremium()).add(insFeeOrderNew.getNoPremium());
                 if (Integer.parseInt(esmRetail.getRetailtype()) >= 3) {
-                    retailStoreFee.setRetailStoreRadioLevel1(new BigDecimal(esmRetail.getDisrate1()));
-                    retailStoreFee.setRetailStoreFeeLevel1(sumPremium.multiply(new BigDecimal(esmRetail.getDisrate1())).divide(new BigDecimal("100")));
+                    retailStoreFee.setRetailStoreRadioLevel3(new BigDecimal(esmRetail.getDisrate1()));
+                    retailStoreFee.setRetailStoreFeeLevel3(sumPremium.multiply(new BigDecimal(esmRetail.getDisrate1())).divide(new BigDecimal("100")));
                     if (parents != null && parents.size() > 2) {
                         retailStoreFee.setRetailStoreUserIdLevel3(parents.get(2).getId());
                     }
+                }else{
+                    retailStoreFee.setRetailStoreRadioLevel3(new BigDecimal(0));
+                    retailStoreFee.setRetailStoreFeeLevel3(new BigDecimal(0));
                 }
                 if (Integer.parseInt(esmRetail.getRetailtype()) >= 2) {
                     retailStoreFee.setRetailStoreRadioLevel2(new BigDecimal(esmRetail.getDisrate2()));
@@ -135,6 +138,9 @@ public class CostsCalServiceImpl implements CostsCalcService {
                     if (parents != null && parents.size() > 1) {
                         retailStoreFee.setRetailStoreUserIdLevel2(parents.get(1).getId());
                     }
+                }else{
+                    retailStoreFee.setRetailStoreRadioLevel2(new BigDecimal(0));
+                    retailStoreFee.setRetailStoreFeeLevel2(new BigDecimal(0));
                 }
                 if (Integer.parseInt(esmRetail.getRetailtype()) >= 1) {
                     retailStoreFee.setRetailStoreRadioLevel1(new BigDecimal(esmRetail.getDisrate1()));
@@ -142,8 +148,16 @@ public class CostsCalServiceImpl implements CostsCalcService {
                     if (parents != null && parents.size() > 0) {
                         retailStoreFee.setRetailStoreUserIdLevel1(parents.get(0).getId());
                     }
+                }else{
+                    retailStoreFee.setRetailStoreRadioLevel1(new BigDecimal(0));
+                    retailStoreFee.setRetailStoreFeeLevel1(new BigDecimal(0));
                 }
             }
+
+            BigDecimal retailStore = retailStoreFee.getRetailStoreRadioLevel1() != null ? retailStoreFee.getRetailStoreRadioLevel1() : new BigDecimal(0)
+                    .add(retailStoreFee.getRetailStoreRadioLevel2() != null ?  retailStoreFee.getRetailStoreRadioLevel2() : new BigDecimal(0))
+                    .add(retailStoreFee.getRetailStoreRadioLevel3() != null ? retailStoreFee.getRetailStoreRadioLevel3() : new BigDecimal(0));
+            retailStoreFee.setRetailStoreRadio(retailStore);
         }else{
             retailStoreFee.setRetailStoreFee(BigDecimal.ZERO);
             retailStoreFee.setRetailStoreRadio(BigDecimal.ZERO);