Merge branch 'test' into master-20240326

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

@@ -180,8 +180,6 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
         insFeeOrderNew.setId(IdGenerate.nextId());
         insFeeOrderNew.setCostsId(costsId);
-        insFeeOrderNew.setAgreementId(ptlAgreementProductCostsNew.getAgreementId());
-
 
         //存储部门id与用户id
         InsOrders order = insOrdersService.getById(insAreaCompany.getOrderno());
@@ -348,15 +346,15 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         //region 出口费用
 
         //交强出口手续费比例
-        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(), new BigDecimal(ptlAgreementProductCostsNew.getJqCostsExportProportion()),
                 insFeeOrderNew.getJqCostsProportion(), jqDeptRadio, retailRadio, taxRadio);
 
         //商业出口手续费比例
-        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), new BigDecimal(ptlAgreementProductCostsNew.getSyCostsExportProportion()),
                 insFeeOrderNew.getSyCostsProportion(), syDeptRadio, retailRadio, taxRadio);
 
         //非车出口手续费比例
-        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), new BigDecimal(ptlAgreementProductCostsNew.getNoCostsExportProportion()),
                 insFeeOrderNew.getNoCostsProportion(), noDeptRadio, retailRadio, taxRadio);
 
         //出口手续费用

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

@@ -156,9 +156,9 @@ public class InsDrivingIntentionInsuranceServiceImpl extends ServiceImpl<InsDriv
     public List<InsDrivingIntentionInsuranceSon> getInsDrivingIntentionInsuranceSon(String companyId, String drivingCodeId) {
         List<InsDrivingIntentionInsuranceSon> insDrivingIntentionInsuranceSons = sonMapper.selectList(new LambdaQueryWrapper<InsDrivingIntentionInsuranceSon>()
                 .eq(InsDrivingIntentionInsuranceSon::getCompanyId, companyId)
-                .eq(InsDrivingIntentionInsuranceSon::getCode, drivingCodeId)
+                .and(wrapper -> wrapper.eq(InsDrivingIntentionInsuranceSon::getCode, drivingCodeId)
                 .or()
-                .eq(InsDrivingIntentionInsuranceSon::getDrivingCodeId, drivingCodeId));
+                .eq(InsDrivingIntentionInsuranceSon::getDrivingCodeId, drivingCodeId)));
         return insDrivingIntentionInsuranceSons;
     }
 }