helixiao 1 год назад
Родитель
Сommit
1cb85715d8

+ 17 - 6
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -322,6 +322,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                     SysRelationPerson sysRelationPerson1 = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
                             .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader.getUserId())
                             .eq(SysRelationPerson::getType, 1).eq(SysRelationPerson::getSuggestLevel, 1));
+
                     SysProportionConfig sysProportionConfig = sysProportionConfigMapper.selectOne(new LambdaQueryWrapper<SysProportionConfig>()
                             .eq(SysProportionConfig::getUserId, sysRelationPerson1.getSuggestId()));
 
@@ -351,22 +352,32 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                             sysPremiumDetail.setIndustrySector(1);
                             int suggestLevel = sysRelationPerson.getSuggestLevel();
                             if (suggestLevel == 1) {
-                                sysPremiumDetail.setProportional(sysProportionConfig.getOneProportion());
-                                sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysProportionConfig.getOneProportion())
+                                String oneProportion = sysProportionConfig.getOneProportion();
+                                if (StringUtils.isEmpty(oneProportion)) continue;
+                                sysPremiumDetail.setProportional(oneProportion);
+                                sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(oneProportion)
                                         .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
                             }else if (suggestLevel == 2) {
-                                sysPremiumDetail.setProportional(sysProportionConfig.getTwoProportion());
-                                sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysProportionConfig.getTwoProportion())
+                                String twoProportion = sysProportionConfig.getTwoProportion();
+                                if (StringUtils.isEmpty(twoProportion)) continue;
+                                sysPremiumDetail.setProportional(twoProportion);
+                                sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(twoProportion)
                                         .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
                             }else if (suggestLevel == 3) {
-                                sysPremiumDetail.setProportional(sysProportionConfig.getThreeProportion());
-                                sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysProportionConfig.getThreeProportion())
+                                String threeProportion = sysProportionConfig.getThreeProportion();
+                                if (StringUtils.isEmpty(threeProportion)) continue;
+                                sysPremiumDetail.setProportional(threeProportion);
+                                sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(threeProportion)
                                         .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
                             }else if (suggestLevel == 4) {
+                                String fourProportion = sysProportionConfig.getFourProportion();
+                                if (StringUtils.isEmpty(fourProportion)) continue;
                                 sysPremiumDetail.setProportional(sysProportionConfig.getFourProportion());
                                 sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysProportionConfig.getFourProportion())
                                         .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
                             }else if (suggestLevel == 5) {
+                                String fiveProportion = sysProportionConfig.getFiveProportion();
+                                if (StringUtils.isEmpty(fiveProportion)) continue;
                                 sysPremiumDetail.setProportional(sysProportionConfig.getFiveProportion());
                                 sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysProportionConfig.getFiveProportion())
                                         .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));