diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
similarity index 87%
rename from dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java
rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
index daf084f2..286ed727 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
@@ -1,12 +1,11 @@
-package cn.iocoder.yudao.module.project.controller.admin;
+package cn.iocoder.yudao.module.order.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/entity/RepairOrderInfo.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/entity/RepairOrderInfo.java
similarity index 88%
rename from dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/entity/RepairOrderInfo.java
rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/order/entity/RepairOrderInfo.java
index 923fb48b..1b7974bd 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/entity/RepairOrderInfo.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/entity/RepairOrderInfo.java
@@ -1,18 +1,13 @@
-package cn.iocoder.yudao.module.project.entity;
+package cn.iocoder.yudao.module.order.entity;
 
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 维修模块 订单 DO
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
similarity index 81%
rename from dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java
rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
index aafcb3fb..0e05c523 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
@@ -1,8 +1,6 @@
-package cn.iocoder.yudao.module.project.mapper;
+package cn.iocoder.yudao.module.order.vo;
 
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
similarity index 88%
rename from dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java
rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
index 01c3beb1..d556af9d 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
@@ -1,10 +1,10 @@
-package cn.iocoder.yudao.module.project.service;
+package cn.iocoder.yudao.module.order.service;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
similarity index 84%
rename from dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java
rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
index 2c9cee9f..234afe7f 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
@@ -1,35 +1,28 @@
-package cn.iocoder.yudao.module.project.service.impl;
+package cn.iocoder.yudao.module.order.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import cn.iocoder.yudao.module.project.mapper.RepairOrderInfoMapper;
-import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
-import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
-import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
-import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoMapper;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
 import cn.iocoder.yudao.util.WechatPayConfig;
 import cn.iocoder.yudao.util.WechatPayRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -45,9 +38,6 @@ public class RepairOrderInfoServiceImpl extends ServiceImpl<RepairOrderInfoMappe
     @Resource
     private RepairOrderInfoMapper repairOrderInfoMapper;
 
-    @Resource
-    @Lazy
-    private DlRepairTicketsService ticketsService;
     @Resource
     private WechatPayConfig wechatPayConfig;
     @Resource
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoPageReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoPageReqVO.java
similarity index 76%
rename from dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoPageReqVO.java
rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoPageReqVO.java
index 812f4c49..4e134b18 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoPageReqVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoPageReqVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.project.vo;
+package cn.iocoder.yudao.module.order.vo;
 
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java
new file mode 100644
index 00000000..4175c1f3
--- /dev/null
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.order.vo;
+
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 维修模块 订单 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class RepairOrderInfoRespVO extends RepairOrderInfo {
+
+    /** 订单状态（工单的状态） */
+    private String status;
+
+
+    //订单描述
+    private String description;
+
+}
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoSaveReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoSaveReqVO.java
new file mode 100644
index 00000000..2d4a6b6d
--- /dev/null
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoSaveReqVO.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.order.vo;
+
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 维修模块 订单新增/修改 Request VO")
+@Data
+public class RepairOrderInfoSaveReqVO extends RepairOrderInfo {
+
+
+}
\ No newline at end of file
diff --git a/dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
similarity index 93%
rename from dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml
rename to dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
index eb90d8a0..eceefe24 100644
--- a/dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.project.mapper.RepairOrderInfoMapper">
+<mapper namespace="cn.iocoder.yudao.module.order.vo.RepairOrderInfoMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
@@ -9,7 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-    <select id="queryListPage" resultType="cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO">
+    <select id="queryListPage" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">
         SELECT
         roi.*
         FROM
@@ -34,7 +34,7 @@
         </where>
     </select>
 
-    <select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO">
+    <select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">
         select roi.*,drt.tickets_work_status as status from repair_order_info roi left join dl_repair_tickets drt on
         roi.goods_id = drt.id
         where roi.deleted = '0'
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/apy/RepairPayApi.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/apy/RepairPayApi.java
index 2938981e..dbdde9bc 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/apy/RepairPayApi.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/apy/RepairPayApi.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.app.apy;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/order/admin/RepairOrderAPI.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/order/admin/RepairOrderAPI.java
index af4558b4..bd10b76d 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/order/admin/RepairOrderAPI.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/order/admin/RepairOrderAPI.java
@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.app.order.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO;
+import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.context.annotation.Lazy;
@@ -39,8 +39,8 @@ public class RepairOrderAPI {
     @GetMapping("/page")
     @Operation(summary = "订单分页查询")
     public CommonResult<?> getOrderPageByStatus(RepairOrderInfoRespVO respVO,
-                                        @RequestParam(value = "pageNo", defaultValue = "1")Integer pageNo,
-                                        @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){
+                                                @RequestParam(value = "pageNo", defaultValue = "1")Integer pageNo,
+                                                @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){
         Page<RepairOrderInfo> page = new Page<>(pageNo, pageSize);
         return success(repairOrderInfoService.getOrderPageByStatus(respVO, page));
     }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairPayController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairPayController.java
index 668513a1..dd250662 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairPayController.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairPayController.java
@@ -1,22 +1,14 @@
 package cn.iocoder.yudao.module.project.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
-import cn.iocoder.yudao.module.project.vo.RepairProjectPageReqVO;
-import cn.iocoder.yudao.module.project.vo.RepairProjectRespVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.v3.oas.annotations.Operation;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoRespVO.java
deleted file mode 100644
index ac138373..00000000
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoRespVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.project.vo;
-
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
-
-@Schema(description = "管理后台 - 维修模块 订单 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class RepairOrderInfoRespVO extends RepairOrderInfo {
-
-    /** 订单状态（工单的状态） */
-    private String status;
-
-    /** 工单信息（包含子表） */
-    private DlRepairTicketsRespVO tickets;
-    //订单描述
-    private String description;
-
-}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoSaveReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoSaveReqVO.java
deleted file mode 100644
index fda65708..00000000
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/vo/RepairOrderInfoSaveReqVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.project.vo;
-
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 维修模块 订单新增/修改 Request VO")
-@Data
-public class RepairOrderInfoSaveReqVO extends RepairOrderInfo {
-
-
-}
\ No newline at end of file
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index a670d553..72f0e601 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -7,20 +7,18 @@ import cn.iocoder.yudao.common.RepairErrorCodeConstants;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.custom.service.CustomerMainService;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
 import cn.iocoder.yudao.module.other.entity.DlRepairOther;
 import cn.iocoder.yudao.module.other.service.DlRepairOtherService;
-import cn.iocoder.yudao.module.project.entity.RepairOrderInfo;
 import cn.iocoder.yudao.module.project.entity.RepairProject;
 import cn.iocoder.yudao.module.project.entity.RepairWares;
-import cn.iocoder.yudao.module.project.service.RepairOrderInfoService;
 import cn.iocoder.yudao.module.project.service.RepairProjectService;
 import cn.iocoder.yudao.module.project.service.RepairWaresService;
-import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
 import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
 import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
 import cn.iocoder.yudao.module.tickets.mapper.DlRepairTicketsMapper;
@@ -38,10 +36,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;