非车报价 空判断bug

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

@@ -1025,7 +1025,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             //众安
             BaseQuoteVo<Object> zhongAnBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,zhongAnBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo() != null) {
+            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
                 JSONObject accidentalDrivingVo = new JSONObject();
                 InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
                 accidentalDrivingVo.put("insuredFlag", "1");
@@ -1040,7 +1040,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             //安盛
             BaseQuoteVo<Object> anShengBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,anShengBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo() != null) {
+            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
                 JSONObject accidentalDrivingVo = new JSONObject();
                 accidentalDrivingVo.put("personFlag", "1");
                 accidentalDrivingVo.put("planCode", baseQuoteVo.getAccidentalDrivingVo().getParentCode());
@@ -1079,34 +1079,42 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             //人寿
             BaseQuoteVo<AccidentalDrivingVo> renShouBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,renShouBaseQuoteVo);
-            AccidentalDrivingVo accidentalDrivingVo = new AccidentalDrivingVo();
-            accidentalDrivingVo.setId(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-            accidentalDrivingVo.setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
-            renShouBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
+            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
+                AccidentalDrivingVo accidentalDrivingVo = new AccidentalDrivingVo();
+                accidentalDrivingVo.setId(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+                accidentalDrivingVo.setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
+                renShouBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
+            }
             return renShouBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("HBIC1000000")){
             //恒邦
             BaseQuoteVo<Object> hengBangBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,hengBangBaseQuoteVo);
-            InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(),baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-            hengBangBaseQuoteVo.setAccidentalDrivingVo(JSONObject.parseObject(byProjectCode.getRequestData()));
+            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
+                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+                hengBangBaseQuoteVo.setAccidentalDrivingVo(JSONObject.parseObject(byProjectCode.getRequestData()));
+            }
             return hengBangBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("TPIC1000000")){
             //太平
             BaseQuoteVo<Object> taiPingBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,taiPingBaseQuoteVo);
-            InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(),baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-            taiPingBaseQuoteVo.setAccidentalDrivingVo(JSONObject.parseObject(byProjectCode.getRequestData()));
+            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
+                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+                taiPingBaseQuoteVo.setAccidentalDrivingVo(JSONObject.parseObject(byProjectCode.getRequestData()));
+            }
             return taiPingBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("HNIC1000000")){
             //华农
             BaseQuoteVo<Object> huaNongBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,huaNongBaseQuoteVo);
-            InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(),baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-            JSONObject jsonObject = JSONObject.parseObject(byProjectCode.getRequestData());
-            jsonObject.put("allQuantity",baseQuoteVo.getAccidentalDrivingVo().getQuantity());
-            jsonObject.put("accidentType",jsonObject.getString("planCode"));
-            huaNongBaseQuoteVo.setAccidentalDrivingVo(jsonObject);
+            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
+                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+                JSONObject jsonObject = JSONObject.parseObject(byProjectCode.getRequestData());
+                jsonObject.put("allQuantity", baseQuoteVo.getAccidentalDrivingVo().getQuantity());
+                jsonObject.put("accidentType", jsonObject.getString("planCode"));
+                huaNongBaseQuoteVo.setAccidentalDrivingVo(jsonObject);
+            }
             return huaNongBaseQuoteVo;
         }
         return null;