调整方案的规则匹配

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/OrderOperationLogAspect.java

@@ -99,7 +99,8 @@ public class OrderOperationLogAspect {
                 InsOrders mainOrders = orderService.getMainOrders(
                         quoteVo.getOrder().getInsuranceCompanyCode(),
                         quoteVo.getCarInfoVo().getLicenseNo(),
-                        quoteVo.getCarInfoVo().getVinNo());
+                        quoteVo.getCarInfoVo().getVinNo(),
+                        quoteVo.getProductId());
                 boolean isExistsMainOrder = false;
                 if (Objects.nonNull(mainOrders))
                 {

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

@@ -295,7 +295,7 @@ public class UnifyOrderManager {
                 .getApiType(), sysQuoteConfigService, sysQuoteRedisService, platformClient, baseController);
 
         // 生成主订单及子订单  返回子订单id
-        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName,systemCode);
+        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName,systemCode, quoteVo.getProductId());
 
         // 添加车辆没有的参数: 车辆明细、
         QuoteInfoParameterFilling.setParameterSettings(quoteVo, esmInsCompanyHttpResult.getData().getCompanyCode());

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

@@ -67,7 +67,7 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
      * @param vinNo
      * @return
      */
-    InsOrders getBaseOrders(String companyId, String licenseNo, String vinNo);
+    InsOrders getBaseOrders(String companyId, String licenseNo, String vinNo, String productId);
 
     /**
      * 获取最新报价的订单信息

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

@@ -66,7 +66,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param systemCode 租户代码
      * @return String
      */
-    String generateOrders(QuoteVo quoteVo, String companyName, String systemCode);
+    String generateOrders(QuoteVo quoteVo, String companyName, String systemCode,String productId);
 
 
     /**
@@ -77,7 +77,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param vinNo
      * @return
      */
-    InsOrders getMainOrders(String companyId, String licenseNo, String vinNo);
+    InsOrders getMainOrders(String companyId, String licenseNo, String vinNo, String productId);
 
     /**
      * 设置人员地址

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

@@ -1042,8 +1042,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
     @Override
-    public InsOrders getMainOrders(String companyId, String licenseNo, String vinNo) {
-        return baseMapper.getBaseOrders(companyId, licenseNo, vinNo);
+    public InsOrders getMainOrders(String companyId, String licenseNo, String vinNo,String productId) {
+        return baseMapper.getBaseOrders(companyId, licenseNo, vinNo, productId);
     }
 
 
@@ -1640,12 +1640,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      */
     @Override
     @Transactional
-    public String generateOrders(QuoteVo quoteVo, String companyName, String systemCode) {
+    public String generateOrders(QuoteVo quoteVo, String companyName, String systemCode,String productId) {
         // 生成订单的条件
         // 1个保险公司只有一个主订单   不区分险种
         // 唯一性的判定标准：保险公司编号+ 车牌号 + 车架号
         log.info("生成一个主订单和多个子订单：systemCode=[{}], quoteVo=[{}],companyName=[{}]", systemCode, JSONUtil.toJsonStr(quoteVo), companyName);
-        InsOrders mainOrders = this.getMainOrders(quoteVo.getOrder().getInsuranceCompanyCode(), quoteVo.getCarInfoVo().getLicenseNo(), quoteVo.getCarInfoVo().getVinNo());
+        InsOrders mainOrders = this.getMainOrders(quoteVo.getOrder().getInsuranceCompanyCode(), quoteVo.getCarInfoVo().getLicenseNo(), quoteVo.getCarInfoVo().getVinNo(), productId);
         boolean isExistsMainOrder = Objects.nonNull(mainOrders);
         String mainOrderNo;
         // 如果订单号为0 则生成主订单

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

@@ -939,7 +939,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4,5)
+            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4)
             <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                 and io.real_quote_user_id in (select bbb.mobile from sys_user bbb where bbb.id in ( select ss.user_id
                 from sys_user_jzg_info ss where 1 =1 and (ss.leader_id = #{insOrdersParam.jzgInfoId} or ss.id
@@ -1128,7 +1128,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0 and sujis.type_attr NOT IN (1,2,3,4,5)
+            and io.is_delete = 0 and sujis.type_attr NOT IN (1,2,3,4)
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND io.id = #{insOrdersParam.orderNo}
             </if>
@@ -1336,7 +1336,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4,5)
+            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4)
             <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                 and io.real_quote_user_id in (select bbb.mobile from sys_user bbb where bbb.id in ( select ss.user_id
                 from sys_user_jzg_info ss where 1 =1 and (ss.leader_id = #{insOrdersParam.jzgInfoId} or ss.id
@@ -1549,7 +1549,7 @@
             ) x WHERE x.rn = 1
             ) ioa1 ON io.id = ioa1.order_no
             <where>
-                and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4,5)
+                and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4)
                 <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                     and io.real_quote_user_id in (select bbb.mobile from sys_user bbb where bbb.id in ( select ss.user_id
                     from sys_user_jzg_info ss where 1 =1 and (ss.leader_id = #{insOrdersParam.jzgInfoId} or ss.id
@@ -1751,9 +1751,9 @@
         <where>
             and o.is_delete = 0
             and o.parent_id = 0
-            AND o.company_id = #{companyId}
             AND c.license_no = #{licenseNo}
             AND c.vin_no = #{vinNo}
+            AND o.product_id = #{productId}
         </where>
     </select>