1. 修改诚泰 驾意险导致的报价程序异常

2. 订单查询条件修改
3. 永安支付连接调整

src/main/java/com/ydtech/modules/order/controller/InsCrawlerOrderController.java

@@ -166,9 +166,14 @@ public class InsCrawlerOrderController extends BaseController {
         YaCrawlerSendSmsCodeResponse result = insuranceCrawlerOrderService.yaSendCode(jsonObject.getString("companyId"),jsonObject.getString("smsCode"));
         if(result.getCode() == 200){
             return HttpResult.ok("发送成功!");
+        }else if(result.getCode() == 300){
+            // 获取新连接
+            return HttpResult.error(300,result.getMessage());
         }else{
             return HttpResult.error(result.getMessage());
         }
+//        return HttpResult.error(300,"https://www.baidu.com/");
+
     }
 
     @PostMapping(value = "/yaVerifySendCode")
@@ -183,6 +188,7 @@ public class InsCrawlerOrderController extends BaseController {
         }
     }
 
+
     @PostMapping(value = "/sendLoginSmsCode")
     @ApiOperation(value = "统一发送登录验证码")
     public HttpResult sendLoginSmsCode(@RequestBody PtlAgreementAttributionDto agreementAttributionDto) {

src/main/java/com/ydtech/modules/order/controller/QuoteController.java

@@ -250,6 +250,12 @@ public class QuoteController extends BaseController {
                 if(StringUtils.isNotBlank(javaObject.getProjectCode())){
                     LambdaQueryWrapper<InsDrivingIntentionInsurance> wrapper = new LambdaQueryWrapper<>();
                     wrapper.eq(InsDrivingIntentionInsurance::getProjectCode,javaObject.getProjectCode());
+                    InsDrivingIntentionInsurance finalJavaObject = javaObject;
+                    wrapper.and(w -> w
+                            .isNull(InsDrivingIntentionInsurance::getSeatNum)
+                            .or()
+                            .eq(InsDrivingIntentionInsurance::getSeatNum, finalJavaObject.getSeatNum())
+                    );
                     InsDrivingIntentionInsurance insDrivingIntentionInsurance = insDrivingIntentionInsuranceService.getOne(wrapper);
                     if (StringUtils.isNotBlank(insDrivingIntentionInsurance.getRelateCode())){
                         javaObject.setProjectCode(insDrivingIntentionInsurance.getRelateCode());

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1023,7 +1023,7 @@
                 and iac.id = #{orderQueryVo.orderNo}
             </if>
 
-            <if test="orderQueryVo.managementSource != null and orderQueryVo.managementSource != ''">
+            <if test="orderQueryVo.managementSource != null and orderQueryVo.managementSource.size > 0">
                 and dept.management_source in
                 <foreach item="source" collection="orderQueryVo.managementSource" open="(" separator="," close=")">
                     #{source}
@@ -1192,8 +1192,11 @@
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and iac.id = #{orderQueryVo.orderNo}
             </if>
-            <if test="orderQueryVo.managementSource != null and orderQueryVo.managementSource != ''">
-                and dept.management_source = #{orderQueryVo.managementSource}
+            <if test="orderQueryVo.managementSource != null and orderQueryVo.managementSource.size > 0">
+                and dept.management_source in
+                <foreach item="source" collection="orderQueryVo.managementSource" open="(" separator="," close=")">
+                    #{source}
+                </foreach>
             </if>
             <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != ''">
                 and io.deptid like "${orderQueryVo.deptId}%"