判断新能源车修改

src/main/java/com/ydtech/modules/ins/model/guoren/NonAutoInsResp.java

@@ -541,12 +541,12 @@ public class NonAutoInsResp {
             @JSONField(name = "technologyInd")
             private String technologyInd;
 
-            @ApiModelProperty("限购份数")
+            @ApiModelProperty("选购份数")
             @JsonProperty(value = "policyNum")
             @JSONField(name = "policyNum")
             private String policyNum;
 
-            @ApiModelProperty("选购份数")
+            @ApiModelProperty("限购份数")
             @JsonProperty(value = "appnum")
             @JSONField(name = "appnum")
             private String appnum;

src/main/java/com/ydtech/modules/ins/model/yc/ruote/CvrgListSY.java

@@ -69,7 +69,15 @@ public class CvrgListSY {
     }
 
 
-    public static CvrgListSY buildCvrgListSY(List<KindInfoVo> kindList, Vhl vhl) {
+    /**
+     * 组装商业险列表
+     *
+     * @param kindList  商业险险种
+     * @param vhl       永诚车型
+     * @param newEnergy 是否是新能源
+     * @return 永诚险种列表
+     */
+    public static CvrgListSY buildCvrgListSY(List<KindInfoVo> kindList, Vhl vhl, boolean newEnergy) {
         //乘客
         String passenger = StringUtils.toString(StringUtils.toInt(vhl.getNSeatNum()) - 1);
 
@@ -81,7 +89,7 @@ public class CvrgListSY {
         kindList.forEach(a -> {
             CvrgListSY.CvrgSY bean = new CvrgListSY.CvrgSY();
             String txt4 = (StringUtils.toDouble(a.getDeductibleRate(), 0) / 100) + "";
-            if ("32773002,32773003,32773004,".contains(vhl.getFuelType())) {
+            if (newEnergy) {
                 //新能源产品险别拼装（商业）
                 //第三者责任险
                 if (a.getKindCode().equals(InsurKind.B.getCode())) {
@@ -184,7 +192,7 @@ public class CvrgListSY {
 //                bean.setCResvTxt4(a.getDeductibleRate());
             }
 
-            if ("32773002,32773003,32773004,".contains(vhl.getFuelType())) {
+            if (newEnergy) {
                 //新能源产品险别拼装（商业）
                 if (InsurKind.TY1.getCode().equals(a.getKindCode())) {
                     bean.setCCvrgNo("030235");

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -222,7 +222,8 @@ public class Ruote {
          * 商业险险别
          * 代码：cvrgListSY/CvrgSY
          */
-        CvrgListSY cvrgListSY = CvrgListSY.buildCvrgListSY(yaQuoteInfoVo.getKindList(), vhl);
+
+        CvrgListSY cvrgListSY = CvrgListSY.buildCvrgListSY(yaQuoteInfoVo.getKindList(), vhl, carInfo.isNewEnergy());
         condition.setCvrgListSY(cvrgListSY);
 
         /**

src/main/java/com/ydtech/modules/order/entity/api/zhongmei/request/QuotedPriceRequest.java

@@ -109,7 +109,7 @@ public class QuotedPriceRequest extends BaseRequest {
             // 车辆信息
             this.insuredObject = new InsuredObjectDTO(carInfo, simpleStadarCarDTO);
             // 保险信息
-            this.contract = new ContractDTO().getContract(riskList, kindList, i - 1, simpleStadarCarDTO.getEnergyTypes());
+            this.contract = new ContractDTO().getContract(riskList, kindList, i - 1, carInfo.getEnergyType());
             // 客户信息
             this.customer = new CustomerDTO().getCustomers(ownerInfo, policyHolderInfo, insuredPersonInfo);
             // 驾意险

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

@@ -40,7 +40,6 @@ import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateTimeUtil;
 import com.ydtech.utils.baidu.FileUtil;
 import com.ydtech.utils.idgen.IdGenerate;
-import java.lang.String;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -201,11 +200,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                 return HttpResult.error("车辆与客户信息确认接口失败");
             }
 
-            String fuelType = odr1008Response.getResult().getVehicleInfo().getVehicleFuelType();
-            boolean isEnergy = false;
-            if ("D6,D8,D12,".contains(fuelType + ",")) {//纯电动 燃料电池 插电式混合动力 归属为新能源产品
-                isEnergy = true;
-            }
+            // 新能源车
+            boolean isEnergy = quoteInfoVo.getCarInfo().isNewEnergy();
 
             //查询车辆商业起保日期
             InsOrders insOrders = insOrdersService.getById(quoteInfoVo.getOrderNo());

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

@@ -142,10 +142,9 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 4. 报价
         CalculatePremiumRequest calculatePremiumRequest = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO,
                 queryActualValueResponse.getActualValue(), quoteVo, zjConfigureParameters, modelQueryResponse);
-        boolean isEnergy = false;
-        if ("D6,D8,D12,".contains(vehicleModelInfosDTO.getPowerTypeCode() + ",")) {//纯电动 燃料电池 插电式混合动力 归属为新能源产品
-            isEnergy = true;
-        }
+
+        boolean isEnergy = carInfo.isNewEnergy();
+
         String message = "";
         CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest,
                 httpHeaders, modelQueryRequest, message, queryActualValueRequest, true);