资金财险修改

src/main/java/com/ydtech/modules/ins/model/zm/ZmCarModel.java

@@ -1,6 +1,11 @@
 package com.ydtech.modules.ins.model.zm;
 
+import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import lombok.Data;
+import org.mapstruct.Mapping;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Data
 public class ZmCarModel {
@@ -52,4 +57,27 @@ public class ZmCarModel {
     private String vehicleSeatMax;
     private String vehicleSeatMin;
 
+    public static List<CarModelDTO> toCarModelDTOs(List<ZmCarModel> data) {
+        return data.stream().map(ZmCarModel::toCarModelDTO).collect(Collectors.toList());
+    }
+
+    public static CarModelDTO toCarModelDTO(ZmCarModel zmCarModel){
+        CarModelDTO carModelDTO = new CarModelDTO();
+        carModelDTO.setModelCode(zmCarModel.getLocalModelCode());
+        carModelDTO.setModelName(zmCarModel.getModelName());
+        carModelDTO.setBrandCN(zmCarModel.getBrand());
+        carModelDTO.setSeries(zmCarModel.getSeries());
+        carModelDTO.setRatedPassengerCapacity(zmCarModel.getApprovedPassengersCapacity());
+        carModelDTO.setDisplacement(zmCarModel.getDisplacement());
+        carModelDTO.setMarketYear(zmCarModel.getCarYear());
+        carModelDTO.setReplacementValue(zmCarModel.getOriginalPurchasePrice());
+        carModelDTO.setRemark(zmCarModel.getRemark());
+        carModelDTO.setFuelType(zmCarModel.getFuelType());
+        carModelDTO.setFuelTypeCode(zmCarModel.getFuelTypeCode());
+        carModelDTO.setEnergyTypes(zmCarModel.getFuelTypeCode());
+        carModelDTO.setPowerScale(zmCarModel.getPower());
+        return carModelDTO;
+    }
+
+
 }

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

@@ -48,6 +48,8 @@ public class ZijinRequestApiComponents {
 
     private final RedissonClient redissonClient;
 
+    private static final String USER_ID = "28317480921155536850";
+
     public ZijinRequestApiComponents(InsCrawlerOrderComponents insCrawlerOrderComponents, ZjApiConfigurationProperties zjApiConfigurationProperties, ConfigureParametersComponents configureParametersComponents, StringRedisTemplate redisTemplate, RedissonClient redissonClient) {
         this.insCrawlerOrderComponents = insCrawlerOrderComponents;
         this.zjApiConfigurationProperties = zjApiConfigurationProperties;
@@ -58,9 +60,10 @@ public class ZijinRequestApiComponents {
 
 
     public <T, B extends BaseResponse> B request(RequestUrl requestUrl, T requestBody, Class<B> responseType, HttpHeaders httpHeaders) {
+        log.debug(httpHeaders.toString());
         String url = zjApiConfigurationProperties.getUrl() + requestUrl.getUri();
         B b = insCrawlerOrderComponents.request(url, "紫金财险", requestUrl.getDesc(), requestBody, responseType, httpHeaders);
-        ResultEnum.verify(b.getRtnCode());
+        ResultEnum.verify(b.getRtnCode(), b.getRtnMsg());
         return b;
     }
 
@@ -77,7 +80,7 @@ public class ZijinRequestApiComponents {
         GetAccessTokenResponse accessToken = getAccessToken(getAccessTokenRequest);
         httpHeaders.set(AUTHORIZATION, accessToken.getToken());
         // 2 车险业务获取token服务
-        QueryTokenRequest queryTokenRequest = new QueryTokenRequest(zjConfigureParameters.getOrderOrigin(), zjConfigureParameters.getUserId());
+        QueryTokenRequest queryTokenRequest = new QueryTokenRequest(zjConfigureParameters.getAppKey(), USER_ID);
         QueryTokenResponse queryTokenResponse = queryToken(queryTokenRequest, httpHeaders);
         httpHeaders.set(ZKI_API_AUTHORIZATION, queryTokenResponse.getToken());
         // 3. 将请求的token放入redis
@@ -165,7 +168,7 @@ public class ZijinRequestApiComponents {
     public GetAccessTokenResponse getAccessToken(GetAccessTokenRequest getAccessTokenRequest) {
         String url = zjApiConfigurationProperties.getAccessTokenUrl();
         GetAccessTokenResponse response = insCrawlerOrderComponents.request(url, "紫金财险", "为接入方提供获取token服务", getAccessTokenRequest, GetAccessTokenResponse.class);
-        ResultEnum.verify(response.getRtnCode());
+        ResultEnum.verify(response.getRtnCode(), response.getRtnMsg());
         return response;
     }
 

src/main/java/com/ydtech/modules/order/dao/InsTaskImagesMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.order.entity.dto.InsTaskImagesDto;
 import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.po.InsTaskImages;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,6 +20,10 @@ public interface InsTaskImagesMapper extends BaseMapper<InsTaskImages> {
 
     List<InsUploadImagesDto> getByOrderNoInsUploadImagesDtoList(String orderNo);
 
+    boolean delByImageTypeQuoteNo(@Param("imageType") String imageType,@Param("quoteNo") String quoteNo );
+
+
+
 }
 
 

src/main/java/com/ydtech/modules/order/entity/api/zj/constants/enums/ResultEnum.java

@@ -21,9 +21,9 @@ public enum ResultEnum {
 
     private final String desc;
 
-    public static void verify(String rtnCode) {
+    public static void verify(String rtnCode, String rtnMsg) {
         if (!R_0000.getCode().equals(rtnCode)) {
-            throw new SystemException(rtnCode);
+            throw new SystemException(rtnMsg);
         }
     }
 

src/main/java/com/ydtech/modules/order/entity/api/zj/request/CalculatePremiumRequest.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.entity.api.zj.request;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdcardUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
@@ -14,6 +15,7 @@ import com.ydtech.modules.order.entity.api.zj.constants.enums.MotorVehicleInsura
 import com.ydtech.modules.order.entity.api.zj.constants.enums.RiskCodeEnum;
 import com.ydtech.modules.order.entity.api.zj.response.ModelQueryResponse;
 import com.ydtech.modules.order.entity.api.zm.constants.TimeConstants;
+import com.ydtech.modules.order.entity.config.ZjConfigureParameters;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.utils.InsuranceTimeProcessing;
 import lombok.AllArgsConstructor;
@@ -97,9 +99,7 @@ public class CalculatePremiumRequest implements Serializable {
     @JsonProperty("vehicleInfo")
     private VehicleInfoDTO vehicleInfo;
 
-
-
-    public CalculatePremiumRequest(BaseQuoteInfoVo quoteInfoVo, ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO, String actualValue, List<CarPolicySubInfoListDTO> accidentalDrivingVo) {
+    public CalculatePremiumRequest(BaseQuoteInfoVo quoteInfoVo, ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO, String actualValue, List<CarPolicySubInfoListDTO> accidentalDrivingVo, ZjConfigureParameters zjConfigureParameters, ModelQueryResponse modelQueryResponse) {
         // 基本信息
         this.baseInfo = new BaseInfoDTO(quoteInfoVo.getRiskList());
         // 车主信息
@@ -107,15 +107,21 @@ public class CalculatePremiumRequest implements Serializable {
         // 投被保人信息
         this.insuredList = InsuredListDTO.toInsuredListDTOList(quoteInfoVo.getPolicyHolderInfo(), quoteInfoVo.getInsuredPersonInfo());
         // 险别信息
-        this.itemKindList = ItemKindListDTO.toItemKindListDTOList(quoteInfoVo.getKindList(), Integer.parseInt(quoteInfoVo.getCarInfo().getSeatCount()));
+        this.itemKindList = ItemKindListDTO.toItemKindListDTOList(actualValue, quoteInfoVo.getKindList(), Integer.parseInt(quoteInfoVo.getCarInfo().getSeatCount()) - 1);
         // 驾意险
         this.carPolicySubInfoList = accidentalDrivingVo;
         // 交强险
-        if ("1".equals(this.baseInfo.calculateFlag)) {
+        if (!"1".equals(this.baseInfo.calculateFlag)) {
             itemKindList.add(ItemKindListDTO.getCompulsoryInsurance());
         }
         // 车辆信息
         this.vehicleInfo = new VehicleInfoDTO(quoteInfoVo.getCarInfo(), vehicleModelInfosDTO, actualValue);
+        this.orderId = modelQueryResponse.getOrderId();
+        this.orderNo = modelQueryResponse.getOrderNo();
+        this.orderOrigin = zjConfigureParameters.getAppKey();
+        this.proposalAreaCode = zjConfigureParameters.getProposalAreaCode();
+        this.proposalCityCode = zjConfigureParameters.getProposalCityCode();
+        this.taxRelifInfo = new TaxRelifInfoDTO();
     }
 
     /**
@@ -247,9 +253,9 @@ public class CalculatePremiumRequest implements Serializable {
 
             for (RiskInfoVo riskInfoVo : riskInfoVoList) {
                 if (InsuranceRisk.BUSINESS.getCode().equals(riskInfoVo.getRiskCode())) {
-                    setCommerceTime(riskInfoVo.getStartDate());
-                } else {
                     setStrengthTime(riskInfoVo.getStartDate());
+                } else {
+                    setCommerceTime(riskInfoVo.getStartDate());
                 }
             }
 
@@ -351,6 +357,11 @@ public class CalculatePremiumRequest implements Serializable {
          */
         @JsonProperty("actualValue")
         private String actualValue;
+        /**
+         * 车辆实际价值
+         */
+        @JsonProperty("agreeActualValue")
+        private String agreeActualValue;
         /**
          * 是否过户车辆 1是0否
          */
@@ -435,6 +446,7 @@ public class CalculatePremiumRequest implements Serializable {
 
         public VehicleInfoDTO(CarInfoVo carInfo, ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO, String actualValue) {
             this.actualValue = actualValue;
+            this.agreeActualValue = actualValue;
             if (carInfo.isTransferFlag()) {
                 this.chgOwnerFlag = "1";
             } else {
@@ -585,7 +597,7 @@ public class CalculatePremiumRequest implements Serializable {
         /**
          * 免赔率 绝对免赔率险必录 5,10,15,20(单位%)
          */
-        @JsonProperty("quantity")
+        @JsonProperty("deductibleRate")
         private String deductibleRate;
 
 
@@ -597,7 +609,7 @@ public class CalculatePremiumRequest implements Serializable {
             return insuredListDTO;
         }
 
-        public static List<ItemKindListDTO> toItemKindListDTOList(List<KindInfoVo> kindList, int quantity) {
+        public static List<ItemKindListDTO> toItemKindListDTOList(String actualValue, List<KindInfoVo> kindList, int quantity) {
             List<ItemKindListDTO> list = new ArrayList<>();
             for (KindInfoVo kindInfoVo : kindList) {
                 String code = kindInfoVo.getKindCode();
@@ -606,20 +618,26 @@ public class CalculatePremiumRequest implements Serializable {
                 String s = InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i];
                 MotorVehicleInsuranceEnum contractEnum = Enum.valueOf(MotorVehicleInsuranceEnum.class, "MVI_" + s);
                 itemKindListDTO.kindCode = contractEnum.getCode();
-                itemKindListDTO.kindName = contractEnum.getDesc();
-                itemKindListDTO.riskCode = "";
+                itemKindListDTO.kindName = contractEnum.getName();
+                itemKindListDTO.riskCode = "050A";
+
                 // 司机
                 if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getDriver(), code) >= 0) {
                     itemKindListDTO.quantity = String.valueOf(1);
+                    itemKindListDTO.amount = String.valueOf(kindInfoVo.getAmount());
                 }
                 // 乘客
-                if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getPassenger(), code) >= 0) {
+                else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getPassenger(), code) >= 0) {
                     itemKindListDTO.quantity = String.valueOf(quantity);
-                    itemKindListDTO.amount = String.valueOf((int) kindInfoVo.getUnitAmount() * quantity);
+                    itemKindListDTO.amount = String.valueOf(kindInfoVo.getUnitAmount());
                 }
                 // 绝对免赔
-                if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getAbsoluteDeductible(), code) >= 0) {
+                else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getAbsoluteDeductible(), code) >= 0) {
                     itemKindListDTO.deductibleRate = kindInfoVo.getDeductibleRate();
+                } else if (InsurKind.A.getCode().equals(code)) {
+                    itemKindListDTO.amount = actualValue;
+                }else {
+                    itemKindListDTO.amount = String.valueOf(kindInfoVo.getAmount());
                 }
                 list.add(itemKindListDTO);
             }

src/main/java/com/ydtech/modules/order/entity/api/zj/request/ModelQueryRequest.java

@@ -99,9 +99,9 @@ public class ModelQueryRequest implements Serializable {
      * @param zjConfigureParameters 配置信息
      */
     public ModelQueryRequest(CarInfoVo carInfoVo, ZjConfigureParameters zjConfigureParameters) {
-        this.orderOrigin = zjConfigureParameters.getOrderOrigin();
+        this.orderOrigin = zjConfigureParameters.getAppKey();
         this.proposalAreaCode = zjConfigureParameters.getProposalAreaCode();
-        this.proposalCityCode = zjConfigureParameters.getProposalAreaCode();
+        this.proposalCityCode = zjConfigureParameters.getProposalCityCode();
         this.vinNo = carInfoVo.getVinNo();
         this.brandName = carInfoVo.getBrandName();
     }

src/main/java/com/ydtech/modules/order/entity/api/zj/response/CalculatePremiumResponse.java

@@ -156,7 +156,7 @@ public class CalculatePremiumResponse extends BaseResponse implements Serializab
         private String startMinuteCI;
 
         @JsonProperty("sumAmount")
-        private Integer sumAmount;
+        private String sumAmount;
 
         @JsonProperty("sumPremium")
         private Double sumPremium;
@@ -479,7 +479,6 @@ public class CalculatePremiumResponse extends BaseResponse implements Serializab
 
     }
 
-
     @NoArgsConstructor
     @Data
     public static class ItemKindListDTO implements Serializable {
@@ -693,13 +692,13 @@ public class CalculatePremiumResponse extends BaseResponse implements Serializab
         private String vehicleDamageTranche;
 
         @JsonProperty("zjNatrnk")
-        private Integer zjNatrnk;
+        private String zjNatrnk;
 
         @JsonProperty("zjPrornk")
-        private Integer zjPrornk;
+        private String zjPrornk;
 
         @JsonProperty("zjRate")
-        private Integer zjRate;
+        private String zjRate;
 
         @JsonProperty("zjStatus")
         private String zjStatus;

src/main/java/com/ydtech/modules/order/entity/config/ZjConfigureParameters.java

@@ -23,16 +23,6 @@ public class ZjConfigureParameters implements ConfigureParameters {
      */
     private String appSecret;
 
-    /**
-     * 渠道来源
-     */
-    private String orderOrigin;
-
-    /**
-     * 第三方用户id
-     */
-    private String userId;
-
     /**
      * 投保地区省代码
      */
@@ -45,11 +35,11 @@ public class ZjConfigureParameters implements ConfigureParameters {
 
 
     public String getAccessToken(){
-        return OrderCacheConstant.ZJ_ACCESS_TOKEN + this.getUserId() + ":" + this.getAppKey();
+        return OrderCacheConstant.ZJ_ACCESS_TOKEN + ":" + this.getAppKey();
     }
 
     public String getAccessLock(){
-        return OrderCacheConstant.ZJ_ACCESS_TOKEN + this.getUserId() + ":" + this.getAppKey();
+        return OrderCacheConstant.ZJ_ACCESS_LOCK + ":" + this.getAppKey();
     }
 
 }

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

@@ -42,6 +42,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -204,7 +205,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
     @Override
-    public HttpResult<OrderVo> getByCompanyId(String companyId) {
+    public HttpResult<OrderVo> getByCompanyId(@NotBlank(message = "子订单不能为空") String companyId) {
         OrderVo orderAndAreaCompany = baseMapper.getOrderAndAreaCompany(companyId);
         if ("永安财险".equals(orderAndAreaCompany.getInscompany())) {
             JSONObject reptxt = orderAndAreaCompany.getReptxt();

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

@@ -37,10 +37,7 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
         }
 
         // 删除之前的文件
-        baseMapper.delete(new LambdaQueryWrapper<InsTaskImages>()
-                .eq(InsTaskImages::getImageType, insTaskImagesVo.getImageType())
-                .eq(InsTaskImages::getQuoteNo, insTaskImagesVo.getQuoteNo())
-        );
+        baseMapper.delByImageTypeQuoteNo(insTaskImagesVo.getImageType(), insTaskImagesVo.getQuoteNo());
 
         // 将新文件存入
         List<InsTaskImages> insTaskImagesList = new ArrayList<>();

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

@@ -82,8 +82,9 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         Response<List<ZmCarModel>> model = zhongmeiRequestComponents.vinSearch(map, new ParameterizedTypeReference<Response<List<ZmCarModel>>>() {
         });
         List<ZmCarModel> data = model.getData();
+
         if (!data.isEmpty()) {
-            return ZhongmeiCarModelConvert.INSTANCE.map(data);
+            return ZmCarModel.toCarModelDTOs(data);
         }
         return Collections.emptyList();
     }

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

@@ -74,7 +74,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, zjVehicleProductsVo.getAgreementId());
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjVehicleProductsVo.getAgreementId());
         // 2. 请求驾意险
-        QueryVehicProductsRequest queryVehicProductsRequest = new QueryVehicProductsRequest(zjVehicleProductsVo.getSeatCount(), zjConfigureParameters.getOrderOrigin(), zjConfigureParameters.getProposalCityCode());
+        QueryVehicProductsRequest queryVehicProductsRequest = new QueryVehicProductsRequest(zjVehicleProductsVo.getSeatCount(), zjConfigureParameters.getAppKey(), zjConfigureParameters.getProposalCityCode());
         QueryVehicProductsResponse queryVehicProductsResponse = zijinRequestApiComponents.queryVehicleProducts(queryVehicProductsRequest, httpHeaders);
         return HttpResult.ok(queryVehicProductsResponse.getProductDtoList());
     }
@@ -104,16 +104,17 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
         // 3.1 计算起保日期
         List<RiskInfoVo> riskList = quoteInfoVo.getRiskList();
-        if (riskList.size() == 1 && InsuranceRisk.TRAFFIC.getDesc().equals(riskList.get(0).getRiskCode())) {
+        if (riskList.size() == 1 && InsuranceRisk.TRAFFIC.getCode().equals(riskList.get(0).getRiskCode())) {
             startDate = riskList.get(0).getStartDate();
         } else {
-            startDate = Objects.requireNonNull(riskList.stream().filter(x -> InsuranceRisk.BUSINESS.getDesc().equals(x.getRiskCode())).findFirst().orElse(null)).getStartDate();
+            startDate = Objects.requireNonNull(riskList.stream().filter(x -> InsuranceRisk.BUSINESS.getCode().equals(x.getRiskCode())).findFirst().orElse(null)).getStartDate();
         }
 
         QueryActualValueRequest queryActualValueRequest = new QueryActualValueRequest(carInfo.getRegisterDate(), purchasePrice, seatCount, startDate);
         QueryActualValueResponse queryActualValueResponse = zijinRequestApiComponents.queryActualValue(queryActualValueRequest, httpHeaders);
         // 4. 报价
-        CalculatePremiumRequest calculatePremiumRequest = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo());
+        CalculatePremiumRequest calculatePremiumRequest
+                = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters, modelQueryResponse);
         CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders);
         QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo);
         return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution);
@@ -214,7 +215,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             String s = JSON.toJSONString(paymentCallbacksRequest);
             log.info("紫金财险 承保回调参数------>{}", s);
 
-            ResultEnum.verify(paymentCallbacksRequest.getErrorCode());
+            ResultEnum.verify(paymentCallbacksRequest.getErrorCode(), paymentCallbacksRequest.getErrorMessage());
             String proposalNo = paymentCallbacksRequest.getOrderId();
             InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(proposalNo);
             // 保单号
@@ -269,7 +270,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             kind.setAmount(kindInfoVo.getAmount());
             int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), kindInfoVo.getKindCode());
 
-            CalculatePremiumResponse.ItemKindListDTO itemKindListDTO = itemKindList.stream().filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZmConnectInsuranceType()[i])).collect(Collectors.toList()).get(0);
+            CalculatePremiumResponse.ItemKindListDTO itemKindListDTO = itemKindList.stream().filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i])).collect(Collectors.toList()).get(0);
 
             kind.setCoveragePremium(Double.parseDouble(itemKindListDTO.getBasePremium()));
             kind.setUnitAmount(kindInfoVo.getUnitAmount());
@@ -297,6 +298,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(calculatePremiumResponse)));
         insAreaCompany.setOrderstatus(InsOrderStatus.S_0.getCode());
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
+        quoteRespVo.setCompanyId(insAreaCompany.getId());
         return HttpResult.ok("报价成功", quoteRespVo);
     }
 

src/main/resources/application-test.yml

@@ -305,7 +305,7 @@ zm:
     url: ${zm.domain}/ascription
   audit:
     url: ${zm.domain}/audit
-  domain: http://47.92.254.66:8888/zm
+  domain: http://sxzgkj.baoxianzhanggui.com/zm/zm
   getPolicyPrint:
     url: ${zm.domain}/getPolicyPrint
   image:

src/main/resources/mapper/modules/ins/InsTaskImagesMapper.xml

@@ -38,4 +38,14 @@
               (select quoteno from ins_orders where orderno = #{orderNo})
     </select>
 
+    <delete id="delByImageTypeQuoteNo">
+        delete
+        from ins_task_images
+        where id in (select id
+                     from ins_task_images
+                     where image_type = #{imageType}
+                       and quote_no = #{quoteNo});
+    </delete>
+
+
 </mapper>