完善报价流程

commons/src/main/java/com/jzg/commons/constants/dict/EnergyTypeCode.java

@@ -0,0 +1,35 @@
+package com.jzg.commons.constants.dict;
+
+import com.jzg.commons.constants.DictEnum;
+import com.jzg.commons.constants.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@DictEnum(key = "energyType", desc = "保险订单状态")
+public enum EnergyTypeCode implements IBaseEnum {
+    ENERGY_TYPE_CODE_0("0", "燃油"),
+    ENERGY_TYPE_CODE_1("1", "纯电动"),
+    ENERGY_TYPE_CODE_2("2", "燃料电池"),
+    ENERGY_TYPE_CODE_3("3", "插电式混合动力"),
+    ENERGY_TYPE_CODE_4("4", "其他混合动力"),
+    ENERGY_TYPE_CODE_9("9", "其他");
+
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+
+    @Override
+    public Integer getSort() {
+        return null;
+    }
+
+    @Override
+    public Integer getStatus() {
+        return null;
+    }
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCarUserInfo.java

@@ -101,7 +101,8 @@ public class InsOrdersCarUserInfo extends BaseModel {
         this.setId(IdGenerate.nextId());
         this.setOrderNo(orderNo);
         this.setPolicyPersonType(policyPersonType); // 车主
-        this.setPersonType(Integer.parseInt(customerInfoVo.getProperty()));
+//        this.setPersonType(Integer.parseInt(customerInfoVo.getProperty()));
+        this.setPersonType(1);
         this.setName(customerInfoVo.getName());
         this.setIdentifyNumber(customerInfoVo.getIdentifyNumber());
         this.setAge(customerInfoVo.getAge());

commons/src/main/java/com/jzg/commons/util/MinioUtils.java

@@ -381,8 +381,12 @@ public class MinioUtils {
      */
     @SneakyThrows(Exception.class)
     public static String getPresignedObjectUrl(String bucketName, String objectName) {
-        GetPresignedObjectUrlArgs args = GetPresignedObjectUrlArgs.builder().bucket(bucketName).object(objectName).method(Method.GET).build();
-        return minioClient.getPresignedObjectUrl(args);
+        try {
+            GetPresignedObjectUrlArgs args = GetPresignedObjectUrlArgs.builder().bucket(bucketName).object(objectName).method(Method.GET).build();
+            return minioClient.getPresignedObjectUrl(args);
+        }catch (Exception e){
+            return null;
+        }
     }
 
     /**

platform/src/main/java/com/jzg/controller/EsmInsCompanyController.java

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -60,6 +61,13 @@ public class EsmInsCompanyController extends BaseController {
         return HttpResult.ok(list);
     }
 
+    @GetMapping("getAllTopCompanyList")
+    @Operation(summary = "获取订单报价完成的保险公司")
+    public  HttpResult getAllTopCompanyList() {
+        List<EsmInsCompany> list = esmInsCompanyService.getAllBaseList();
+        return HttpResult.ok(list);
+    }
+
     /**
      * 查询下级保险公司（列表）
      *
@@ -155,8 +163,8 @@ public class EsmInsCompanyController extends BaseController {
     @Operation(summary = "根据主键查询 替换Logo")
     @GetMapping(value = "/findLogoById")
     public HttpResult<EsmInsCompany> findLogoById(@RequestParam String id) {
-        EsmInsCompany esmInsCompany = esmInsCompanyService.getByCompanyCode(id);
-        SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(esmInsCompany.getLogo());
+        EsmInsCompany esmInsCompany = esmInsCompanyService.getById(id);
+         SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(esmInsCompany.getLogo());
         String presignedObjectUrl = MinioUtils.getPresignedObjectUrl(bucketName, sysUploadFiles.getFileName());
         esmInsCompany.setLogo(presignedObjectUrl);
         return HttpResult.ok(esmInsCompany);
@@ -367,4 +375,12 @@ public class EsmInsCompanyController extends BaseController {
         List<EsmInsCompanyResVo> esmInsCompanyList = esmInsCompanyService.findOrderPartnerCompanyList();
         return HttpResult.ok(esmInsCompanyList);
     }
+
+    @Operation(summary = "根据保险公司id获取保司列表")
+    @GetMapping(value = "/getCompanyByIds")
+    public HttpResult<List<EsmInsCompany>> getCompanyByIds(String ids) {
+        List<String> companyList = Arrays.asList(ids.split(","));
+        List<EsmInsCompany> esmInsCompanyList = esmInsCompanyService.getCompanyByIds(companyList);
+        return HttpResult.ok(esmInsCompanyList);
+    }
 }

platform/src/main/java/com/jzg/service/EsmInsCompanyService.java

@@ -111,6 +111,10 @@ public interface EsmInsCompanyService extends IService<EsmInsCompany> {
     List<EsmInsCompanyResVo> leftList(EsmInsCompanyReq req);
 
     EsmInsCompany getByCompanyCode(String companyCode);
+
+    List<EsmInsCompany> getAllBaseList();
+    
+    List<EsmInsCompany> getCompanyByIds(List<String> ids);
 }
 
 

platform/src/main/java/com/jzg/service/impl/EsmInsCompanyServiceImpl.java

@@ -15,6 +15,7 @@ import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.mapper.EsmInsCompanyMapper;
 import com.jzg.service.EsmInsCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -253,6 +254,18 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         EsmInsCompany esmInsCompany = baseMapper.selectOne(new LambdaQueryWrapper<EsmInsCompany>().eq(EsmInsCompany::getCompanyCode, companyCode));
         return esmInsCompany;
     }
+
+    @Override
+    public List<EsmInsCompany> getAllBaseList() {
+
+        return baseMapper.selectList(new LambdaQueryWrapper<EsmInsCompany>().eq(EsmInsCompany::getParentId,0));
+    }
+
+    @Override
+    public List<EsmInsCompany> getCompanyByIds(List<String> ids) {
+        List<EsmInsCompany> esmInsCompanies = baseMapper.selectList(new LambdaQueryWrapper<EsmInsCompany>().in(EsmInsCompany::getId,ids));
+        return esmInsCompanies;
+    }
 }
 
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PlatformClient.java

@@ -7,10 +7,9 @@ import com.jzg.commons.entity.po.QrBarcodeConfig;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.vo.PersonAreaVo;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @FeignClient(name="jzg-platform",url = "http://localhost:8083/")
 public interface PlatformClient {
@@ -37,7 +36,11 @@ public interface PlatformClient {
             @RequestParam("id") String id,
             @RequestHeader("Authorization") String authToken);
 
-
+    //根据保司id获取列表
+    @GetMapping("/esmInsCompany/getCompanyByIds")
+    public HttpResult<List<EsmInsCompany>> getCompanyByIds(
+            @RequestParam("ids") String ids,
+            @RequestHeader("Authorization") String authToken);
 
 
 
@@ -55,4 +58,6 @@ public interface PlatformClient {
             @RequestParam("fileName") String fileName
     );
 
+
+
 }

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

@@ -43,6 +43,7 @@ public class QuoteEchoVo extends QuoteVo {
     private static class OrderBaseVo extends OrderBase{
         private String orderStatus;
         private String companyName;
+        private String productsName;
     }
 
     private OrderBaseVo order;
@@ -74,6 +75,7 @@ public class QuoteEchoVo extends QuoteVo {
         this.getOrder().setInsuranceCompanyCode(insOrdersVo.getCompanyId());
         this.getOrder().setCompanyName(insOrdersVo.getCompanyName());
         this.getOrder().setProductsCode(insOrdersVo.getProductId());
+        this.getOrder().setProductsName(insOrdersVo.getProductName());
         this.getOrder().setOrderStatus(insOrdersVo.getInsOrders().getOrderStatus());
 
         //车辆信息处理

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

@@ -29,6 +29,9 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "险种code")
     private String productId;
 
+    @Schema(description = "险种名称")
+    private String productName;
+
     @Schema(description = "保险公司名称")
     private String companyName;
 

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

@@ -103,11 +103,11 @@ public class InsOrdersController {
     public HttpResult getHistoryQuote(){
         return HttpResult.ok(insOrdersService.getHistoryQuote());
     }
-//
-//    @Operation(summary = "编辑订单")
-//    @GetMapping("/revise")
-//    public HttpResult revise(String orderNo) {
-//        return HttpResult.ok(insOrdersService.revise(orderNo));
-//    }
+
+    @Operation(summary = "根据订单存在的保险公司获取 保司列表")
+    @GetMapping("/getExistCompany")
+    public HttpResult getExistCompany(){
+        return HttpResult.ok(insOrdersService.getExistCompany());
+    }
 
 }

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

@@ -8,6 +8,7 @@ import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
 import com.jzg.commons.entity.orders.vo.OrderListVo;
+import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.vo.OrdersListVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.*;
 
@@ -69,7 +70,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param ordersNo
      * @return
      */
-    QuoteVo getOrderDetail(String ordersNo);
+    QuoteEchoVo getOrderDetail(String ordersNo);
 
     /**
      * 获取历史报价信息
@@ -77,4 +78,6 @@ public interface InsOrdersService extends IService<InsOrders> {
      */
     List<HistoryQuoteResultVo> getHistoryQuote();
 
+    List<EsmInsCompany> getExistCompany();
+
 }

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

@@ -58,6 +58,7 @@ import java.net.URL;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @Service
@@ -675,7 +676,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
     @Override
-    public QuoteVo getOrderDetail(String ordersNo) {
+    public QuoteEchoVo getOrderDetail(String ordersNo) {
         InsOrdersVo insOrdersVo = selectById(Long.parseLong(ordersNo));
         AssertionUtils.isFail(Objects.isNull(insOrdersVo),"订单不存在");
         QuoteEchoVo resultVo = new QuoteEchoVo(insOrdersVo);
@@ -698,5 +699,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         return insOrdersMapper.getHistoryQuote(userName);
     }
 
+    @Override
+    public List<EsmInsCompany> getExistCompany() {
+        List<InsOrders> insOrders = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+                .select(InsOrders::getCompanyId)
+                .groupBy(InsOrders::getCompanyId));
+        List<String> companyIds = insOrders.stream().map(x -> x.getCompanyId()).collect(Collectors.toList());
+        String joined = String.join(",", companyIds);
+        HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined,baseController.getToken());
+        return companyByIds.getData();
+    }
+
 
 }

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

@@ -172,6 +172,8 @@
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="quoteNo" column="quote_no" jdbcType="VARCHAR"/>
         <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+        <result property="productId" column="product_id" jdbcType="VARCHAR"/>
+        <result property="productName" column="product_name" jdbcType="VARCHAR"/>
         <result property="auditStatus" column="audit_status" jdbcType="VARCHAR"/>
         <result property="auditComments" column="audit_comments" jdbcType="VARCHAR"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
@@ -415,7 +417,7 @@
     </select>
     
     <select id="getById" resultMap="InsOrdersVoMap">
-        select id, quote_no,company_name,audit_status,audit_comments,create_by,audit_id,audit_name from ins_orders where id = #{id}
+        select id, quote_no,company_name,product_id,product_name,audit_status,audit_comments,create_by,audit_id,audit_name from ins_orders where id = #{id}
     </select>
 
     <select id="queryList" resultMap="InsOrdersVoMap">

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/QuoteRequest.java

@@ -2271,10 +2271,10 @@ public class QuoteRequest {
          */
         if (null != adVo && !adVo.isEmpty()) {
             adVo.forEach(vo->{
-                if(StringUtils.isNotEmpty(vo.getRiskCode()) && vo.getQuantity() > 0)
+                if(StringUtils.isNotEmpty(vo.getProductCode()) && vo.getQuantity() > 0)
                 {
                     Condition.CvrgYW cvrgYW = new Condition.CvrgYW();
-                    cvrgYW.setCInsuranceCode(vo.getRiskCode());
+                    cvrgYW.setCInsuranceCode(vo.getProductCode());
                     cvrgYW.setNInsuranceQuantity(vo.getQuantity() + "");
                     condition.setCvrgYW(cvrgYW);
                 }

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java

@@ -528,7 +528,7 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
     }
 
     private QuoteResponse getResponse(QuoteRequest quoteRequest, QuoteVo quoteVo, List<String> requestInfoList) throws JsonProcessingException {
-        QuoteResponse quoteResponse = ycRequestApiComponents.newPremiumXnyCalculation(quoteRequest);
+         QuoteResponse quoteResponse = ycRequestApiComponents.newPremiumXnyCalculation(quoteRequest);
         //存储 报价返回的查询码  交强和商业
         if (quoteResponse.getVhl() != null) {
             if (quoteResponse.getVhl().getCQryCdeJQ() != null) {