|
|
@@ -826,6 +826,7 @@ public class InsurePremiumRequest extends ChengTaiBaseRequest{
|
|
|
|
|
|
public TaxDTO(BaseQuoteInfoVo quoteInfoVo){
|
|
|
|
|
|
+ CustomerInfoVo ownerInfo = quoteInfoVo.getOwnerInfo();
|
|
|
VehicleAndVesselTax vehicleAndVesselTax = quoteInfoVo.getVehicleAndVesselTax();
|
|
|
TaxConditionCodeEnum taxConditionCodeEnum = Enum.valueOf(TaxConditionCodeEnum.class, "T_" + vehicleAndVesselTax.getTaxRelifFlag());
|
|
|
this.taxConditionCode = taxConditionCodeEnum.getCode();
|
|
|
@@ -837,8 +838,13 @@ public class InsurePremiumRequest extends ChengTaiBaseRequest{
|
|
|
}
|
|
|
}
|
|
|
this.calculateMode = "1";
|
|
|
- this.taxPayerIdentityNo = vehicleAndVesselTax.getIdentifyNumber();
|
|
|
- this.taxPayerIdentificationCode = vehicleAndVesselTax.getIdentifyNumber();
|
|
|
+ if(StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())){
|
|
|
+ this.taxPayerIdentityNo = vehicleAndVesselTax.getIdentifyNumber();
|
|
|
+ this.taxPayerIdentificationCode = vehicleAndVesselTax.getIdentifyNumber();
|
|
|
+ }else{
|
|
|
+ this.taxPayerIdentityNo = vehicleAndVesselTax.getOrganizationCode();
|
|
|
+ this.taxPayerIdentificationCode = vehicleAndVesselTax.getOrganizationCode();
|
|
|
+ }
|
|
|
this.taxPayerName = vehicleAndVesselTax.getTaxpayerName();
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
int year = calendar.get(Calendar.YEAR);
|