修改bug

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

@@ -14,10 +14,8 @@ public enum InsOrderStatusEnum implements IBaseEnum {
 
     //所有未提交核保的均为报价中（包括拒保订单 ）
     QUOTE_ING("0", "订单已提交", 1, 0),
-
     //已提交核保，并转人工核保状态
     WAIT_AUDIT("1", "待核保", 2, 0),
-
     //自动核保或者人工核保审核通过
     AUDIT_ING("2", "核保中", 3, 0),
     STAFF_PROCESS("3", "人工处理", 3, 0),

commons/src/main/java/com/jzg/commons/entity/orders/vo/HistoryQuoteQueryVo.java

@@ -0,0 +1,22 @@
+package com.jzg.commons.entity.orders.vo;
+
+import com.jzg.commons.core.base.PageRequest;
+import lombok.Data;
+
+
+/**
+ * 获取历史报价信息
+ */
+@Data
+public class HistoryQuoteQueryVo extends PageRequest {
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 车牌号
+     */
+    private String licenseNo;
+}

commons/src/main/java/com/jzg/commons/entity/orders/vo/HistoryQuoteResultVo.java

@@ -21,4 +21,39 @@ public class HistoryQuoteResultVo {
      * 车牌号
      */
     private String licenseNo;
+
+    /**
+     * 报价次数
+     */
+    private String quoteNumber;
+
+    /**
+     * 保司名称
+     */
+    private String companyName;
+
+    /**
+     * 保司id
+     */
+    private String companyId;
+
+    /**
+     * 保险公司logo
+     */
+    private String logo;
+
+    /**
+     * 险种信息
+     */
+    private String productName;
+
+    /**
+     * 保费
+     */
+    private String sumPremium;
+
+    /**
+     * 报价时间
+     */
+    private String quoteTime;
 }

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -298,6 +299,15 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         Map<String, Integer> sortMap = esmInsCompanyTenantSorts.stream()
                 .collect(Collectors.toMap(EsmInsCompanyTenantSort::getCompanyId, EsmInsCompanyTenantSort::getOrderNum));
 
+        esmInsCompanies.forEach(item->{
+            if(item.getLogo() != null && !item.getLogo().equals("")) {
+                String jzg = MinioUtils.getPresignedObjectUrl("jzg", item.getLogo());
+                item.setLogo(jzg);
+            }
+        });
+
+
+
         esmInsCompanies.sort((c1, c2) -> {
             Integer order1 = sortMap.get(c1.getId());
             Integer order2 = sortMap.get(c2.getId());

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

@@ -55,7 +55,7 @@ public class PtlAgreementAttributionImpl extends ServiceImpl<PtlAgreementAttribu
     public boolean addAgreementAttribution(PtlAgreementAttributionSaveVo ptlAgreementAttributionSaveVo) {
         PtlInsAttributionTemplate ptlInsAttributionTemplate = ptlInsAttributionTemplateService.getByCompanyId(ptlAgreementAttributionSaveVo.getInsCompanyId(), ptlAgreementAttributionSaveVo.getApiType());
         if (ptlInsAttributionTemplate == null) {
-            throw new RuntimeException("该保险公司模版不存在");
+            throw new SystemException("该保险公司模版不存在");
         }
         verifyAgreeAttribution(ptlAgreementAttributionSaveVo.getUserDept(),ptlAgreementAttributionSaveVo.getUsername());
         EsmInsCompany esmInsCompany = esmInsCompanyService.getById(ptlAgreementAttributionSaveVo.getInsCompanyId());

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

@@ -97,4 +97,14 @@ public interface PlatformClient {
     @Operation(summary = "根据Id获取上传信息", description = "根据Id获取上传信息")
     public SysUploadFiles getUploadFile(@RequestParam String id);
 
+    /**
+     * 获取用户的保司信息
+     * @param systemCode
+     * @return
+     */
+    @GetMapping("/system/getUserCompany")
+    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode,
+                                                          @RequestHeader("Authorization") String token,
+                                                          @RequestHeader("system_code") String sysCode);
+
 }

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

@@ -5,11 +5,13 @@ import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
+import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersAdd;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersEnd;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
+import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.quotation.summary.mapper.InsOrdersMapper;
 import com.jzg.quotation.summary.service.InsFeeOrdersService;
 import com.jzg.quotation.summary.service.InsOrdersCarInfoService;
@@ -125,6 +127,18 @@ public class InsOrdersController extends BaseController {
         return HttpResult.ok(insOrdersService.getHistoryQuote());
     }
 
+    @Operation(summary = "获取历史报价列表")
+    @PostMapping("/getHistoryQuoteList")
+    public HttpResult getHistoryQuoteList(@RequestBody HistoryQuoteQueryVo historyQuoteQueryVo){
+        return HttpResult.ok(insOrdersService.getHistoryQuoteList(historyQuoteQueryVo));
+    }
+
+    @Operation(summary = "根据车牌获取报价历史")
+    @PostMapping("/getHistoryQuoteByLicenseNo")
+    public HttpResult getHistoryQuoteByLicenseNo(@RequestSingleParam("licenseNo") String licenseNo){
+        return HttpResult.ok(insOrdersService.getHistoryQuoteByLicenseNo(licenseNo));
+    }
+
     @Operation(summary = "根据订单存在的保险公司获取保司列表")
     @GetMapping("/getExistCompany")
     public HttpResult getExistCompany(){

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

@@ -237,26 +237,34 @@ public class UnifyOrderManager {
 
         // 生成主订单及子订单  返回子订单id
         String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
-        quoteVo.getOrder().setOrdersNo(ordersNo);
-        // 先生成订单 在进行保司相关代码转换 解决入库时存储的是保司所需的数据
-        // 保司相关代码转换
-        Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData()
-                .getCode());
-        QuoteInfoConverter.converterCarInfoVo(quoteVo, quoteKindMappingMap.get(QuoteRuleCategory.QUOTE_INFO.getCode()));
-
-        if (CollUtil.isNotEmpty(quoteVo.getKindInfoVo())) {
-            QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
-        }
 
+        QuoteResultsVo quoteResultsVo = null;
         // 报价
-        QuoteResultsVo quoteResultsVo = quoteService.quote(quoteVo);
-        quoteResultsVo.setKindInfoVo(quoteVo.getKindInfoVo());
-        quoteResultsVo.setCiRiskInfoVo(quoteVo.getCiRiskInfoVo());
-        quoteResultsVo.setBiRiskInfoVo(quoteVo.getBiRiskInfoVo());
-        quoteResultsVo.setQuoteStatus(quoteResultsVo.getQuoteStatusEnum().getCode());
-        quoteResultsVo.setOrdersNo(ordersNo);
-        // 报价后更新订单
-        insOrdersService.orderAfterUpdateQuote(ordersNo, quoteResultsVo);
+        try {
+            quoteVo.getOrder().setOrdersNo(ordersNo);
+            // 先生成订单 在进行保司相关代码转换 解决入库时存储的是保司所需的数据
+            // 保司相关代码转换
+            Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData()
+                    .getCode());
+            QuoteInfoConverter.converterCarInfoVo(quoteVo, quoteKindMappingMap.get(QuoteRuleCategory.QUOTE_INFO.getCode()));
+
+            if (CollUtil.isNotEmpty(quoteVo.getKindInfoVo())) {
+                QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
+            }
+
+            quoteResultsVo = quoteService.quote(quoteVo);
+            quoteResultsVo.setKindInfoVo(quoteVo.getKindInfoVo());
+            quoteResultsVo.setCiRiskInfoVo(quoteVo.getCiRiskInfoVo());
+            quoteResultsVo.setBiRiskInfoVo(quoteVo.getBiRiskInfoVo());
+            quoteResultsVo.setQuoteStatus(quoteResultsVo.getQuoteStatusEnum().getCode());
+            quoteResultsVo.setOrdersNo(ordersNo);
+            // 报价后更新订单
+            insOrdersService.orderAfterUpdateQuote(ordersNo, quoteResultsVo);
+        }catch(Exception e){
+            //更新失败报价
+            insOrdersService.orderAfterUpdateFailedQuote(ordersNo, e.getMessage());
+            throw new SystemException(e.getMessage());
+        }
         return quoteResultsVo.getQuoteStatusEnum()
                 .equals(InsOrderStatusEnum.WAIT_AUDIT) ? HttpResult.ok(quoteResultsVo) : HttpResult.error(quoteResultsVo);
     }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
+import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
 import com.jzg.commons.entity.orders.vo.OrderListVo;
 import com.jzg.commons.entity.vo.OrdersListVo;
@@ -30,6 +31,10 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
 
     List<HistoryQuoteResultVo> getHistoryQuote(@Param("userName") String userName);
 
+    Page<HistoryQuoteResultVo> getHistoryQuoteList(@Param("page") Page page, @Param("params") HistoryQuoteQueryVo historyQuoteQueryVo,@Param("userName") String userName);
+
+    List<HistoryQuoteResultVo> getHistoryQuoteByLicenseNo(@Param("licenseNo") String licenseNo);
+
     /**
      * 获取主订单
      * @param companyId

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

@@ -10,6 +10,7 @@ import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
+import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
 import com.jzg.commons.entity.orders.vo.OrderListVo;
 import com.jzg.commons.entity.po.EsmInsCompany;
@@ -82,6 +83,11 @@ public interface InsOrdersService extends IService<InsOrders> {
      */
     void orderAfterUpdateQuote(String ordersNo, QuoteResultsVo quoteResponse);
 
+    /**
+     * 更新失败报价
+     */
+    void orderAfterUpdateFailedQuote(String ordersNo, String errMessage);
+
     /**
      * 发送订单状态变更消息
      * @param insOrders 订单信息
@@ -120,6 +126,18 @@ public interface InsOrdersService extends IService<InsOrders> {
      */
     List<HistoryQuoteResultVo> getHistoryQuote();
 
+    /**
+     * 获取历史报价列表
+     * @return
+     */
+    Page<HistoryQuoteResultVo> getHistoryQuoteList(HistoryQuoteQueryVo historyQuoteQueryVo);
+
+    /**
+     * 获取历史报价信息
+     * @return
+     */
+    List<HistoryQuoteResultVo> getHistoryQuoteByLicenseNo(String licenseNo);
+
     List<EsmInsCompany> getExistCompany();
 
     /**

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

@@ -20,6 +20,7 @@ import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.orders.po.*;
+import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
 import com.jzg.commons.entity.orders.vo.OrderListVo;
 import com.jzg.commons.entity.po.*;
@@ -29,6 +30,7 @@ import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
 import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingResultsVo;
 import com.jzg.commons.entity.vo.*;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
@@ -348,7 +350,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 1. 查询订单信息
         InsOrdersVo insOrdersVo = insOrdersMapper.getById(id);
         if (insOrdersVo == null) {
-            throw new IllegalArgumentException("查询结果为空，无法处理订单信息");
+            throw new SystemException("查询结果为空，无法处理订单信息");
         }
         return insOrdersVo;
     }
@@ -358,7 +360,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 1. 查询订单信息
         InsOrdersVo insOrdersVo = insOrdersMapper.getById(id);
         if (insOrdersVo == null) {
-            throw new IllegalArgumentException("查询结果为空，无法处理订单信息");
+            throw new SystemException("查询结果为空，无法处理订单信息");
         }
         // 协议名称、协议类型
         HttpResult<AgreementInfoVo> ptlAgreement =orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId(),baseController.getToken(),baseController.getAppSystemCode());
@@ -673,6 +675,20 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     }
 
+    @Override
+    public void orderAfterUpdateFailedQuote(String ordersNo, String errMessage) {
+        // 检测主订单是否存在
+        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId,ordersNo));
+        AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
+
+        InsOrdersCarInfo carInfo = ordersCarInfoService.getByOrderId(insOrders.getId());
+        //设置订单状态
+        StateResult stateResult = orderStateListener.statusChange(InsOrderStatusEnum.QUOTE_FAIL, insOrders.getOrderStatus());
+        insOrders.setOrderStatus(String.valueOf(stateResult.getCurrentState()));
+        insOrders.setErrorMessage(errMessage);
+        baseMapper.updateById(insOrders);
+    }
+
     @Override
     public void orderStatusMessage(InsOrders insOrders, InsOrdersCarInfo carInfo, InsOrdersCosts ordersCosts, String token, MessageCodeEnum tplCode) {
         // 获取消息模板 并替换内容
@@ -1022,9 +1038,32 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      */
     public List<HistoryQuoteResultVo> getHistoryQuote(){
         String userName = baseController.getUserName();
+
         return insOrdersMapper.getHistoryQuote(userName);
     }
 
+    @Override
+    public Page<HistoryQuoteResultVo> getHistoryQuoteList(HistoryQuoteQueryVo historyQuoteQueryVo){
+        String userName = baseController.getUserName();
+        Page page = historyQuoteQueryVo.getPage();
+        return insOrdersMapper.getHistoryQuoteList(page,historyQuoteQueryVo,userName);
+    }
+
+    @Override
+    public List<HistoryQuoteResultVo> getHistoryQuoteByLicenseNo(String licenseNo) {
+        List<HistoryQuoteResultVo> historyQuoteByLicenseNo = insOrdersMapper.getHistoryQuoteByLicenseNo(licenseNo);
+        HttpResult<List<EsmInsCompany>> userCompanyResult = platformClient.getUserCompany(baseController.getAppSystemCode(), baseController.getToken(), baseController.getAppSystemCode());
+        List<EsmInsCompany> userCompany = userCompanyResult.getData();
+        historyQuoteByLicenseNo.forEach(item->{
+            EsmInsCompany esmInsCompany = userCompany.stream().filter(x -> x.getId().equals(item.getCompanyId())).findFirst().orElse(null);
+            if(Objects.nonNull(esmInsCompany)){
+                String companyLogoAddress = MinioUtils.getPresignedObjectUrl("jzg", esmInsCompany.getLogo());
+                item.setLogo(companyLogoAddress);
+            }
+        });
+        return historyQuoteByLicenseNo;
+    }
+
     @Override
     public List<EsmInsCompany> getExistCompany() {
         List<InsOrders> insOrders = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()

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

@@ -611,6 +611,59 @@
         LIMIT 10
     </select>
 
+    <select id="getHistoryQuoteList" resultType="com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo">
+        SELECT
+            ioci.license_no,
+            COUNT(*) AS quote_number
+        FROM
+            ins_orders io
+                LEFT JOIN ins_orders_car_info ioci ON io.id = ioci.order_no
+        WHERE
+            io.real_quote_user_id = #{userName}
+        <if test="params.licenseNo != null and params.licenseNo != ''">
+            AND ioci.license_no = #{params.licenseNo}
+        </if>
+        and
+            io.parent_id != 0
+        GROUP BY
+            ioci.license_no;
+    </select>
+
+    <select id="getHistoryQuoteByLicenseNo" resultType="com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo">
+        SELECT
+            io.id as order_no,
+            io.company_id,
+            io.company_name,
+            io.product_name,
+            io.create_time as quote_time,
+            ioci.license_no,
+            ioc.sum_premium
+        FROM
+            ins_orders io
+                LEFT JOIN ins_orders_car_info ioci ON io.id = ioci.order_no
+                LEFT JOIN ins_orders_costs ioc on io.id = ioc.order_no
+        WHERE
+            ioci.license_no = #{licenseNo}
+          and
+            io.parent_id != 0
+    </select>
+
+    <select id="getHistoryList" resultType="com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo">
+        SELECT
+        ioci.license_no,
+        COUNT(*) AS quote_number
+        FROM
+        ins_orders io
+        LEFT JOIN ins_orders_car_info ioci ON io.id = ioci.order_no
+        WHERE
+        io.real_quote_user_id = #{userName}
+        <if test="params.licenseNo != null and params.licenseNo != ''">
+            AND ioci.license_no = #{params.licenseNo}
+        </if>
+        GROUP BY
+        ioci.license_no;
+    </select>
+
     <select id="getBaseOrders" resultType="com.jzg.commons.entity.orders.po.InsOrders">
         SELECT o.*
         FROM ins_orders o

tenant/organization/src/main/java/com/jzg/organization/client/CostsRuleClient.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name="jzg-costsorrule",url = "http://localhost:8001/")
+@FeignClient(name="jzg-costsorrule",url = "${feign.client.jzg-costsorrule.url}")
 public interface CostsRuleClient {
 
     @PostMapping("/validate/rule/validateSchemeRule")

tenant/organization/src/main/java/com/jzg/organization/client/OrgClient.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 
-@FeignClient(name="jzg-org",url = "http://192.168.0.253:8084/")
+@FeignClient(name="jzg-org",url = "${feign.client.jzg-org.url}")
 public interface OrgClient {
 
     @PostMapping("/ptlAgreementDispatch/getAgreementDispatch")

tenant/organization/src/main/java/com/jzg/organization/client/QuoteClient.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(name="jzg-insurance",url = "http://localhost:9898/")
+@FeignClient(name="jzg-insurance",url = "${feign.client.jzg-insurance.url}")
 public interface QuoteClient {
 
     @GetMapping(value = "/supplementOrder/selectById")

tenant/organization/src/main/java/com/jzg/organization/controller/AgreementController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 协议管理接口
@@ -40,6 +41,9 @@ public class AgreementController extends BaseController {
     @Autowired
     private PtlAgreementDeptService agreementDeptService;
 
+    @Autowired
+    BaseController baseController;
+
     /**
      * 协议列表分页
      * @return
@@ -235,6 +239,9 @@ public class AgreementController extends BaseController {
     @Operation(summary = "根据保险公司查找协议")
     @GetMapping("/getByCompanyId")
     public HttpResult getByCompanyCode(String companyId, String systemCode) {
+        if(Objects.isNull(systemCode)){
+            systemCode = baseController.getUserSystemCode();
+        }
         return HttpResult.ok(agreementService.getByCompanyId(companyId, systemCode));
     }