1.永城代码修改

2.国任代码修改

src/main/java/com/ydtech/constants/enums/dict/InsOrderStatusEnum.java

@@ -26,17 +26,16 @@ public enum InsOrderStatusEnum implements IBaseEnum {
 
     //人工核保退回状态，直至再次提交核保，状态修改为待核保
     TO_BACK("4", "核保退回", 6, 0),
-
-
     ;
 
 
-    private String code;
-    private String desc;
+    private final String code;
+
+    private final String desc;
     //排序
-    private Integer sort;
+    private final Integer sort;
     //状态  0 启用  1 不启用
-    private Integer status;
+    private final Integer status;
 
 
     public static InsOrderStatusEnum matchKey(String key) {

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

@@ -17,9 +17,11 @@ public class InsOrderStatusResp {
     @JsonProperty(value = "resultCode")
     @JSONField(name = "resultCode")
     private Integer resultCode;
+
     @JsonProperty(value = "resultMsg")
     @JSONField(name = "resultMsg")
     private String resultMsg;
+
     @JsonProperty(value = "data")
     @JSONField(name = "data")
     private List<DataDTO> data;

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

@@ -55,9 +55,9 @@ public class NonAutoInsOrderReq {
 
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
         //交强
-        RiskInfoVo ciRiskInfo = (RiskInfoVo) riskList.stream().filter(x -> x.getRiskCode().equals(InsuranceRisk.TRAFFIC.getCode())).findFirst().orElse(null);
+        RiskInfoVo ciRiskInfo = riskList.stream().filter(x -> x.getRiskCode().equals(InsuranceRisk.TRAFFIC.getCode())).findFirst().orElse(null);
         //商业
-        RiskInfoVo biRiskInfo = (RiskInfoVo) riskList.stream().filter(x -> x.getRiskCode().equals(InsuranceRisk.BUSINESS.getCode())).findFirst().orElse(null);
+        RiskInfoVo biRiskInfo = riskList.stream().filter(x -> x.getRiskCode().equals(InsuranceRisk.BUSINESS.getCode())).findFirst().orElse(null);
 
 
         NonAutoInsOrderReq req = new NonAutoInsOrderReq();

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

@@ -20,9 +20,11 @@ public class PolicyResp {
     @JsonProperty(value = "resultCode")
     @JSONField(name = "resultCode")
     private Integer resultCode;
+
     @JsonProperty(value = "resultMsg")
     @JSONField(name = "resultMsg")
     private String resultMsg;
+
     @JsonProperty(value = "data")
     @JSONField(name = "data")
     private String data;

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

@@ -254,6 +254,7 @@ public class ZijinRequestApiComponents {
             calculatePremiumResponse = responseMessageAbstractHandler.messageHandler(calculatePremiumRequest, calculatePremiumResponse, httpHeaders, modelQueryRequest, message, queryActualValueRequest, retry);
         }
 
+
         return calculatePremiumResponse;
     }
 

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

@@ -90,6 +90,7 @@ public class ZijinVehicleTypeErrorComponents extends ResponseMessageAbstractHand
         calculatePremiumRequest.modificationOfVehicleType(vehicleModelInfosDTO, actualValue);
         calculatePremiumRequest.setOrderId(modelQueryResponse.getOrderId());
         calculatePremiumRequest.setOrderNo(modelQueryResponse.getOrderNo());
+        calculatePremiumRequest.getVehicleInfo().setIsInvokeJingYou("0");
 
         List<CalculatePremiumRequest.ItemKindListDTO> itemKindListDTO = calculatePremiumRequest.getItemKindList().stream()
                 .filter(x -> x.getKindCode().equals(MotorVehicleInsuranceEnum.MVI_A.getCode())).collect(Collectors.toList());

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

@@ -28,7 +28,7 @@ import javax.validation.Valid;
  * @author: lig
  * @date: 2023-08-14
  */
-@Api(tags = "国任财险API方式对接")
+@Api(tags = "国任财险 API")
 @RestController
 @RequestMapping("/api/guoRen")
 public class GuoRenOrderApiController {
@@ -93,7 +93,6 @@ public class GuoRenOrderApiController {
     @PostMapping(value = "/callBack")
     public HttpResult callBackApi(HttpServletRequest request) {
         return guorenOrderApiService.callBackApi(request);
-
     }
 
     @ApiOperation(value = "电子保单")
@@ -102,22 +101,15 @@ public class GuoRenOrderApiController {
         return guorenOrderApiService.getPolicyPrintApi(policyPrintVo);
     }
 
-    /**
-     * 同步非车保险
-     */
     @ApiOperation(value = "同步非车保险")
     @PostMapping("/syncNonAutoIns")
     public HttpResult syncNonAutoIns() {
         //家用车驾乘意外险-山西版(02746425173001)
-//        String goodsCode = "02746425173001";
-        String goodsCode = "";
+        String goodsCode = "02746425173001";
         NonAutoInsResp.DataDTO dataDTO = guorenOrderApiService.gainNonAutoInsList(goodsCode);
         return HttpResult.ok(dataDTO);
     }
 
-    /**
-     * 同步驾意险
-     */
     @ApiOperation(value = "同步驾意险")
     @PostMapping("/syncAccidentInsure")
     public HttpResult syncAccidentInsure(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {

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

@@ -33,13 +33,11 @@ import java.util.Map;
  * @author: lig
  * @date: 2023年02月07日 0007
  */
-@Api(tags = "永诚API方式对接")
+@Api(tags = "永诚财险 API")
 @RestController
 @RequestMapping("/api/yongCheng")
 public class YongChengOrderApiController {
 
-    private static final Logger log = LoggerFactory.getLogger("alltrust");
-
     private final YongchengOrderApiService yongchengOrderApiService;
 
     private final EsmInsAttachInsureMapper esmInsAttachInsureMapper;

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

@@ -1,8 +1,6 @@
 package com.ydtech.modules.order.entity.api.guoren.constants;
 
-
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 @Getter
@@ -35,6 +33,8 @@ public enum PlatformInterfaceCode {
 
     API_IIIRBT00053("IIIRBT00053", "查询非车商品信息"),
 
+    API_IIIRBT00055("IIIRBT00055", "通过二维码扫描获取电子投保单签名"),
+
     API_IIIRBT00054("IIIRBT00054", "创建非车订单");
 
     private final String code;

src/main/java/com/ydtech/modules/order/entity/api/guoren/request/SignatureRequest.java

@@ -0,0 +1,27 @@
+package com.ydtech.modules.order.entity.api.guoren.request;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@NoArgsConstructor
+@Data
+public class SignatureRequest implements Serializable {
+
+    private static final long serialVersionUID = 4608198249081782285L;
+
+    /**
+     * 商业险投保单
+     */
+    @JsonProperty("proposalNoBI")
+    private String proposalNoBI;
+
+    /**
+     * 交强险投保单
+     */
+    @JsonProperty("proposalNoCI")
+    private String proposalNoCI;
+}

src/main/java/com/ydtech/modules/order/entity/api/guoren/response/SignatureResponse.java

@@ -0,0 +1,50 @@
+package com.ydtech.modules.order.entity.api.guoren.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@NoArgsConstructor
+@Data
+public class SignatureResponse implements Serializable {
+
+    private static final long serialVersionUID = 3187805835315714056L;
+    /**
+     * 车牌号
+     */
+    @JsonProperty("licenseNo")
+    private String licenseNo;
+    /**
+     * 二维码字符串
+     */
+    @JsonProperty("qrCode")
+    private String qrCode;
+    /**
+     * 返回状态吗
+     */
+    @JsonProperty("resultCode")
+    private String resultCode;
+    /**
+     * 投保人姓名
+     */
+    @JsonProperty("appliName")
+    private String appliName;
+    /**
+     * 返回信息
+     */
+    @JsonProperty("resultMessage")
+    private String resultMessage;
+    /**
+     * 总保费
+     */
+    @JsonProperty("sumPremium")
+    private Integer sumPremium;
+    /**
+     *
+     */
+    @JsonProperty("username")
+    private String username;
+
+}

src/main/java/com/ydtech/modules/order/service/GuorenOrderApiService.java

@@ -2,22 +2,20 @@ package com.ydtech.modules.order.service;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.guoren.CarModelResp;
-import com.ydtech.modules.ins.model.guoren.ChannelInfoDto;
 import com.ydtech.modules.ins.model.guoren.NonAutoInsResp;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
 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 javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 
 public interface GuorenOrderApiService {
 
 
     //=================API 方式=================
+
     /**
      * 获取渠道信息
      */
@@ -33,28 +31,26 @@ public interface GuorenOrderApiService {
      */
     HttpResult quoteApi(BaseQuoteVo<AccidentalDrivingVo> quoteVo);
 
+
     /**
-     * 3 核保
+     * 3 影像上传
      */
-    HttpResult auditApi(String orderno);
+    HttpResult uploadImageApi(String companyId);
 
     /**
-     * 保险公司订单信息
+     * 4 核保
      */
-    HttpResult insOrderInfo(String iacNo);
+    HttpResult auditApi(String orderno);
 
     /**
-     * 获取缴费地址
+     * 5 保险公司订单信息
      */
-    HttpResult pay(String orderno);
+    HttpResult insOrderInfo(String iacNo);
 
     /**
-     * 4 影像上传
-     *
-     * @param
-     * @return
+     * 6 获取缴费地址
      */
-    HttpResult uploadImageApi(String companyId);
+    HttpResult pay(String orderno);
 
     /**
      * 非车列表
@@ -80,5 +76,4 @@ public interface GuorenOrderApiService {
     HttpResult getPolicyPrintApi(PolicyPrintVo policyPrintVo);
 
 
-
 }

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

@@ -21,11 +21,9 @@ 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.service.EsmInsCompanyService;
-import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.guoren.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-import com.ydtech.modules.ins.service.InsApiLogService;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.components.gouren.GuorenRequestApiComponent;
@@ -33,6 +31,8 @@ import com.ydtech.modules.order.dao.InsTaskImagesMapper;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.api.guoren.constants.PlatformInterfaceCode;
+import com.ydtech.modules.order.entity.api.guoren.request.SignatureRequest;
+import com.ydtech.modules.order.entity.api.guoren.response.SignatureResponse;
 import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.GuorenOrderApiService;
@@ -48,7 +48,6 @@ import org.apache.commons.httpclient.methods.multipart.StringPart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -167,27 +166,33 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
         VinQueryResp.DataDTO vinQ = vinQuery(vinQueryReq, channelInfo);
         if (null == vinQ) return HttpResult.error("未找到匹配的车辆信息");
-        log.debug("vin码查询通过---");
 
         //  2、车价查询
         CarPriceResp.DataDTO carPriceResult = carPriceQuery(yaQuoteInfoVo, vinQ, channelInfo);
         if (null == carPriceResult) return HttpResult.error("车价获取失败");
-        log.debug("车价查询通过");
 
         // 3、保费计算
         PremiumResp.DataDTO premiumResult = premiumQuery(yaQuoteInfoVo, carPriceResult, vinQ);
         if (null == premiumResult) return HttpResult.error("保费计算失败");
-        log.debug("保费计算通过");
 
-        // 创建非车订单
-        AccidentalDrivingVo accidentalDrivingVo = quoteVo.getAccidentalDrivingVo();
-        if (ObjectUtils.isEmpty(accidentalDrivingVo)) {
-            nonAutoInsOrder(quoteVo.getAccidentalDrivingVo(), carPriceResult.getInputvo(), channelInfo);
-        }
+//        // 4、 创建非车订单
+//        AccidentalDrivingVo accidentalDrivingVo = quoteVo.getAccidentalDrivingVo();
+//        if (!ObjectUtils.isEmpty(accidentalDrivingVo)) {
+//            nonAutoInsOrder(yaQuoteInfoVo, quoteVo.getAccidentalDrivingVo(), carPriceResult.getInputvo(), channelInfo);
+//        }
 
         QuoteRespVo quoteRespVo = buildQuoteRespVo(order, premiumResult, yaQuoteInfoVo);
-        //8 生成订单
+        // 5、 生成订单
         InsAreaCompany iac = responseOrder(order, quoteRespVo, quoteVo);
+
+        // 6、 投保单保存
+        InsuranceSlipResp insuranceSlip = insuranceSlip(yaQuoteInfoVo, carPriceResult.getInputvo());
+        if (insuranceSlip.getResultCode() == 1) {
+            return HttpResult.error(insuranceSlip.getResultMsg());
+        }
+        iac.setJqapplyno(insuranceSlip.getData().getProposalNoDetailVo().getProposalNoCI());
+        iac.setSyapplyno(insuranceSlip.getData().getProposalNoDetailVo().getProposalNoBI());
+
         //生成订单扩展
         responseOrderExtend(iac, quoteRespVo, premiumResult, carPriceResult.getInputvo());
         insAreaCompanyService.save(iac);
@@ -222,7 +227,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         //2、核保
         SubmitAuditResp auditResp = submitAudit(iac, channelInfo);
 
-        //核保状态 0初始值/1通过/2不通过/3 无需核保 9待核保
+        //核保状态 0初始值/1通过/2不通过/3 无需核保 9 待核保
         String statusJq = auditResp.getData().get(0).getUnderWriteFlagCI();
         String statusSy = auditResp.getData().get(0).getUnderWriteFlagBI();
         if (StringUtils.isEmpty(statusJq) && StringUtils.isEmpty(statusSy))
@@ -264,30 +269,17 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             insAreaCompanyService.updateById(iac);
             return HttpResult.error(auditResp.getData().get(0).getMessage());
         }
-
-
         InsUtils.buildOrderStatus(order, iac);
-
-
-        iac.setJqappoint(""); //交强特别约定
-        iac.setSyappoint(""); //商业特别约定
-
         if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
-
             //获取签名地址
-            SignatureResp.DataDTO signature = signature(iac);
-            if (null == signature) log.error("核保操作：获取签名链接失败");
-            iac.setPaymentLink(signature.getElecapplyurl());
-
+            SignatureResponse signature = signature(iac);
+            iac.setPaymentLink(signature.getQrCode());
         } else {
             return HttpResult.error("核保操作失败，状态：" + InsOrderStatusEnum.matchKey(iac.getOrderstatus()).getDesc());
         }
         insAreaCompanyService.updateById(iac);
         insOrdersService.updateByOrderStatus(order.getOrderno(), order.getOrderstatus());
-
-
         log.debug("----------核保结束，订单号：{}---------", quoteOrderNo);
-
         return HttpResult.ok();
     }
 
@@ -301,19 +293,15 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         //子订单
         InsAreaCompany iac = insAreaCompanyService.getByIdIsExist(iacNo);
         // 获取协议配置信息
-        ChannelInfoDto channelInfo = gainChannelConfigInfo(iac.getAgreementId());
-
         InsOrders order = insOrdersService.getById(iac.getOrderno());
         InsOrderStatusResp iosr = insOrderStatus(iac);
 
         if (null != iosr && CollUtil.isNotEmpty(iosr.getData())) {
-
             InsOrderStatusResp.DataDTO jqDataDTO = iosr.getData().stream().filter(a -> a.getProposalNo().equals(iac.getJqapplyno())).findFirst().orElse(null);
             InsOrderStatusResp.DataDTO syDataDTO = iosr.getData().stream().filter(b -> b.getProposalNo().equals(iac.getSyapplyno())).findFirst().orElse(null);
 
             //待核保订单处理
             if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
-
                 //单交
                 boolean jqBoo = null != jqDataDTO && null == syDataDTO && jqDataDTO.getUnderwriteFlag().equals("1");
                 //单商
@@ -324,10 +312,13 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                 if (jqBoo || syBoo || jqSyBoo) {
                     iac.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                     //更新支付链接
-                    PayResp.DataDTO payResp = getPaid(iac, channelInfo);
-                    iac.setPaymentLink(payResp.getPayUrl());
-                    insAreaCompanyService.updateById(iac);
+                    SignatureResponse signature = signature(iac);
+                    iac.setPaymentLink(signature.getQrCode());
+
+                    insAreaCompanyService.updateCompanyAndOrders(iac);
                     return HttpResult.ok();
+                } else {
+                    return HttpResult.ok("核保状态未更新");
                 }
 
             }
@@ -341,12 +332,17 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                 iac.setSypolicyno(syDataDTO.getPolicyNo());
                 updateFlag = true;
             }
+
+            // 支付
             if (updateFlag) {
                 iac.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 order.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
-                insAreaCompanyService.updateById(iac);
-                insOrdersService.updateById(order);
+                insAreaCompanyService.updateCompanyAndOrders(iac);
+                return HttpResult.error("订单已支付，订单状态修改完成");
+            } else {
+                return HttpResult.error("订单还未支付哦");
             }
+
         }
 
 
@@ -380,24 +376,11 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
      */
     @Override
     public HttpResult uploadImageApi(String companyId) {
-
         InsAreaCompany iac = insAreaCompanyService.getByIdIsExist(companyId);
         // 获取协议配置信息
         ChannelInfoDto channelInfo = gainChannelConfigInfo(iac.getAgreementId());
-        InsOrders order = insOrdersService.getById(iac.getOrderno());
-        BaseQuoteInfoVo yaQuoteInfoVo = insOrdersComponents.getQuoteInfo(order.getOrderno());
-        /**
-         *  4、投保单保存
-         */
-        InsuranceSlipResp insuranceSlip = insuranceSlip(yaQuoteInfoVo, iac.getInsOrderNo());
-        if (insuranceSlip.getResultCode() == 1) {
-            return HttpResult.error(insuranceSlip.getResultMsg());
-        }
-        iac.setJqapplyno(insuranceSlip.getData().getProposalNoDetailVo().getProposalNoCI());
-        iac.setSyapplyno(insuranceSlip.getData().getProposalNoDetailVo().getProposalNoBI());
         //影像上传
         imageUpdate(iac, channelInfo);
-        insAreaCompanyService.updateById(iac);
         return HttpResult.ok();
     }
 
@@ -415,7 +398,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         formMap.put("fileGroup", "DZ");
 
         List<InsUploadImagesDto> insUploadImagesDtos = insTaskImagesMapper.getByOrderNoInsUploadImagesDtoList(iac.getOrderno());
-
         insUploadImagesDtos.forEach(a -> {
             try {
                 FilePart file1 = new FilePart("file", new File(a.getFilePath()));
@@ -460,15 +442,14 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     }
 
     /**
-     * 签名链接
+     * 32 通过二维码扫描获取电子投保单签名
      */
-    public SignatureResp.DataDTO signature(InsAreaCompany iac) {
+    public SignatureResponse signature(InsAreaCompany insAreaCompany) {
         //构造请求参数
-        Map<String, String> req = new HashMap<>();
-        req.put("proposalNo", StringUtils.isEmpty(iac.getJqapplyno()) ? iac.getSyapplyno() : iac.getJqapplyno());
-        SignatureResp resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00046, SignatureResp.class);
-        return resp.getData();
-
+        SignatureRequest signatureRequest = new SignatureRequest();
+        signatureRequest.setProposalNoCI(insAreaCompany.getJqapplyno());
+        signatureRequest.setProposalNoCI(insAreaCompany.getSyapplyno());
+        return guorenRequestApiComponent.request(signatureRequest, PlatformInterfaceCode.API_IIIRBT00055, SignatureResponse.class);
     }
 
     /**
@@ -500,7 +481,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             //交强险标志
             String ciFlag = properties.getPolicyFlagUrl() + policyResp.getData();
             //交强险电子保单
-            String ciPolicy =properties.getPolicyUrl() + policyResp.getData();
+            String ciPolicy = properties.getPolicyUrl() + policyResp.getData();
             String jqFlagUrl = gainCarInsPolicy(ciFlag, "1", order.getLicenseno());
             String jqUrl = gainCarInsPolicy(ciPolicy, "2", order.getLicenseno());
             m.put("jqFlagUrl", jqFlagUrl);
@@ -564,14 +545,12 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
             //删除已经存在的数据
             if (CollUtil.isNotEmpty(eiaiList)) {
-
                 List<String> ids = new ArrayList<>();
                 eiaiList.forEach(i -> ids.add(i.getId()));
                 LambdaQueryWrapper<EsmInsAttachInsureDetails> lqwDetails = new LambdaQueryWrapper<>();
                 lqwDetails.in(EsmInsAttachInsureDetails::getAttachInsureId, ids);
                 //详情删除
                 esmInsAttachInsureDetailsMapper.delete(lqwDetails);
-
                 esmInsAttachInsureMapper.deleteBatchIds(ids);
             }
 
@@ -678,8 +657,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         insAreaCompany.setSyStartDate(quoteRespVo.getStartDateSy());
         insAreaCompany.setSyEndDate(quoteRespVo.getEndDateSy());
         return insAreaCompany;
-
-
     }
 
     /**
@@ -689,7 +666,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
      * @date: 2023-10-18
      */
     private void responseOrderExtend(InsAreaCompany iac, QuoteRespVo quoteRespVo, PremiumResp.DataDTO premiumResult, String carPriceUuid) {
-
         //交强保费 含税
         BigDecimal jqPremium = BigDecimal.valueOf(StringUtils.toDouble(premiumResult.getSumPremiumCI()));
         //商业保费 含税
@@ -701,20 +677,17 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         iac.setJqpremium(jqPremium);
         iac.setSypremium(syPremium);
         iac.setTaxamount(BigDecimal.valueOf(jq_falg ? quoteRespVo.getTaxAmount() : 0));
-//        iac.setScore(StringUtils.toString(premiumResult.getBirate().getBillcomeGroup()));
         StringBuffer sb = new StringBuffer();
         sb.append("出险信息，交强险：");
         if (CollUtil.isNotEmpty(premiumResult.getCiInsureDemandPay())) {
             sb.append(premiumResult.getCiInsureDemandPay().size());
         } else {
             sb.append("0");
-
         }
         //商业险出险次数
         iac.setAccidentStrInfo(sb.toString());
-        //@TODO 临时用保险公司订单号存放   投保单查询需要
+        //@TODO 临时用保险公司订单号存放 投保单查询需要
         iac.setInsOrderNo(carPriceUuid);
-
     }
 
     public static double add(double v1, double v2) {
@@ -752,7 +725,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         BigDecimal taxPremiumBig = BigDecimal.valueOf(StringUtils.toDouble(rd.getSumPayTax()));
         //保费合计
         BigDecimal sumPermium = jqPremiumBig.add(syPremiumBig).add(taxPremiumBig);
-
         List<QuoteKindRespVo> kindRespVoList = new ArrayList<>();
 
         QuoteRespVo quoteRespVo = new QuoteRespVo();
@@ -761,7 +733,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         quoteRespVo.setStartDateSy(rd.getBiStartDate());
         quoteRespVo.setEndDateSy(rd.getBiEndDate());
 
-
         rd.getItemVOList().forEach(a -> {
             //交强:0507,商业:0518
             if (a.getRiskCode().equals("0507")) {
@@ -906,7 +877,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             throw new SystemException(resp.getResultMsg() == null ? "未找到车辆信息" : resp.getResultMsg());
         }
         return resp.getData().get(0);
-
     }
 
 
@@ -955,16 +925,11 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                         confirmCarMuch = vehicleInfoList.get(0);
                     }
                 }
-
                 return carPriceQueryMuch(respMuch.getData().getInputvo(), confirmCarMuch, yaQuoteInfoVo.getCarInfo().getLicenseNo());
-
             }
-
         }
-
         return null;
 
-
     }
 
     /**
@@ -1110,8 +1075,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
      * @author: lig
      * @date: 2023-09-28
      */
-    public SubmitAuditResp nonAutoInsOrder(AccidentalDrivingVo accidentalDrivingVo, String carPriceUuid, ChannelInfoDto channelInfo) {
-        BaseQuoteInfoVo yaQuoteInfoVo = new BaseQuoteInfoVo();
+    public SubmitAuditResp nonAutoInsOrder(BaseQuoteInfoVo yaQuoteInfoVo, AccidentalDrivingVo accidentalDrivingVo, String carPriceUuid, ChannelInfoDto channelInfo) {
         VinQueryResp.DataDTO vinQ = new VinQueryResp.DataDTO();
         //构造请求参数
         NonAutoInsOrderReq req = NonAutoInsOrderReq.buildParam(yaQuoteInfoVo, vinQ, accidentalDrivingVo, channelInfo, carPriceUuid);
@@ -1147,35 +1111,27 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
                 req.getCi().getPrpTmain().setStartHour(StringUtils.toString(start.getHour()));
                 req.getCi().getPrpTmain().setEndHour(StringUtils.toString(start.getHour()));
-
                 req.getCi().getPrpTmain().setImmeValidStartDate(newStartDate);
                 req.getCi().getPrpTmain().setImmeValidEndDate(newStartDate);
                 req.getCi().getPrpTmain().setImmeValiFlag("1");
 
-//                req.getCi().getPrpTmain()
-
             } else {
                 LocalDateTime end = start.plusYears(1L).minusDays(1L);
                 newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
                 newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
 
-
             }
 
             req.getCi().getPrpTmain().setStartDate(newStartDate);
             req.getCi().getPrpTmain().setEndDate(newEndDate);
-
             req.getCi().getPrptitemkindList().get(0).setStartDate(newStartDate);
             req.getCi().getPrptitemkindList().get(0).setEndDate(newEndDate);
 
-
             System.err.println("国任新起：" + newStartDate);
             System.err.println("国任新止：" + newEndDate);
 
-
             return true;
 
-
         }
         return false;
 

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

@@ -426,11 +426,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 //调用python ocr
                 RecognitionRequest recognitionRequest = new RecognitionRequest();
 
-                if (!StringUtils.isNotEmpty(cCheckCodeJQ)) {
+                if (StringUtils.isNotEmpty(cCheckCodeJQ)) {
                     recognitionRequest.setJgImage(cCheckCodeJQ);
                 }
 
-                if (!StringUtils.isNotEmpty(cCheckCodeSY)) {
+                if (StringUtils.isNotEmpty(cCheckCodeSY)) {
                     recognitionRequest.setSyImage(cCheckCodeSY);
                 }
 
@@ -438,14 +438,15 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
                 m.getRequestLabel().getCondition().getVhl().setCBusType("2");
                 RecognitionResponse.Code data = recognition.getData();
+
                 //交强
-                if (!StringUtils.isNotEmpty(cCheckCodeJQ)) {
+                if (StringUtils.isNotEmpty(cCheckCodeJQ)) {
                     m.getRequestLabel().getCondition().getVhl().setCCheckCodeJQ(data.getJqImageCode());
                     m.getRequestLabel().getCondition().getVhl().setCQryCdeJQ(rr.getVhl().getCQryCdeJQ());
                 }
 
                 //商业
-                if (!StringUtils.isNotEmpty(cCheckCodeSY)) {
+                if (StringUtils.isNotEmpty(cCheckCodeSY)) {
                     m.getRequestLabel().getCondition().getVhl().setCCheckCodeSY(data.getSyImageCode());
                     m.getRequestLabel().getCondition().getVhl().setCQryCdeSY(rr.getVhl().getCQryCdeSY());
                 }