Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/entity/Request/PremiumRequest.java

@@ -82,10 +82,10 @@ public class PremiumRequest {
         VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTaxVo();
 
         //处理车主约定特约
-        specialAgreementVo.forEach(item->{
-            if("T0028".equals(item.getClauseCode())){
+        specialAgreementVo.forEach(item -> {
+            if ("T0028".equals(item.getClauseCode())) {
                 String replace = item.getClausesContext().replaceFirst("_", quoteVo.getInsuredPersonInfo().getName());
-                replace = replace.replaceFirst("_",ownersInfo.getName());
+                replace = replace.replaceFirst("_", ownersInfo.getName());
                 item.setClausesContext(replace);
             }
         });
@@ -220,7 +220,7 @@ public class PremiumRequest {
     @JsonIgnore
     public static BiDTO buildBiDto(CustomerInfoVo ownerInfo, RiskInfoVo biRiskInfo, List<KindInfoVo> kindInfoVList,
                                    CarPriceResponse.DataDTO carPriceResult, VinQueryResponse.DataDTO vinQ, boolean isNoCar,
-                                   List<GuoRenSpecialAgreementVo> specialAgreementVo,String noCarPremium,
+                                   List<GuoRenSpecialAgreementVo> specialAgreementVo, String noCarPremium,
                                    String goodsCode) {
 
         BiDTO biDto = new BiDTO();
@@ -358,7 +358,7 @@ public class PremiumRequest {
                 }
                 prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
                 prptitemkind.setMainKindFlag("M");
-                prptitemkind.setUnitAmount("0");
+                prptitemkind.setUnitAmount(StringUtils.toString(k.getUnitAmount()));
             }
             //乘客责任险
             if (k.getPlatformKindCode().equals(KindCode.D4.getCode())) {
@@ -376,7 +376,7 @@ public class PremiumRequest {
                 prptitemkind.setMainKindFlag("M");
                 prptitemkind.setQuantity(passengerNum.toString());
                 prptitemkind.setUnitAmount(StringUtils.toString(k.getUnitAmount()));
-                prptitemkind.setAmount(BigDecimal.valueOf(StringUtils.toDouble(k.getUnitAmount())).multiply(passengerNum).toString());
+                prptitemkind.setAmount(BigDecimal.valueOf(Double.parseDouble(k.getUnitAmount())).multiply(passengerNum).toString());
 
             }
             //机动车损失险
@@ -533,7 +533,7 @@ public class PremiumRequest {
                 }
                 prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
                 prptitemkind.setMainKindFlag("S");
-                prptitemkind.setQuantity(String.valueOf(k.getServiceTimes()));
+                prptitemkind.setQuantity(StringUtils.isEmpty(String.valueOf(k.getServiceTimes())) || "null".equals(String.valueOf(k.getServiceTimes())) ? StringUtils.toString(k.getAmount()) : String.valueOf(k.getServiceTimes()));
             }
 
             if (k.getPlatformKindCode().equals(KindCode.TY2.getCode())) {
@@ -550,7 +550,7 @@ public class PremiumRequest {
                 }
                 prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
                 prptitemkind.setMainKindFlag("S");
-                prptitemkind.setQuantity(String.valueOf(k.getServiceTimes()));
+                prptitemkind.setQuantity(StringUtils.isEmpty(String.valueOf(k.getServiceTimes())) || "null".equals(String.valueOf(k.getServiceTimes())) ? StringUtils.toString(k.getAmount()) : String.valueOf(k.getServiceTimes()));
             }
 
             if (k.getPlatformKindCode().equals(KindCode.TY3.getCode())) {
@@ -567,7 +567,7 @@ public class PremiumRequest {
                 }
                 prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
                 prptitemkind.setMainKindFlag("S");
-                prptitemkind.setQuantity(String.valueOf(k.getServiceTimes()));
+                prptitemkind.setQuantity(StringUtils.isEmpty(String.valueOf(k.getServiceTimes())) || "null".equals(String.valueOf(k.getServiceTimes())) ? StringUtils.toString(k.getAmount()) : String.valueOf(k.getServiceTimes()));
             }
 
             if (k.getPlatformKindCode().equals(KindCode.TY4.getCode())) {
@@ -584,7 +584,7 @@ public class PremiumRequest {
                 }
                 prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
                 prptitemkind.setMainKindFlag("S");
-                prptitemkind.setQuantity(String.valueOf(k.getServiceTimes()));
+                prptitemkind.setQuantity(StringUtils.isEmpty(String.valueOf(k.getServiceTimes())) || "null".equals(String.valueOf(k.getServiceTimes())) ? StringUtils.toString(k.getAmount()) : String.valueOf(k.getServiceTimes()));
             }
 
             prptitemkindList.add(prptitemkind);