参数修改

authentication/src/main/java/com/jzg/controller/AppAuthController.java

@@ -123,20 +123,20 @@ public class AppAuthController {
 //        if (ObjectUtil.isNotEmpty(sysUser)){
 //            throw new SystemException("手机号已注册，请使用密码登录");
 //        }
-        RBucket<Object> bucket = redissonClient.getBucket(RedisKeyConstants.SMS_CODE_KEY + smsCodeLogin.getMobile());
-        if (Objects.isNull(bucket)){
-            throw new SystemException("短信验证码已过期");
-        }
-        if (!bucket.isExists()){
-            throw new SystemException("短信验证码已过期");
-        }
-        String smsCode = bucket.get().toString();
-        if (Objects.isNull(smsCode)){
-            throw new SystemException("短信验证码已过期");
-        }
-        if (!Objects.equals(smsCodeLogin.getSmsCode(), smsCode)){
-            throw new SystemException("短信验证码错误");
-        }
+//        RBucket<Object> bucket = redissonClient.getBucket(RedisKeyConstants.SMS_CODE_KEY + smsCodeLogin.getMobile());
+//        if (Objects.isNull(bucket)){
+//            throw new SystemException("短信验证码已过期");
+//        }
+//        if (!bucket.isExists()){
+//            throw new SystemException("短信验证码已过期");
+//        }
+//        String smsCode = bucket.get().toString();
+//        if (Objects.isNull(smsCode)){
+//            throw new SystemException("短信验证码已过期");
+//        }
+//        if (!Objects.equals(smsCodeLogin.getSmsCode(), smsCode)){
+//            throw new SystemException("短信验证码错误");
+//        }
         if(ObjectUtil.isNull(sysUser)){
             register(smsCodeLogin);
         }

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -24,6 +24,7 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9001");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.106:8001");
         // 允许的方法
         corsConfiguration.addAllowedMethod("*");
         // 允许的头信息

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/service/impl/BoHaiApiRequestImpl.java

@@ -152,18 +152,19 @@ public class BoHaiApiRequestImpl implements BoHaiApiRequest {
         List<AccidentalDrivingVo> accidentVos = quoteVo.getAccidentalDrivings();//驾意险待处理
         QuotationRequest quotationRequest = new QuotationRequest(parameters, quoteVo, currentValue, orderNo, accidentVos, discount);
 
-        //报价接口调用
+        //报价接口递归调用
         QuotationResponse quotationResponse = repeatQuote(quotationRequest,parameters.getSysSourceCode(),quoteVo.getKindInfoVo(),null);
         //处理报价失败
         if(!ResponseCode.R_Z00001.getCode().equals(quotationResponse.getResponseCode())) {
             return BoHaiApiQuoteResultsVoBuild.buildQuoteFailResultsVo(quotationResponse);
+        } else {
+            boHaiApiOrderService.save(quoteVo, quotationResponse, generateOrderNoResponse);
+            return BoHaiApiQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, quotationResponse);
         }
-        boHaiApiOrderService.save(quoteVo, quotationResponse, generateOrderNoResponse);
-        return BoHaiApiQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, quotationResponse);
     }
 
     @Override
-    public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) {
+    public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) throws Exception {
         OrderBase order = underwritingVo.getOrder();
         //获取配置信息
         BoHaiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(BoHaiConfigureParameters.class, order.getAttributionInformationVo().getConfigInfo());
@@ -173,12 +174,8 @@ public class BoHaiApiRequestImpl implements BoHaiApiRequest {
         UnderwritingRequest underwritingRequest = new UnderwritingRequest(parameters, apiOrder.getOrderNo());
         UnderwritingResponse underwritingResponse;
         UnderwritingResultsVo underwritingResultsVo = new UnderwritingResultsVo();
-        try {
-            underwritingResponse = boHaiRequestApiComponent.underwriting(underwritingRequest, parameters.getSysSourceCode());
+        underwritingResponse = boHaiRequestApiComponent.underwriting(underwritingRequest, parameters.getSysSourceCode());
 
-        } catch (Exception e) {
-            throw new SystemException(e.getMessage());
-        }
         return underwritingResultsVo;
     }
 

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/InsurePremiumRequest.java

@@ -1213,7 +1213,7 @@ public class InsurePremiumRequest extends BaseRequest {
             public TaxDTO(QuoteVo quoteVo){
 
                 CustomerInfoVo ownerInfo = quoteVo.getOwnersInfo();
-                VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTax();
+                VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTaxVo();
                 TaxConditionCodeEnum taxConditionCodeEnum = Enum.valueOf(TaxConditionCodeEnum.class, "T_" + vehicleAndVesselTax.getTaxRelifFlag());
                 this.taxConditionCode = taxConditionCodeEnum.getCode();
                 RiskInfoVo ciRiskInfoVo = quoteVo.getCiRiskInfoVo();

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/crawler/service/ChengTaiCrawlerRequestService.java

@@ -585,7 +585,7 @@ public class ChengTaiCrawlerRequestService implements QuotationApiBaseService {
 
     private ChengTaiCiContract buildChengTaiCiContract(QuoteVo quoteVo, ChengTaiCarModel chengTaiCarModel) {
         RiskInfoVo ciRiskInfoVo = quoteVo.getCiRiskInfoVo();
-        VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTax();
+        VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTaxVo();
 
         ChengTaiContractMain contractMain = new ChengTaiContractMain();
         contractMain.setCurrency("CNY");

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteEchoVo.java

@@ -116,7 +116,7 @@ public class QuoteEchoVo extends QuoteVo {
 
         this.setOtherInfo(insOrdersVo.getOtherInfo());
         this.setAccidentalDrivings(insOrdersVo.getAccidentalDrivings());
-        this.setVehicleAndVesselTax(insOrdersVo.getVehicleAndVesselTax());
+        this.setVehicleAndVesselTaxVo(insOrdersVo.getVehicleAndVesselTaxVo());
 
         //费用处理
         this.costs = insOrdersVo.getInsOrdersCosts();

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteVo.java

@@ -81,7 +81,7 @@ public class QuoteVo implements Serializable {
      * 车船税信息
      */
     @Schema(description = "车船税信息")
-    private VehicleAndVesselTaxVo vehicleAndVesselTax;
+    private VehicleAndVesselTaxVo vehicleAndVesselTaxVo;
 
     @Schema(description = "是否同车主0-否；1-是")
     private int carOwner;
@@ -132,7 +132,7 @@ public class QuoteVo implements Serializable {
 
         this.setOtherInfo(insOrdersVo.getOtherInfo());
         this.setAccidentalDrivings(insOrdersVo.getAccidentalDrivings());
-        this.setVehicleAndVesselTax(insOrdersVo.getVehicleAndVesselTax());
+        this.setVehicleAndVesselTaxVo(insOrdersVo.getVehicleAndVesselTaxVo());
     }
 
     public CustomerInfoVo converCustomerInfoVo(InsOrdersCarUserInfo insOrdersCarUserInfo){

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/orders/InsOrdersVo.java

@@ -9,6 +9,7 @@ import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityScheme;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
 import java.util.List;

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/api/entity/request/ODR1009Request.java

@@ -120,7 +120,7 @@ public class ODR1009Request extends DaJiaBaseRequest {
     //交强险 车船税信息
     public void setVehicleTaxation(QuoteVo quoteVo){
         BodyDTO.vehicleTaxationDTO vehicleTaxationDTO = new BodyDTO.vehicleTaxationDTO();
-        VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTax();
+        VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTaxVo();
         //缴税方式
         vehicleTaxationDTO.setTaxPaytaxTyp(T5002.getCode());
 

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/entity/Request/PremiumRequest.java

@@ -83,7 +83,7 @@ public class PremiumRequest {
         List<KindInfoVo> kindInfoVList = quoteVo.getKindInfoVo();
 
         PremiumRequest quoteReq = new PremiumRequest();
-        VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTax();
+        VehicleAndVesselTaxVo vehicleAndVesselTax = quoteVo.getVehicleAndVesselTaxVo();
 
         //处理车主约定特约
         specialAgreementVo.forEach(item->{

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/entity/request/HuaTaiQuotedPriceRequest.java

@@ -93,7 +93,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
                                HuaTaiConfigureParameters huaTaiConfigureParameters) {
             CarInfoVo carInfo = quoteVo.getCarInfoVo();
             List<KindInfoVo> kindList = quoteVo.getKindInfoVo();
-            VehicleAndVesselTaxVo vesselTax = quoteVo.getVehicleAndVesselTax();
+            VehicleAndVesselTaxVo vesselTax = quoteVo.getVehicleAndVesselTaxVo();
             CustomerInfoVo ownerInfo = quoteVo.getOwnersInfo();
             CustomerInfoVo policyHolderInfo = quoteVo.getPolicyHolderInfo();
             CustomerInfoVo insuredPersonInfo = quoteVo.getInsuredPersonInfo();

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerQuoteRequest.java

@@ -54,7 +54,7 @@ public class HtCrawlerQuoteRequest implements Serializable {
         public DataDTO(QuoteVo quoteVo) {
             RiskInfoVo ciRiskInfoVo = quoteVo.getCiRiskInfoVo();
             RiskInfoVo biRiskInfoVo = quoteVo.getBiRiskInfoVo();
-            VehicleAndVesselTaxVo taxVo = quoteVo.getVehicleAndVesselTax();
+            VehicleAndVesselTaxVo taxVo = quoteVo.getVehicleAndVesselTaxVo();
             this.isFirstCount = "false";
             this.isGlmPrice = 0;
             if (ciRiskInfoVo != null) {

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -168,7 +168,7 @@ public class UnifyOrderManager {
      */
     @Operation(summary = "统一报价")
     @PostMapping("/quote")
-    public HttpResult quote(@RequestBody QuoteVo quoteVo) throws JsonProcessingException {
+    public HttpResult quote(@RequestBody QuoteVo quoteVo) throws Exception {
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyCode(), baseController.getToken());
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200,esmInsCompanyHttpResult.getMsg());
         String systemCode = getSystemCode();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteDispatchDecorator.java

@@ -45,7 +45,7 @@ public class QuoteDispatchDecorator {
         this.target = target;
     }
 
-    public QuoteResultsVo quote(QuoteVo quoteVo) throws JsonProcessingException {
+    public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         String agreementId = quoteVo.getOrder().getAgreementId();
         String token = baseController.getToken();
         String systemCode = "";

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteRestrictDecorator.java

@@ -36,7 +36,7 @@ public class QuoteRestrictDecorator {
         this.target = target;
     }
 
-    public QuoteResultsVo quote(QuoteVo quoteVo) throws JsonProcessingException {
+    public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         String companyId = quoteVo.getOrder().getInsuranceCompanyCode();
         //报价前置检测次数
         boolean checkQuoteLimitation = sysQuoteConfigService.checkQuoteLimitation(quoteVo);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsuranceCompanyRequestService.java

@@ -19,7 +19,7 @@ public interface InsuranceCompanyRequestService {
      * @param quoteVo 报价实体
      * @return 报价信息
      */
-    QuoteResultsVo quote(QuoteVo quoteVo) throws JsonProcessingException;
+    QuoteResultsVo quote(QuoteVo quoteVo) throws Exception;
 
     /**
      * 上传影像实体

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -166,7 +166,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersKindService.saveBatch(insOrdersKinds);
 
             // 税费信息
-            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersAdd.getVehicleAndVesselTax();
+            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersAdd.getVehicleAndVesselTaxVo();
             InsOrdersTax insOrdersTax = BeanUtil.copyProperties(vehicleAndVesselTax, InsOrdersTax.class);
             insOrdersTax.setOrderNo(quoteNo);
             insOrdersTaxService.save(insOrdersTax);
@@ -287,7 +287,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersKindService.updateBatchById(insOrdersKinds);
 
             // 税费信息
-            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTax();
+            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTaxVo();
             InsOrdersTax insOrdersTax = BeanUtil.copyProperties(vehicleAndVesselTax, InsOrdersTax.class);
             insOrdersTax.setOrderNo(quoteNo);
             insOrdersTaxService.updateById(insOrdersTax);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsuranceCompanyRequestServiceImpl.java

@@ -64,7 +64,7 @@ public class InsuranceCompanyRequestServiceImpl implements InsuranceCompanyReque
     }
 
     @Override
-    public QuoteResultsVo quote(QuoteVo quoteVo) throws JsonProcessingException {
+    public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         OrderBase order = quoteVo.getOrder();
         String insuranceCode = extractEnglishChars(order.getInsuranceCompanyCode());
         Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(insuranceCode);

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -184,7 +184,7 @@
         <association property="insOrdersOtherInfo" column="{orderNo=id}" select="selectOrdersOtherByOrderNo" />
         <association property="ordersExternal" column="{orderNo=id}" select="selectOrdersExternalFeeByOrderNo" />
         <association property="insOrdersExternalPolicy" column="{orderNo=id}" select="selectExternalPolicyMap" />
-        <association property="vehicleAndVesselTax" column="{orderNo=id}" select="selectOrdersTaxMap" />
+        <association property="vehicleAndVesselTaxVo" column="{orderNo=id}" select="selectOrdersTaxMap" />
         <association property="imagesAdds" column="{orderNo=id}" select="selectImageByOrderNo" />
         <collection property="insOrdersRiskList"  column="{orderNo=id}" select="selectOrdersRisk" />
         <collection property="carUserInfoList"  column="{orderNo=id}"  select="selectCarUserInfo" />

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/service/TKSimpleService.java

@@ -954,7 +954,7 @@ public class TKSimpleService {
             }
 
             // 同步车船税信息
-            VehicleAndVesselTaxVo vehicleAndVesselTax = commonQuoteVo.getVehicleAndVesselTax();
+            VehicleAndVesselTaxVo vehicleAndVesselTax = commonQuoteVo.getVehicleAndVesselTaxVo();
 
             if (vehicleAndVesselTax != null) {
                 String taxRelifFlag = vehicleAndVesselTax.getTaxRelifFlag();

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangAccuracyCalculateRequest.java

@@ -266,7 +266,8 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
             this.NonVehicleProductInformationList = quoteVo.getAccidentalDrivings().stream().map(NonVehicleProductInformationListDTO::new).collect(Collectors.toList());
             this.CasualtyFlag = "1";
         }
-        this.carshipyTaxInfo = new CarshipyTaxInfoDTO(quoteVo.getVehicleAndVesselTax(),quoteVo.getCiRiskInfoVo(),quoteVo.getBiRiskInfoVo(),quoteVo.getOwnersInfo());
+        System.out.println(quoteVo.getVehicleAndVesselTaxVo());
+        this.carshipyTaxInfo = new CarshipyTaxInfoDTO(quoteVo.getVehicleAndVesselTaxVo(),quoteVo.getCiRiskInfoVo(),quoteVo.getBiRiskInfoVo(),quoteVo.getOwnersInfo());
     }
 
     /**

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/crawler/entity/Request/ZmCrawlerQuotedPriceRequest.java

@@ -114,7 +114,7 @@ public class ZmCrawlerQuotedPriceRequest extends BaseRequest {
             ContractDTO.ContractMainDTO contractMain = new ContractDTO.ContractMainDTO(ciRiskInfoVo, productionDate);
             contract.setContractMain(contractMain);
 
-            VehicleAndVesselTaxVo taxVo = quoteVo.getVehicleAndVesselTax();
+            VehicleAndVesselTaxVo taxVo = quoteVo.getVehicleAndVesselTaxVo();
             ContractDTO.TaxDTO taxDTO = new ContractDTO.TaxDTO(taxVo);
             contract.setTax(taxDTO);