Merge remote-tracking branch 'origin/test'

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1949,8 +1949,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
             return;
         } else {
             //循环有效的规则列表，进行因子匹配，抛出匹配到的因子项
-            for (int i = 0; i < ptlAgreementUndwrtRulesList.size(); i++) {
-                PtlAgreementUndwrtRules undwrtRules = ptlAgreementUndwrtRulesList.get(i);
+            for (PtlAgreementUndwrtRules undwrtRules : ptlAgreementUndwrtRulesList) {
                 //获取处理后的待校验因子
                 Map<Integer, FeeFactorInfoDto> factorToBeVerified = getFactorToBeVerifiedForRules(undwrtRules);
                 //按规则拼接跟单信息

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

@@ -866,24 +866,29 @@ public class PremiumReq {
             private String taxDocumentDate;
 
             public PrpTcarshipTaxDTO(VehicleAndVesselTax vehicleAndVesselTax) {
-                TaxRelifFlag flag = Enum.valueOf(TaxRelifFlag.class, TaxRelifFlag.TITLE + vehicleAndVesselTax.getTaxRelifFlag());
+                RelifReason flag = Enum.valueOf(RelifReason.class, RelifReason.TITLE + vehicleAndVesselTax.getTaxRelifFlag());
                 this.taxRelifFlag = flag.getCode();
 
-                RelifReason reason = Enum.valueOf(RelifReason.class, RelifReason.TITLE + vehicleAndVesselTax.getRelifReason());
-                this.relifReason = reason.getCode();
-
-                switch (this.relifReason) {
-                    case "3":
-                        this.baseTaxation = BaseTaxation.BR_2.getCode();
-                        this.freeRate = vehicleAndVesselTax.getTaxRelief();
-                        break;
-                    case "2":
-                        this.baseTaxation = BaseTaxation.BR_3.getCode();
-                        break;
-                    default:
-                        break;
+                //返回空
+                if(!"".equals(vehicleAndVesselTax.getRelifReason())) {
+                    RelifReason reason = Enum.valueOf(RelifReason.class, RelifReason.TITLE + vehicleAndVesselTax.getRelifReason());
+                    this.relifReason = reason.getCode();
+
+                    switch (this.relifReason) {
+                        case "3":
+                            this.baseTaxation = BaseTaxation.BR_2.getCode();
+                            this.freeRate = vehicleAndVesselTax.getTaxRelief();
+                            break;
+                        case "2":
+                            this.baseTaxation = BaseTaxation.BR_3.getCode();
+                            break;
+                        default:
+                            break;
+                    }
                 }
 
+
+
                 this.paidFreeCertificate = vehicleAndVesselTax.getPaidFreeCertificate();
                 this.taxComName = vehicleAndVesselTax.getTaxComName();
                 this.taxComCode = vehicleAndVesselTax.getTaxComCode();

src/main/java/com/ydtech/modules/order/controller/HuaTaiOrderApiController.java

@@ -91,4 +91,4 @@ public class HuaTaiOrderApiController {
             return this.huaTaiOrderApiService.getPaymentUrl(companyId);
         }*/
 
-}
+}

src/main/java/com/ydtech/modules/order/entity/api/guoren/constants/RelifReason.java

@@ -16,10 +16,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum RelifReason {
 
-    RR_01("1", "正常缴税"),
-    RR_02("2", "免税"),
-    RR_03("3", "减税"),
-    RR_04("4", "已完税"),
+    RR_1("1", "正常缴税"),
+    RR_2("2", "免税"),
+    RR_3("3", "减税"),
+    RR_4("4", "已完税"),
     RR_6("6", "拒缴"),
     RR_8("8", "不征");
 

src/main/java/com/ydtech/modules/order/entity/api/zijin/request/CalculatePremiumRequest.java

@@ -916,7 +916,8 @@ public class CalculatePremiumRequest implements Serializable {
             CarKindCode carKindCode1 = Enum.valueOf(CarKindCode.class, CarKindCode.TITLE + carInfo.getCimodelclass());
             this.carKindCode = carKindCode1.getCode();
 
-            this.exhaustCapacity = vehicleModelInfosDTO.getExhaustCapacity();
+            this.exhaustCapacity = StringUtils.isNotEmpty(vehicleModelInfosDTO.getExhaustCapacity()) ?
+                    vehicleModelInfosDTO.getExhaustCapacity() : "0";
             this.oriCarKindName = carInfo.getCartype();
 
             this.platVehicleCode = vehicleModelInfosDTO.getPlatVehicleCode();