修改 国任财险新能源 报价返回

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

@@ -1217,19 +1217,19 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 //当机构层级为五级的时候，获取所有的机构费用比例
                 if (sysDeptTemp != null && "5".equals(sysDeptTemp.getComlevel())) {
                     //五级机构管理费用比例
-                    insFeeOrder.setFifthDeptProportion(new BigDecimal(sysDeptTemp.getManagementFeeFifth()));
+                    insFeeOrder.setFifthDeptProportion(BigDecimal.valueOf(sysDeptTemp.getManagementFeeFifth()));
                     insFeeOrder.setFifthDeptPremiums(getPremium(totalNoTaxPremium, insFeeOrder.getFifthDeptProportion()));
                     //四级机构管理费用比例
-                    insFeeOrder.setForthDeptProportion(new BigDecimal(sysDeptTemp.getManagementFeeForth()));
+                    insFeeOrder.setForthDeptProportion(BigDecimal.valueOf(sysDeptTemp.getManagementFeeForth()));
                     insFeeOrder.setForthDeptPremiums(getPremium(totalNoTaxPremium, insFeeOrder.getForthDeptProportion()));
                     //三级机构管理费用比例
-                    insFeeOrder.setThirdDeptProportion(new BigDecimal(sysDeptTemp.getManagementFeeThird()));
+                    insFeeOrder.setThirdDeptProportion(BigDecimal.valueOf(sysDeptTemp.getManagementFeeThird()));
                     insFeeOrder.setThirdDeptPremiums(getPremium(totalNoTaxPremium, insFeeOrder.getThirdDeptProportion()));
                     //二级机构管理费用比例
-                    insFeeOrder.setSecondDeptProportion(new BigDecimal(sysDeptTemp.getManagementFeeSecond()));
+                    insFeeOrder.setSecondDeptProportion(BigDecimal.valueOf(sysDeptTemp.getManagementFeeSecond()));
                     insFeeOrder.setSecondDeptPremiums(getPremium(totalNoTaxPremium, insFeeOrder.getSecondDeptProportion()));
                     //一级机构管理费用比例
-                    insFeeOrder.setFirstDeptProportion(new BigDecimal(sysDeptTemp.getManagementFee()));
+                    insFeeOrder.setFirstDeptProportion(BigDecimal.valueOf(sysDeptTemp.getManagementFee()));
                     insFeeOrder.setFirstDeptPremiums(getPremium(totalNoTaxPremium, insFeeOrder.getFirstDeptProportion()));
                     //取到第一层级时结束
                     break;

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

@@ -63,7 +63,7 @@ public class PremiumReq {
      * @date: 2023年08月14日 0014
      */
     @JsonIgnore
-    public static PremiumReq buildQuoteParam(BaseQuoteInfoVo yaQuoteInfoVo, CarPriceResp.DataDTO carPriceResult,
+    public static PremiumReq  buildQuoteParam(BaseQuoteInfoVo yaQuoteInfoVo, CarPriceResp.DataDTO carPriceResult,
                                              VinQueryResp.DataDTO vinQ, boolean isNoCar,
                                              List<GuoRenSpecialAgreementVo> specialAgreementVo) {
 

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

@@ -30,15 +30,13 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.alibaba.fastjson.JSON.parseObject;
-
 @Api(tags = "订单")
 @RequestMapping("/insurance/order")
 @RestController
 public class InsOrdersController extends BaseController {
 
     @Value("${upload.file.path}")
-    private  String uploadFilePath;
+    private String uploadFilePath;
 
     private final InsOrdersService insOrdersService;
 
@@ -97,7 +95,7 @@ public class InsOrdersController extends BaseController {
 
     @PostMapping("/orderExportExcel")
     @ApiOperation(value = "订单导出excel接口")
-    public HttpResult<String> orderExportExcel(@RequestBody InsOrdersExcelVo insOrdersExcelVo){
+    public HttpResult<String> orderExportExcel(@RequestBody InsOrdersExcelVo insOrdersExcelVo) {
         return this.insOrdersService.orderExportExcel(insOrdersExcelVo);
     }
 
@@ -124,9 +122,7 @@ public class InsOrdersController extends BaseController {
         InsOrders insOrders = this.insOrdersService.existOrder(quoteHistoryVo.getOrderNo());
 
         LambdaQueryWrapper<InsAreaCompany> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderNo()), InsAreaCompany::getOrderno, quoteHistoryVo.getOrderNo())
-                .eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderStatus()), InsAreaCompany::getOrderstatus, quoteHistoryVo.getOrderStatus())
-                .orderByDesc(InsAreaCompany::getCreatetime);
+        wrapper.eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderNo()), InsAreaCompany::getOrderno, quoteHistoryVo.getOrderNo()).eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderStatus()), InsAreaCompany::getOrderstatus, quoteHistoryVo.getOrderStatus()).orderByDesc(InsAreaCompany::getCreatetime);
         List<InsAreaCompany> insAreaCompanies = this.insAreaCompanyService.getBaseMapper().selectList(wrapper);
 
         List<InsAreaCompanyHistoryVo> collect = insAreaCompanies.stream().map(a -> {
@@ -145,17 +141,14 @@ public class InsOrdersController extends BaseController {
     @ApiOperation(value = "通过子订单查询订单信息")
     public HttpResult<OrderVo> getByCompanyId(@RequestSingleParam(value = "companyId") String companyId) {
         String userId = getUserId();
-        return this.insOrdersService.getByCompanyId(companyId,userId);
+        return this.insOrdersService.getByCompanyId(companyId, userId);
     }
 
     @PostMapping("/getAccidentalDriving")
     @ApiOperation(value = "获取驾意险")
     public HttpResult<List<InsAccidentalDriving>> getAccidentalDriving(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {
         LambdaQueryWrapper<InsAccidentalDriving> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(InsAccidentalDriving::getCompanyCode, accidentalDrivingVo.getCompanyCode())
-                .and(i -> i.eq(InsAccidentalDriving::getSeatNumMax, accidentalDrivingVo.getSeatNum())
-                        .or(j -> j.le(InsAccidentalDriving::getSeatNumMax, accidentalDrivingVo.getSeatNum())
-                                .ge(InsAccidentalDriving::getSeatNumMax, accidentalDrivingVo.getSeatNum())));
+        wrapper.eq(InsAccidentalDriving::getCompanyCode, accidentalDrivingVo.getCompanyCode()).and(i -> i.eq(InsAccidentalDriving::getSeatNumMax, accidentalDrivingVo.getSeatNum()).or(j -> j.le(InsAccidentalDriving::getSeatNumMax, accidentalDrivingVo.getSeatNum()).ge(InsAccidentalDriving::getSeatNumMax, accidentalDrivingVo.getSeatNum())));
         List<InsAccidentalDriving> insAccidentalDrivings = insAccidentalDrivingService.list(wrapper);
 
         if (insAccidentalDrivings.isEmpty()) {
@@ -169,17 +162,20 @@ public class InsOrdersController extends BaseController {
     public HttpResult<InsOrders> verifyOrders(@RequestBody VerifyOrdersVo verifyOrdersVo) {
         return insOrdersService.verifyOrders(verifyOrdersVo);
     }
+
     @PostMapping("/getPolicyInsuranceReport")
     @ApiOperation(value = "分页获取保单清单数据")
     public HttpResult<BasePageResult<PolicyInsuranceReportResVo>> getPolicyInsuranceReport(@RequestBody PolicyInsuranceReportReqVo policyInsuranceReportReqVo) {
         String userId = getUserId();
-        BasePageResult<PolicyInsuranceReportResVo> quoteResult = insOrdersService.getPolicyInsuranceReport(policyInsuranceReportReqVo,userId);
+        BasePageResult<PolicyInsuranceReportResVo> quoteResult = insOrdersService.getPolicyInsuranceReport(policyInsuranceReportReqVo,
+                userId);
         return HttpResult.ok("success", quoteResult);
     }
+
     @PostMapping("/exportPolicyInsuranceReport")
     @ApiOperation(value = "导出保单清单数据")
     public HttpResult<String> exportPolicyInsuranceReport(@RequestBody PolicyInsuranceReportReqVo policyInsuranceReportReqVo) {
         String userId = getUserId();
-        return insOrdersService.exportPolicyInsuranceReport(policyInsuranceReportReqVo,userId);
+        return insOrdersService.exportPolicyInsuranceReport(policyInsuranceReportReqVo, userId);
     }
 }

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

@@ -758,21 +758,21 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             kind.setAmount(dto.getAmount());
             kind.setCoveragePremium(dto.getPremium());
         }
-        if (dto.getKindCode().equals(InsurKindGuoRen.B.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.B.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.B_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.B.getCode());
             kind.setKindName(InsurKind.B.getDesc());
             kind.setAmount(dto.getAmount());
             kind.setCoveragePremium(dto.getPremium());
         }
-        if (dto.getKindCode().equals(InsurKindGuoRen.D3.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.D3.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.D3_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.D3.getCode());
             kind.setKindName(InsurKind.D3.getDesc());
             kind.setAmount(dto.getAmount());
             kind.setCoveragePremium(dto.getPremium());
         }
-        if (dto.getKindCode().equals(InsurKindGuoRen.D4.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.D4.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.D4_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.D4.getCode());
             kind.setKindName(InsurKind.D4.getDesc());
@@ -844,7 +844,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             kind.setAmount(dto.getAmount());
             kind.setCoveragePremium(dto.getPremium());
         }
-        if (dto.getKindCode().equals(InsurKindGuoRen.TY1_N.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.TY1.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.TY1_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.TY1.getCode());
             kind.setKindName(InsurKind.TY1.getDesc());
@@ -852,7 +852,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             kind.setCoveragePremium(dto.getPremium());
         }
 
-        if (dto.getKindCode().equals(InsurKindGuoRen.TY2_N.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.TY2.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.TY2_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.TY2.getCode());
             kind.setKindName(InsurKind.TY2.getDesc());
@@ -860,7 +860,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             kind.setCoveragePremium(dto.getPremium());
         }
 
-        if (dto.getKindCode().equals(InsurKindGuoRen.TY3_N.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.TY3.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.TY3_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.TY3.getCode());
             kind.setKindName(InsurKind.TY3.getDesc());
@@ -868,7 +868,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             kind.setCoveragePremium(dto.getPremium());
         }
 
-        if (dto.getKindCode().equals(InsurKindGuoRen.TY4_N.getCode())) {
+        if (dto.getKindCode().equals(InsurKindGuoRen.TY4.getCode()) || dto.getKindCode().equals(InsurKindGuoRen.TY4_N.getCode())) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(InsurKind.TY4.getCode());
             kind.setKindName(InsurKind.TY4.getDesc());