|
@@ -28,6 +28,7 @@ import lombok.Data;
|
|
|
import lombok.NoArgsConstructor;
|
|
import lombok.NoArgsConstructor;
|
|
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -130,7 +131,7 @@ public class CalculatePremiumRequest implements Serializable {
|
|
|
this.taxRelifInfo = new TaxRelifInfoDTO();
|
|
this.taxRelifInfo = new TaxRelifInfoDTO();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public void modificationOfVehicleType(ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO){
|
|
|
|
|
|
|
+ public void modificationOfVehicleType(ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO) {
|
|
|
this.vehicleInfo.modificationOfVehicleType(vehicleModelInfosDTO);
|
|
this.vehicleInfo.modificationOfVehicleType(vehicleModelInfosDTO);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -928,6 +929,12 @@ public class CalculatePremiumRequest implements Serializable {
|
|
|
@JsonProperty("quantity")
|
|
@JsonProperty("quantity")
|
|
|
private String quantity;
|
|
private String quantity;
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 每座保额/日赔偿金
|
|
|
|
|
+ */
|
|
|
|
|
+ @JsonProperty("unitAmount")
|
|
|
|
|
+ private String unitAmount;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 免赔率 绝对免赔率险必录 5,10,15,20(单位%)
|
|
* 免赔率 绝对免赔率险必录 5,10,15,20(单位%)
|
|
|
*/
|
|
*/
|
|
@@ -958,12 +965,14 @@ public class CalculatePremiumRequest implements Serializable {
|
|
|
// 司机
|
|
// 司机
|
|
|
if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getDriver(), code) >= 0) {
|
|
if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getDriver(), code) >= 0) {
|
|
|
itemKindListDTO.quantity = String.valueOf(1);
|
|
itemKindListDTO.quantity = String.valueOf(1);
|
|
|
|
|
+ itemKindListDTO.unitAmount = String.valueOf(kindInfoVo.getAmount());
|
|
|
itemKindListDTO.amount = String.valueOf(kindInfoVo.getAmount());
|
|
itemKindListDTO.amount = String.valueOf(kindInfoVo.getAmount());
|
|
|
}
|
|
}
|
|
|
// 乘客
|
|
// 乘客
|
|
|
else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getPassenger(), code) >= 0) {
|
|
else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getPassenger(), code) >= 0) {
|
|
|
itemKindListDTO.quantity = String.valueOf(quantity);
|
|
itemKindListDTO.quantity = String.valueOf(quantity);
|
|
|
- itemKindListDTO.amount = String.valueOf(kindInfoVo.getUnitAmount());
|
|
|
|
|
|
|
+ itemKindListDTO.unitAmount = String.valueOf(kindInfoVo.getUnitAmount());
|
|
|
|
|
+ itemKindListDTO.amount = BigDecimal.valueOf(kindInfoVo.getUnitAmount()).multiply(BigDecimal.valueOf(quantity)).toString();
|
|
|
}
|
|
}
|
|
|
// 绝对免赔
|
|
// 绝对免赔
|
|
|
else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getAbsoluteDeductible(), code) >= 0) {
|
|
else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getAbsoluteDeductible(), code) >= 0) {
|