生成订单 判断代课录单

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

@@ -338,6 +338,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
 
+        // 代课录单操作
+        Integer entryStatus = Optional.ofNullable(insOrders1)
+                .map(InsOrders::getEntryStatus)
+                .orElse(null);
+
+        if (ObjectUtils.isEmpty(entryStatus)) {
+            insOrders.setUpEntryStatus(daikeFlag);
+        } else {
+            insOrders.setEntryStatus(insOrders1.getEntryStatus());
+        }
+
         // 2.1 查看是否有订单   如果存在订单 则更新订单后 直接返回
         //一个月内的订单
         LocalDateTime now = LocalDateTime.now();
@@ -347,6 +358,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .eq(InsOrders::getProductid,quoteInfoVo.getProductId())
                 .eq(InsOrders::getLicenseno,quoteInfoVo.getCarInfo().getLicenseNo())
                 .eq(InsOrders::getUserid,quoteInfoVo.getUserId())
+                .eq(InsOrders::getEntryStatus,insOrders.getEntryStatus())
                 .ge(InsOrders::getCreatetime, oneMonthAgo)
                 .le(InsOrders::getCreatetime, now));
 
@@ -363,16 +375,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             return newOrders;
         }
 
-        // 代课录单操作
-        Integer entryStatus = Optional.ofNullable(insOrders1)
-                .map(InsOrders::getEntryStatus)
-                .orElse(null);
 
-        if (ObjectUtils.isEmpty(entryStatus)) {
-            insOrders.setUpEntryStatus(daikeFlag);
-        } else {
-            insOrders.setEntryStatus(insOrders1.getEntryStatus());
-        }
 
         //需要赋值代录单人ID
         if (ObjectUtils.isEmpty(insOrders1)) {