1.紫金财险修改

2.增加人员信息，性别和年龄

src/main/java/com/ydtech/modules/ins/controller/InsGuoRenController.java

@@ -1,43 +1,23 @@
 package com.ydtech.modules.ins.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.esm.dao.EsmInsAttachInsureDetailsMapper;
-import com.ydtech.modules.esm.dao.EsmInsAttachInsureMapper;
-import com.ydtech.modules.esm.model.EsmInsAttachInsure;
-import com.ydtech.modules.esm.model.EsmInsAttachInsureDetails;
-import com.ydtech.modules.esm.service.InsTaskImageService;
-import com.ydtech.modules.ins.model.guoRen.ChannelInfoDto;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.ya.CarModel_Req;
-import com.ydtech.modules.ins.model.yc.CallBackRequest;
-import com.ydtech.modules.ins.service.InsAlltrustApiService;
 import com.ydtech.modules.ins.service.InsGuoRenApiService;
-import com.ydtech.modules.order.components.InsOrdersComponents;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 国任财险 API对接
@@ -64,7 +44,6 @@ public class InsGuoRenController {
     })
     @GetMapping("/channelInfo/{thirdCode}")
     public HttpResult channelInfo(@PathVariable String thirdCode) {
-
         return insGuoRenApiService.gainChannelInfo(thirdCode);
     }
 
@@ -89,7 +68,6 @@ public class InsGuoRenController {
 //        return insGuoRenApiService.carPrice(quoteVo);
 //    }
 
-
     @ApiResponses({
             @ApiResponse(code = 500, message = "出现异常"),
             @ApiResponse(code = 101, message = "转保单"),
@@ -98,7 +76,6 @@ public class InsGuoRenController {
     @ApiOperation(value = "报价")
     @PostMapping("/quote")
     public HttpResult quoteApi(@RequestBody BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
-//        BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo());
         return insGuoRenApiService.quoteApi(quoteVo);
     }
 
@@ -118,7 +95,6 @@ public class InsGuoRenController {
 
     @ApiOperation(value = "核保")
     @PostMapping("/audit")
-//    @MethodLogAnnotation(title = "永诚API方式 - 核保")
     public HttpResult auditApi(@RequestSingleParam(value = "companyId") String companyId) {
         return insGuoRenApiService.auditApi(companyId);
     }
@@ -129,6 +105,7 @@ public class InsGuoRenController {
     public HttpResult updateOrderInfoByIns(@RequestSingleParam(value = "companyId") String companyId) {
         return insGuoRenApiService.insOrderInfo(companyId);
     }
+
     @ApiOperation(value = "回调通知")
     @PostMapping(value = "/callBack")
     public HttpResult callBackApi(HttpServletRequest request) {
@@ -139,32 +116,16 @@ public class InsGuoRenController {
     @ApiOperation(value = "电子保单")
     @PostMapping("/policyPrint")
     public HttpResult getPolicyPrintApi(@RequestBody PolicyPrintVo policyPrintVo) {
-//    public HttpResult getPolicyPrintApi(String companyId,String type) {
         return insGuoRenApiService.getPolicyPrintApi(policyPrintVo);
     }
-//
-//    /**
-//     * 获得意外险列表
-//     */
-//    @ApiOperation(value = "永诚API方式 -意外险列表")
-//    @PostMapping("/gainAccidentList")
-//    public HttpResult<List<EsmInsAttachInsure>> gainAccidentList(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {
-//
-//        LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
-//        lqw.eq(EsmInsAttachInsure::getCompanyId, accidentalDrivingVo.getCompanyCode());
-//        lqw.eq(accidentalDrivingVo.getSeatNum() > 0, EsmInsAttachInsure::getSeating, accidentalDrivingVo.getSeatNum());
-//        List<EsmInsAttachInsure> eiaiList = esmInsAttachInsureMapper.selectList(lqw);
-//        return HttpResult.ok(eiaiList);
-//
-//    }
-//
+
+
     /**
      * 同步非车保险
      */
     @ApiOperation(value = " 同步非车保险")
     @PostMapping("/syncNonAutoIns")
     public HttpResult syncNonAutoIns() {
-
         //家用车驾乘意外险-山西版(02746425173001)
         String goodsCode = "02746425173001";
         return HttpResult.ok(insGuoRenApiService.gainNonAutoInsList(goodsCode));
@@ -182,23 +143,5 @@ public class InsGuoRenController {
         return insGuoRenApiService.syncAccidentInsure(accidentalDrivingVo);
     }
 
-//
-//    /**
-//     * 获取地区 通过身份证地址
-//     */
-//    @ApiOperation(value = "永诚API方式 - 身份证地址获取地区")
-//    @PostMapping("/addressGainArea")
-//    public HttpResult syncAccidentInsure(String address) {
-//        Map<String, String> ownerMap = insYongchengApiService.gainRegionCode(address);
-//
-//        if (null == ownerMap) {
-//            throw new SystemException("地区获取失败，请检查参数是否正确。");
-//
-//        }
-//
-//        return HttpResult.ok(ownerMap);
-//    }
-
-
 
 }

src/main/java/com/ydtech/modules/ins/model/vo/CustomerInfoVo.java

@@ -1,9 +1,5 @@
 package com.ydtech.modules.ins.model.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.ydtech.validation.annotation.CheckDateTime;
 import com.ydtech.validation.annotation.CheckIdentifyNumber;
 import io.swagger.annotations.ApiModel;
@@ -43,6 +39,12 @@ public class CustomerInfoVo {
     @ApiModelProperty("地址")
     private String addr;
 
+    @ApiModelProperty("年龄")
+    private String age;
+
+    @ApiModelProperty("性别")
+    private String gender;
+
     @ApiModelProperty("邮箱")
     private String email;
 

src/main/java/com/ydtech/modules/ins/service/impl/InsGuoRenApiServiceImpl.java

@@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ydtech.components.InsAlltrustRequestApiComponents;
 import com.ydtech.constants.InsuranceEnum;
-import com.ydtech.constants.enums.*;
+import com.ydtech.constants.enums.InsQuoteFlow;
+import com.ydtech.constants.enums.InsurKind;
+import com.ydtech.constants.enums.InsurKindGuoRen;
+import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.AttachInsureEnum;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.WhetherEnum;
@@ -24,34 +27,27 @@ import com.ydtech.modules.esm.dao.EsmInsAttachInsureMapper;
 import com.ydtech.modules.esm.model.EsmInsAttachInsure;
 import com.ydtech.modules.esm.model.EsmInsAttachInsureDetails;
 import com.ydtech.modules.esm.model.EsmInsCompany;
-import com.ydtech.modules.esm.model.InsTaskImage;
-import com.ydtech.modules.esm.service.*;
+import com.ydtech.modules.esm.service.EsmAgreementProdService;
+import com.ydtech.modules.esm.service.EsmAgreementService;
+import com.ydtech.modules.esm.service.EsmInsCompanyService;
+import com.ydtech.modules.esm.service.EsmRetailService;
 import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.InsApiLog;
 import com.ydtech.modules.ins.model.guoRen.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-import com.ydtech.modules.ins.model.yc.*;
-import com.ydtech.modules.ins.model.yc.accident.Accident;
-import com.ydtech.modules.ins.model.yc.accident.response.ResponseYwCvrg;
-import com.ydtech.modules.ins.model.yc.audit.Audit;
-import com.ydtech.modules.ins.model.yc.audit.response.AuditResponse;
-import com.ydtech.modules.ins.model.yc.callbackAnOrder.CallbackAnOrder;
-import com.ydtech.modules.ins.model.yc.imageUp.ImageUp;
-import com.ydtech.modules.ins.model.yc.imageUp.response.ImageUpResponse;
+import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
+import com.ydtech.modules.ins.model.yc.InsAlltrustRegion;
+import com.ydtech.modules.ins.model.yc.YcBuildData;
+import com.ydtech.modules.ins.model.yc.YcConfigureParameters;
 import com.ydtech.modules.ins.model.yc.modelsQuery.ModelsQueryResponse;
 import com.ydtech.modules.ins.model.yc.modelsQuery.ModelsQueryXml;
-import com.ydtech.modules.ins.model.yc.pay.Pay;
 import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
-import com.ydtech.modules.ins.model.yc.pay.response.PayResponse;
-import com.ydtech.modules.ins.model.yc.policy.Policy;
-import com.ydtech.modules.ins.model.yc.policy.response.PolicyResponse;
 import com.ydtech.modules.ins.model.yc.ruote.Applicant;
 import com.ydtech.modules.ins.model.yc.ruote.Insured;
 import com.ydtech.modules.ins.model.yc.ruote.Ruote;
 import com.ydtech.modules.ins.model.yc.ruote.Vhlowner;
-import com.ydtech.modules.ins.model.yc.ruote.response.RuoteResponse;
 import com.ydtech.modules.ins.service.InsApiLogService;
 import com.ydtech.modules.ins.service.InsGuoRenApiService;
 import com.ydtech.modules.ins.service.InsTaskHistoryService;
@@ -69,8 +65,6 @@ import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.*;
 import com.ydtech.utils.baidu.FileUtil;
 import lombok.Data;
-import net.bytebuddy.implementation.bytecode.Throw;
-import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.Part;
 import org.apache.commons.httpclient.methods.multipart.StringPart;
@@ -86,8 +80,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -104,12 +96,13 @@ public class InsGuoRenApiServiceImpl implements InsGuoRenApiService {
 
     @Value("${guoRen.baseUrl}")
     private String baseUrl;
+
     @Value("${guoRen.uploadUrl}")
     private String uploadUrl;
+
     @Value("${guoRen.redirectUrl}")
     private String redirectUrl;
 
-
     @Value("${upload.file.path}")
     private String uploadFilePath;
     @Value("${upload.file.url}")
@@ -117,72 +110,44 @@ public class InsGuoRenApiServiceImpl implements InsGuoRenApiService {
     @Value("${api.url}")
     private String apiUrl;
 
-
     @Autowired
     private InsAlltrustRequestApiComponents apiComponents;
 
     @Autowired
     private InsAlltrustRegionMapper insAlltrustRegionMapper;
+
     @Autowired
     private InsOrdersComponents insOrdersComponents;
 
-
-    private AuthorityDataXml authorityDataXml = null;
-
-
     private ObjectMapper xmlMapper = null;
 
-
-    @Autowired
-    private YcBuildData ycBuildData;
-    @Autowired
-    private SysUserService sysUserService;
-    @Autowired
-    private SysDeptService sysDeptService;
-    @Autowired
-    private EsmRetailService esmRetailService;
-    @Autowired
-    private EsmAgreementService esmAgreementService;
-    @Autowired
-    private EsmAgreementProdService esmAgreementProdService;
-    //    @Autowired
-//    private EsmUserInternalService esmUserInternalService;
-    @Autowired
-    private InsTaskHistoryService insTaskHistoryService;
     @Autowired
     private InsAreaCompanyService insAreaCompanyService;
+
     @Autowired
     private InsOrdersService insOrdersService;
-    //    @Autowired
-//    private InsTaskImageService insTaskImageService;
-    @Autowired
-    private InsTaskImagesService insTaskImageService;
+
     @Autowired
     private EsmInsAttachInsureMapper esmInsAttachInsureMapper;
+
     @Autowired
     private EsmInsAttachInsureDetailsMapper esmInsAttachInsureDetailsMapper;
+
     @Autowired
     private EsmInsCompanyService esmInsCompanyService;
 
     @Autowired
     InsApiLogService insApiLogService;
+
     @Autowired
     ConfigureParametersComponents configureParametersComponents;
+
     @Autowired
     InsTaskImagesMapper insTaskImagesMapper;
 
-//    private ChannelInfoResp channelInfo = null;
-
     private static ChannelInfoDto channelInfo = null;
 
-//    static {
-//        ChannelInfoResp.DataDTO.PrptmainDTO channel = new ChannelInfoResp.DataDTO.PrptmainDTO();
-//        channel.setComCode("160700A8");
-//        //userCode 取这个
-//        channel.setHandlerCode("151315A0");
-//
-//        channelInfo = channel;
-//    }
+
 
 
     //

src/main/java/com/ydtech/modules/order/components/zijin/ZijinRequestApiComponents.java

@@ -238,6 +238,13 @@ public class ZijinRequestApiComponents {
      */
     public CalculatePremiumResponse calculatePremium(CalculatePremiumRequest calculatePremiumRequest, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message,QueryActualValueRequest queryActualValueRequest ) {
         CalculatePremiumResponse calculatePremiumResponse = requestQuotation(RequestUrl.CALCULATE_PREMIUM, calculatePremiumRequest, CalculatePremiumResponse.class, httpHeaders);
+        // 清空转保业务码
+        CalculatePremiumRequest.BaseInfoDTO baseInfo = calculatePremiumRequest.getBaseInfo();
+        baseInfo.setAnswerCI(null);
+        baseInfo.setAnswer(null);
+        baseInfo.setDemandNoCI(null);
+        baseInfo.setDemandNo(null);
+
         // 通过状态码获取处理器处理
         ResponseMessageAbstractHandler responseMessageAbstractHandler = handlerMap.get(ResponseMessageAbstractHandler.CALCULATE_PREMIUM_COMPONENTS + calculatePremiumResponse.getRtnCode());
         if (!ObjectUtils.isEmpty(responseMessageAbstractHandler)) {