1.修改驾意险没有传入

2.修改报价查询

src/main/java/com/ydtech/config/resttemplate/CustomResponseErrorHandler.java

@@ -1,6 +1,7 @@
 package com.ydtech.config.resttemplate;
 
 import com.ydtech.exception.SystemException;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.web.client.ResponseErrorHandler;
 
@@ -17,6 +18,9 @@ public class CustomResponseErrorHandler implements ResponseErrorHandler {
     // 处理错误
     @Override
     public void handleError(ClientHttpResponse response) throws IOException {
+        if (response.getStatusCode() == HttpStatus.REQUEST_TIMEOUT) {
+            throw new SystemException("服务器请求超时, 请重试!");
+        }
         throw new SystemException("请求异常" + response.getStatusText());
     }
 

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

@@ -23,4 +23,6 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
     InsOrders getByUseridAndLicenseNo(VerifyOrdersVo verifyOrdersVo);
 
 
+    List<InsOrders> selectByOrderQueryVo(OrderQueryVo orderQueryVo);
+
 }

src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerQuoteResponse.java

@@ -89,24 +89,12 @@ public class CrawlerQuoteResponse extends CrawlerBaseResponse {
     @JsonProperty(value = "drivingInsurances")
     private List<DivingInsurancesDto> drivingInsurances;
 
-    /**
-     * 交叉销售 价格
-     *
-     * @return
-     */
-    @JsonProperty("crossSellingPremium")
-    private Double crossSellingPremium;
-
     @JsonProperty("jq_repeatinfo")
     private String jqRepeatInfo;
 
     @JsonProperty("sy_repeatinfo")
     private String syRepeatInfo;
 
-    public Double getCrossSellingPremium() {
-        return crossSellingPremium == null ? 0 : crossSellingPremium;
-    }
-
     public Double getCarInsureShipTax() {
         return carInsureShipTax == null ? 0 : carInsureShipTax;
     }

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -36,6 +36,9 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "部门ID")
     private String deptId;
 
+    @ApiModelProperty("保险公司编号")
+    private String companyId;
+
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate startDate;

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

@@ -250,15 +250,14 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             BigDecimal bigDecimal = CrawlerQuoteResponse.DivingInsurancesDto.sumPremium(drivingInsurances);
             jyPremium = bigDecimal.doubleValue();
         }
+        // 交叉销售
         quoteRespVo.setJyPremium(jyPremium);
 
-
         quoteRespVo.setRiskList(riskList1);
         quoteRespVo.setKindList(kindList1);
         quoteRespVo.setJqPremium(jqPremium);
         quoteRespVo.setSyPremium(syPremium);
-        // 交叉销售
-        quoteRespVo.setJyPremium(response.getCrossSellingPremium());
+
         quoteRespVo.setCiSumPermium(CalculateUtils.add(response.getForceCarInsureRisk(), response.getCarInsureShipTax()));//交强险和车船税合计
         quoteRespVo.setSumPermium(response.getCarInsureMain());//保费合计
         quoteRespVo.setTaxAmount(response.getCarInsureShipTax());//车船税

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

@@ -182,20 +182,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if ("admin".equals(orderQueryVo.getUserId())) {
             orderQueryVo.setUserId("");
         }
+        PageMethod.startPage(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
+
+        List<InsOrders> insOrders = baseMapper.selectByOrderQueryVo(orderQueryVo);
+        PageInfo<InsOrders> page = new PageInfo<>(insOrders);
 
-        Page<InsOrders> page = lambdaQuery()
-                .eq(StringUtils.isEmpty(orderQueryVo.getDeptId()) && StringUtils.isNotEmpty(orderQueryVo.getUserId()), InsOrders::getUserid, orderQueryVo.getUserId())
-                .eq(StringUtils.isNotEmpty(orderQueryVo.getOrderNo()), InsOrders::getOrderno, orderQueryVo.getOrderNo())
-                .like(StringUtils.isNotEmpty(orderQueryVo.getLicenseNo()), InsOrders::getLicenseno, orderQueryVo.getLicenseNo())
-                .like(StringUtils.isNotEmpty(orderQueryVo.getFrameNo()), InsOrders::getFrameno, orderQueryVo.getFrameNo())
-                .like(StringUtils.isNotEmpty(orderQueryVo.getInsuredName()), InsOrders::getInsuredname, orderQueryVo.getInsuredName())
-                .eq(StringUtils.isNotEmpty(orderQueryVo.getOrderStatus()), InsOrders::getOrderstatus, orderQueryVo.getOrderStatus())
-                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getDeptId()), InsOrders::getDeptid, orderQueryVo.getDeptId())
-                .between(!ObjectUtils.isEmpty(orderQueryVo.getStartDate()) && !ObjectUtils.isEmpty(orderQueryVo.getEndDate()), InsOrders::getCreatetime, orderQueryVo.getStartDate(), orderQueryVo.getEndDate())
-                .orderByDesc(InsOrders::getCreatetime)
-                .page(new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize()));
-
-        return new BasePageResult<>(orderQueryVo.getPageNum(), page.getSize(), page.getTotal(), page.getPages(), page.getRecords());
+        return new BasePageResult<>(orderQueryVo.getPageNum(), page.getSize(), page.getTotal(), page.getPages(), page.getList());
     }
 
     @Override

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

@@ -220,4 +220,43 @@
           and licenseno = #{licenseNo, jdbcType=VARCHAR}
           and createtime > DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
     </select>
+
+    <select id="selectByOrderQueryVo" resultType="com.ydtech.modules.order.entity.InsOrders"  parameterType="com.ydtech.modules.order.entity.vo.OrderQueryVo">
+        select * from ins_orders o
+
+        <if test="companyId != null and companyId != ''">
+            left join ins_area_company iac on iac.orderno = o.orderno
+        </if>
+
+        where 1 = 1
+        <if test="orderNo != null and orderNo != ''">
+            and o.orderno = #{orderNo, jdbcType=VARCHAR}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and o.deptid like CONCAT(#{deptId, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="deptId == null and deptId == '' and userId != null and userId != ''">
+            and o.userid = #{userId, jdbcType=VARCHAR}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and o.orderstatus like CONCAT('%', #{orderStatus, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="frameNo != null and frameNo != ''">
+            and o.frameno like CONCAT('%', #{frameNo, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="licenseNo != null and licenseNo != ''">
+            and o.licenseno like CONCAT('%', #{licenseNo, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="insuredName != null and insuredName != ''">
+            and o.insuredname like CONCAT('%', #{insuredName, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="startDate != null and endDate != null">
+            and o.createtime between #{startDate, jdbcType=TIMESTAMP} and DATE_ADD(#{endDate, jdbcType=TIMESTAMP},
+            INTERVAL 1 DAY)
+        </if>
+        <if test="companyId != null and companyId != ''">
+            and iac.company_id = #{companyId, jdbcType=VARCHAR}
+        </if>
+
+    </select>
 </mapper>