增加订单查询时，逻辑删除的标记

src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java

@@ -337,8 +337,6 @@ public class OrderServiceImpl implements OrderService {
         //获取门店信息
         CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString()));
 
-        CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId());
-
         RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId());
         SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
         OrderSubPO orderSubPO = orderSubPOList.get(0);
@@ -629,6 +627,7 @@ public class OrderServiceImpl implements OrderService {
         }
         LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(OrderMainPO::getCustomerId, customerId)
+                .eq(OrderMainPO::getDelFlag, "0")
                 .notIn(OrderMainPO::getOrderStatus, Arrays.asList(OrderStatusEnum.AUTO_END.getCode(), OrderStatusEnum.MANUAL_END.getCode()))
                 .orderByDesc(OrderMainPO::getOrderId).last(" limit 1");
         OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper);

src/main/resources/mapper/OrderMainMapper.xml

@@ -12,7 +12,7 @@
             COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_return_count,
             COUNT(CASE WHEN order_status = 'RENT_OVERDUE' THEN 1 END) as overdue_count
         FROM zc_order_main
-        WHERE store_id = #{storeId}
+        WHERE store_id = #{storeId} and del_flag = '0'
         GROUP BY store_id
     </select>
 
@@ -38,6 +38,7 @@
         LEFT JOIN zc_car c on o.vehicle_id = c.id
 
         <where>
+            o.del_flag = '0'
             <if test="customerId != null">
                 and o.customer_id = #{customerId}
             </if>