Procházet zdrojové kódy

Merge remote-tracking branch 'origin/test' into test

Qchen před 2 roky
rodič
revize
bb788a6a06

+ 17 - 8
src/main/java/com/ydtech/modules/order/entity/api/zijin/request/CalculatePremiumRequest.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdcardUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsuranceRisk;
+import com.ydtech.constants.enums.dict.insurance.EnergyType;
 import com.ydtech.constants.enums.dict.insurance.VehicleType;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
@@ -932,17 +933,25 @@ public class CalculatePremiumRequest implements Serializable {
             this.isInvokeJingYou = "1";
 
             //纯电动 燃料电池 插电式混合动力 归属为新能源产品
-            if ("D6,D8,D12,".contains(vehicleModelInfosDTO.getPowerTypeCode() + ",")) {
+            if (EnergyType.isNewEnergy(carInfo.getEnergyType())) {
                 this.newEnergyFlag = "1";
                 this.pureRange = "";
-                if ("D6".equals(vehicleModelInfosDTO.getPowerTypeCode())) {
-                    this.fuelType = "1";
-                } else if ("D8".equals(vehicleModelInfosDTO.getPowerTypeCode())) {
-                    this.fuelType = "2";
-                } else {
-                    this.fuelType = "3";
-                }
+                this.fuelType = carInfo.getEnergyType();
+            }else{
+                this.newEnergyFlag = "0";
+                this.pureRange = "";
             }
+//            if ("D6,D8,D12,".contains(vehicleModelInfosDTO.getPowerTypeCode() + ",")) {
+//                this.newEnergyFlag = "1";
+//                this.pureRange = "";
+//                if ("D6".equals(vehicleModelInfosDTO.getPowerTypeCode())) {
+//                    this.fuelType = "1";
+//                } else if ("D8".equals(vehicleModelInfosDTO.getPowerTypeCode())) {
+//                    this.fuelType = "2";
+//                } else {
+//                    this.fuelType = "3";
+//                }
+//            }
         }
 
         public String getCarKindDetailId(int seatCount) {