分销金额分销人为空，金额为空，查看详情空指针处理

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

@@ -1,26 +1,20 @@
 package com.ydtech.modules.fee.service.impl;
 
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.model.EsmRetail;
-import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmRetailService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.fee.dto.FeeFactorInfoDto;
 import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
 import com.ydtech.modules.fee.dto.FeeSchemeResDto;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
-import com.ydtech.modules.ins.model.vo.AccidentResponseVo;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsCopyFeeOrder;
 import com.ydtech.modules.order.entity.InsFeeOrder;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsCopyFeeOrderService;
@@ -2838,7 +2832,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         String oneUserName=  this.getUserName(insFeeOrderNew.getFirstLevelUserId());
         levelOne.setUserName(oneUserName);  //分销人
         levelOne.setDistributionRatio(insFeeOrderNew.getFirstDetailProportion());  // 分销比例
-        levelOne.setAmount(insFeeOrderNew.getFirstDetailPremiums());   // 分销金额
+        levelOne.setAmount(StringUtils.isNotEmpty(oneUserName)?insFeeOrderNew.getFirstDetailPremiums():new BigDecimal(0));   // 分销金额
         resultList.add(levelOne);
 
 
@@ -2847,7 +2841,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         String twoUserName=  this.getUserName(insFeeOrderNew.getTwoLevelUserId());
         levelTwo.setUserName(twoUserName);  //分销人
         levelTwo.setDistributionRatio(insFeeOrderNew.getSecondDetailProportion());  // 分销比例
-        levelTwo.setAmount(insFeeOrderNew.getSecondDetailPremiums());   // 分销金额
+        levelTwo.setAmount(StringUtils.isNotEmpty(twoUserName)?insFeeOrderNew.getSecondDetailPremiums():new BigDecimal(0));   // 分销金额
         resultList.add(levelTwo);
 
 
@@ -2856,7 +2850,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         String threeUserName=  this.getUserName(insFeeOrderNew.getThreeLevelUserId());
         levelThree.setUserName(threeUserName);  //分销人
         levelThree.setDistributionRatio(insFeeOrderNew.getThirdDetailProportion());  // 分销比例
-        levelThree.setAmount(insFeeOrderNew.getThirdDetailPremiums());   // 分销金额
+        levelThree.setAmount(StringUtils.isNotEmpty(threeUserName)?insFeeOrderNew.getThirdDetailPremiums():new BigDecimal(0));   // 分销金额
         resultList.add(levelThree);
         return resultList;
     }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -655,7 +655,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             orderAndAreaCompany.setReferrerName(referrerUser.getName());
             orderAndAreaCompany.setReferrerDeptId(referrerUser.getDeptId());
             SysDept sysDept = sysDeptService.getById(referrerUser.getDeptId());
-            orderAndAreaCompany.setReferrerDeptName(sysDept.getName());
+            orderAndAreaCompany.setReferrerDeptName(sysDept!=null?sysDept.getName():null);
             orderAndAreaCompany.setReferrerDeptAreaInfo(sysDeptService.queryBelongArea(referrerUser.getDeptId()));
         }