非车报价 空判断bug

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

@@ -999,71 +999,65 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * 转换非车
      */
     public BaseQuoteVo convertDriving(BaseQuoteVo<QuoteAccidentalDrivingVo> baseQuoteVo){
-
+        if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() == null){
+            return baseQuoteVo;
+        }
         //国任
         if(baseQuoteVo.getCompanyId().equals("XDCX1000000")){
             GuoRenQuoteVo<GuorenAccidentalDrivingVo> guoRenBaseQuoteVo = new GuoRenQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,guoRenBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo() != null) {
-                guoRenBaseQuoteVo.setAccidentalDrivingVo(new GuorenAccidentalDrivingVo());
+            guoRenBaseQuoteVo.setAccidentalDrivingVo(new GuorenAccidentalDrivingVo());
 
-                if (baseQuoteVo.getAccidentalDrivingVo().getSumAmount() != null) {
-                    guoRenBaseQuoteVo.getAccidentalDrivingVo().setAmount(baseQuoteVo.getAccidentalDrivingVo().getSumAmount());
-                }
-                if (baseQuoteVo.getAccidentalDrivingVo().getSumPremium() != null) {
-                    guoRenBaseQuoteVo.getAccidentalDrivingVo().setPremium(baseQuoteVo.getAccidentalDrivingVo().getSumPremium());
-                }
-                guoRenBaseQuoteVo.getAccidentalDrivingVo().setProdCode(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                guoRenBaseQuoteVo.getAccidentalDrivingVo().setGoodsCode(baseQuoteVo.getAccidentalDrivingVo().getParentCode());
-                guoRenBaseQuoteVo.getAccidentalDrivingVo().setGoodsName(baseQuoteVo.getAccidentalDrivingVo().getParentName());
-                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                guoRenBaseQuoteVo.getAccidentalDrivingVo().setRiskCode(byProjectCode.getRiskCode());
-                guoRenBaseQuoteVo.getAccidentalDrivingVo().setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
+            if (baseQuoteVo.getAccidentalDrivingVo().getSumAmount() != null) {
+                guoRenBaseQuoteVo.getAccidentalDrivingVo().setAmount(baseQuoteVo.getAccidentalDrivingVo().getSumAmount());
+            }
+            if (baseQuoteVo.getAccidentalDrivingVo().getSumPremium() != null) {
+                guoRenBaseQuoteVo.getAccidentalDrivingVo().setPremium(baseQuoteVo.getAccidentalDrivingVo().getSumPremium());
             }
+            guoRenBaseQuoteVo.getAccidentalDrivingVo().setProdCode(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+            guoRenBaseQuoteVo.getAccidentalDrivingVo().setGoodsCode(baseQuoteVo.getAccidentalDrivingVo().getParentCode());
+            guoRenBaseQuoteVo.getAccidentalDrivingVo().setGoodsName(baseQuoteVo.getAccidentalDrivingVo().getParentName());
+            InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+            guoRenBaseQuoteVo.getAccidentalDrivingVo().setRiskCode(byProjectCode.getRiskCode());
+            guoRenBaseQuoteVo.getAccidentalDrivingVo().setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
             return guoRenBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("ZAPA1000000")){
             //众安
             BaseQuoteVo<Object> zhongAnBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,zhongAnBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
-                JSONObject accidentalDrivingVo = new JSONObject();
-                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                accidentalDrivingVo.put("insuredFlag", "1");
-                accidentalDrivingVo.put("combination", baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                accidentalDrivingVo.put("productCode", byProjectCode.getRiskCode());
-                accidentalDrivingVo.put("name", baseQuoteVo.getAccidentalDrivingVo().getProjectName());
-                accidentalDrivingVo.put("quantity", baseQuoteVo.getAccidentalDrivingVo().getQuantity());
-                zhongAnBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
-            }
+            JSONObject accidentalDrivingVo = new JSONObject();
+            InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+            accidentalDrivingVo.put("insuredFlag", "1");
+            accidentalDrivingVo.put("combination", baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+            accidentalDrivingVo.put("productCode", byProjectCode.getRiskCode());
+            accidentalDrivingVo.put("name", baseQuoteVo.getAccidentalDrivingVo().getProjectName());
+            accidentalDrivingVo.put("quantity", baseQuoteVo.getAccidentalDrivingVo().getQuantity());
+            zhongAnBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
             return zhongAnBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("TPBX1000000")){
             //安盛
             BaseQuoteVo<Object> anShengBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,anShengBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
-                JSONObject accidentalDrivingVo = new JSONObject();
-                accidentalDrivingVo.put("personFlag", "1");
-                accidentalDrivingVo.put("planCode", baseQuoteVo.getAccidentalDrivingVo().getParentCode());
-                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getParentCode());
-                accidentalDrivingVo.put("planSeries", byProjectCode.getRiskCode());
-                accidentalDrivingVo.put("planChineseName", baseQuoteVo.getAccidentalDrivingVo().getParentName());
-                accidentalDrivingVo.put("productCode", baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                accidentalDrivingVo.put("productName", baseQuoteVo.getAccidentalDrivingVo().getProjectName());
-                accidentalDrivingVo.put("quantity",baseQuoteVo.getAccidentalDrivingVo().getQuantity());
-                anShengBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
-            }
+            JSONObject accidentalDrivingVo = new JSONObject();
+            accidentalDrivingVo.put("personFlag", "1");
+            accidentalDrivingVo.put("planCode", baseQuoteVo.getAccidentalDrivingVo().getParentCode());
+            InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getParentCode());
+            accidentalDrivingVo.put("planSeries", byProjectCode.getRiskCode());
+            accidentalDrivingVo.put("planChineseName", baseQuoteVo.getAccidentalDrivingVo().getParentName());
+            accidentalDrivingVo.put("productCode", baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+            accidentalDrivingVo.put("productName", baseQuoteVo.getAccidentalDrivingVo().getProjectName());
+            accidentalDrivingVo.put("quantity",baseQuoteVo.getAccidentalDrivingVo().getQuantity());
+            anShengBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
             return anShengBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("AICS1000000")){
             //永诚
             BaseQuoteVo<AccidentalDrivingVo> yongChengBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,yongChengBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo() != null) {
-                AccidentalDrivingVo accidentalDrivingVo = new AccidentalDrivingVo();
-                accidentalDrivingVo.setRideRiskCode(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                accidentalDrivingVo.setRideRiskName(baseQuoteVo.getAccidentalDrivingVo().getProjectName());
-                accidentalDrivingVo.setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
-                yongChengBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
-            }
+            AccidentalDrivingVo accidentalDrivingVo = new AccidentalDrivingVo();
+            accidentalDrivingVo.setRideRiskCode(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
+            accidentalDrivingVo.setRideRiskName(baseQuoteVo.getAccidentalDrivingVo().getProjectName());
+            accidentalDrivingVo.setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
+            yongChengBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
             return yongChengBaseQuoteVo;
         }else if(baseQuoteVo.getCompanyId().equals("ZMBX1000000")){
             //中煤
@@ -1079,42 +1073,34 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             //人寿
             BaseQuoteVo<AccidentalDrivingVo> renShouBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo,renShouBaseQuoteVo);
-            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
-                AccidentalDrivingVo accidentalDrivingVo = new AccidentalDrivingVo();
-                accidentalDrivingVo.setId(baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                accidentalDrivingVo.setQuantity(baseQuoteVo.getAccidentalDrivingVo().getQuantity());
-                renShouBaseQuoteVo.setAccidentalDrivingVo(accidentalDrivingVo);
-            }
+            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);
-            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
-                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                hengBangBaseQuoteVo.setAccidentalDrivingVo(JSONObject.parseObject(byProjectCode.getRequestData()));
-            }
+            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);
-            if(baseQuoteVo.getAccidentalDrivingVo().getProjectCode() != null) {
-                InsDrivingIntentionInsurance byProjectCode = insDrivingIntentionInsuranceService.getByProjectCode(baseQuoteVo.getCompanyId(), baseQuoteVo.getAccidentalDrivingVo().getProjectCode());
-                taiPingBaseQuoteVo.setAccidentalDrivingVo(JSONObject.parseObject(byProjectCode.getRequestData()));
-            }
+            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);
-            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);
-            }
+            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;
@@ -1126,6 +1112,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * @return
      */
     public BaseQuoteVo<List<ZjQuoteAccidentVo>> converDrivingZijin(BaseQuoteVo<List<QuoteAccidentalDrivingVo>> baseQuoteVo){
+        if(baseQuoteVo.getAccidentalDrivingVo().size() == 0){
+            BaseQuoteVo<List<ZjQuoteAccidentVo>> zjBaseQuoteVo = new BaseQuoteVo<>();
+            List<ZjQuoteAccidentVo> zjQuoteAccidentVos = new ArrayList<>();
+            BeanUtils.copyProperties(baseQuoteVo,zjBaseQuoteVo);
+            zjBaseQuoteVo.setAccidentalDrivingVo(zjQuoteAccidentVos);
+            return zjBaseQuoteVo;
+        }
         List<QuoteAccidentalDrivingVo> accidentalDrivingVo = baseQuoteVo.getAccidentalDrivingVo();
         List<ZjQuoteAccidentVo> zjQuoteAccidentVos = new ArrayList<>();
         accidentalDrivingVo.forEach(item->{