添加驾意险份数信息

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

@@ -238,6 +238,7 @@ public class OrderVo implements Serializable {
      */
     @TableField(value = "jypremium")
     private BigDecimal jypremium;
+
     /**
      * 车船税费用
      */
@@ -516,4 +517,7 @@ public class OrderVo implements Serializable {
     @ApiModelProperty("费用显示")
     private Boolean feeDisplay;
 
+    @ApiModelProperty("驾意险份数")
+    private String jyQuantity;
+
 }

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

@@ -326,27 +326,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 1. 验证订单参数
         orderComponents.checkEmpty(quoteInfoVo);
 
-        // 1.1 查看是否有订单
-        //一个月内的订单
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime oneMonthAgo = now.minus(1, ChronoUnit.MONTHS);
-        List<InsOrders> insOrdersList = this.list(new LambdaQueryWrapper<InsOrders>()
-                .eq(InsOrders::getProductid,quoteInfoVo.getProductId())
-                .eq(InsOrders::getLicenseno,quoteInfoVo.getCarInfo().getLicenseNo())
-                .eq(InsOrders::getUserid,quoteInfoVo.getUserId())
-                .ge(InsOrders::getCreatetime, oneMonthAgo)
-                .le(InsOrders::getCreatetime, now));
-
-        if(!insOrdersList.isEmpty()){
-            // 修改订单
-            if(!Objects.isNull(quoteInfoVo.getOrderNo()) && !quoteInfoVo.getOrderNo().equals("")){
-                insOrdersList.get(0).setOrderno(quoteInfoVo.getOrderNo());
-                this.updateById(insOrdersList.get(0));
-            }
-
-            return insOrdersList.get(0);
-        }
-
         SysUser user = sysUserService.getById(realUserId);
         SysDept dept = sysDeptService.getById(user.getDeptId());
         // 2 构造订单
@@ -361,6 +340,24 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
 
+//        // 2.1 查看是否有订单
+//        //一个月内的订单
+//        LocalDateTime now = LocalDateTime.now();
+//        LocalDateTime oneMonthAgo = now.minus(1, ChronoUnit.MONTHS);
+//        List<InsOrders> insOrdersList = this.list(new LambdaQueryWrapper<InsOrders>()
+//                .eq(InsOrders::getProductid,quoteInfoVo.getProductId())
+//                .eq(InsOrders::getLicenseno,quoteInfoVo.getCarInfo().getLicenseNo())
+//                .eq(InsOrders::getUserid,quoteInfoVo.getUserId())
+//                .ge(InsOrders::getCreatetime, oneMonthAgo)
+//                .le(InsOrders::getCreatetime, now));
+//
+//        if(!insOrdersList.isEmpty()){
+//            // 修改订单
+//            insOrders.setOrderno(insOrdersList.get(0).getOrderno());
+//            this.updateById(insOrders);
+//            return insOrdersList.get(0);
+//        }
+
         // 代课录单操作
         Integer entryStatus = Optional.ofNullable(insOrders1)
                 .map(InsOrders::getEntryStatus)
@@ -786,6 +783,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
             orderAndAreaCompany.setAccidentInfo(accidentInfo);
             orderAndAreaCompany.setJyName(insAreaCompanyAccidentalDriving.getRideRiskName());
+            orderAndAreaCompany.setJyQuantity(insAreaCompanyAccidentalDriving.getQuantity().toString());
         } else {
             orderAndAreaCompany.setAccidentInfo(new JSONArray());
         }