永诚修改重复投保

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.ydtech.config.properties.YongchengApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
-import com.ydtech.constants.SysConstants;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.AttachInsureEnum;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
@@ -24,7 +23,6 @@ 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.fee.service.FeeRuleSchemeService;
-import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.dto.CarInsDateDto;
 import com.ydtech.modules.ins.model.dto.CarInsPolicyDto;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
@@ -32,7 +30,6 @@ import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.yc.CallBackRequest;
-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.accident.Accident;
@@ -74,8 +71,6 @@ import com.ydtech.modules.order.service.YongchengOrderApiService;
 import com.ydtech.modules.order.utils.InsuranceLog;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.DateTimeUtil;
-import com.ydtech.utils.IDCardUtils;
-import com.ydtech.utils.IPUtil;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import lombok.RequiredArgsConstructor;
@@ -88,7 +83,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -272,10 +266,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
             if (errorMsg.contains("机动车综合商业保险")) {
                 appSYFlag = true;
-            }
-
-            if (errorMsg.contains("机动车交通事故强制险")) {
-                appSYFlag = true;
+            } else if (errorMsg.contains("机动车交通事故强制险")) {
+                cAppJqFlag = true;
             }
 
             //处理返回信息
@@ -283,14 +275,14 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             boo = ciRepetitionInsure(rr, m, requestInfoList, cAppJqFlag);
             if (!boo) {
                 InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> {} - 交强险重复投保处理", vinNo);
-                rr = this.getResponse(m, vinNo, requestInfoList);
+                return this.getResponse(m, vinNo, requestInfoList);
             }
 
             //1、商业险重复投保处理
             boo = commerceRepetitionInsure(rr, m, requestInfoList, appSYFlag);
             if (!boo) {
                 InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> {} - 商业险重复投保处理", vinNo);
-                rr = this.getResponse(m, vinNo, requestInfoList);
+                return this.getResponse(m, vinNo, requestInfoList);
             }
 
         }
@@ -299,21 +291,21 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         boo = reinsurance(rr, m);
         if (!boo) {
             InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> {} - 转保处理", vinNo);
-            rr = this.getResponse(m, vinNo, requestInfoList);
+            return this.getResponse(m, vinNo, requestInfoList);
         }
 
         //3、商业险日期处理
         boo = biRepetitionInsure(rr, m, requestInfoList);
         if (!boo) {
             InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> {} - 商业险日期处理", vinNo);
-            rr = this.getResponse(m, vinNo, requestInfoList);
+            return this.getResponse(m, vinNo, requestInfoList);
         }
 
         // 转保验证码
         boo = reinsuranceCodeError(rr, m);
         if (!boo) {
             InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> {} - 转保处理", vinNo);
-            rr = this.getResponse(m, vinNo, requestInfoList);
+            return this.getResponse(m, vinNo, requestInfoList);
         }
         return rr;
     }
@@ -780,7 +772,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                         iac.setCrossInsurance(objects);
                     }
 
-                    if(StringUtils.isNotEmpty(param.getPay_date())){
+                    if (StringUtils.isNotEmpty(param.getPay_date())) {
                         iac.setPayDate(LocalDateTime.parse(param.getPay_date(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     }