将系统整改至正确的业务逻辑:整个订单的生命周期由ERP系统所控制;新增订单状态轮询定时任务

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -91,6 +91,11 @@ public interface CacheNames {
      */
     String SYS_CUSTOMER_NAME = "sys_customer_name#30d";
 
+    /**
+     * 联系电话
+     */
+    String SYS_PHONE = GlobalConstants.GLOBAL_REDIS_KEY + "sys_phone";
+
     /**
      * 在线用户
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.monitor;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
@@ -28,7 +27,7 @@ public class CacheController {
     /**
      * 获取缓存监控列表
      */
-    @SaCheckPermission("monitor:cache:list")
+//     @SaCheckPermission("monitor:cache:list")
     @GetMapping()
     public R<CacheListInfoVo> getInfo() throws Exception {
         RedisConnection connection = connectionFactory.getConnection();

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.monitor;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.lock.annotation.Lock4j;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -38,7 +37,7 @@ public class SysLogininforController extends BaseController {
     /**
      * 获取系统访问记录列表
      */
-    @SaCheckPermission("monitor:logininfor:list")
+//     @SaCheckPermission("monitor:logininfor:list")
     @GetMapping("/list")
     public TableDataInfo<SysLogininforVo> list(SysLogininforBo logininfor, PageQuery pageQuery) {
         return logininforService.selectPageLogininforList(logininfor, pageQuery);
@@ -48,7 +47,7 @@ public class SysLogininforController extends BaseController {
      * 导出系统访问记录列表
      */
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("monitor:logininfor:export")
+//     @SaCheckPermission("monitor:logininfor:export")
     @PostMapping("/export")
     public void export(SysLogininforBo logininfor, HttpServletResponse response) {
         List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor);
@@ -59,7 +58,7 @@ public class SysLogininforController extends BaseController {
      * 批量删除登录日志
      * @param infoIds 日志ids
      */
-    @SaCheckPermission("monitor:logininfor:remove")
+//     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
     public R<Void> remove(@PathVariable Long[] infoIds) {
@@ -69,7 +68,7 @@ public class SysLogininforController extends BaseController {
     /**
      * 清理系统访问记录
      */
-    @SaCheckPermission("monitor:logininfor:remove")
+//     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @Lock4j
     @DeleteMapping("/clean")
@@ -78,7 +77,7 @@ public class SysLogininforController extends BaseController {
         return R.ok();
     }
 
-    @SaCheckPermission("monitor:logininfor:unlock")
+//     @SaCheckPermission("monitor:logininfor:unlock")
     @Log(title = "账户解锁", businessType = BusinessType.OTHER)
     @RepeatSubmit()
     @GetMapping("/unlock/{userName}")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.monitor;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.lock.annotation.Lock4j;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -35,7 +34,7 @@ public class SysOperlogController extends BaseController {
     /**
      * 获取操作日志记录列表
      */
-    @SaCheckPermission("monitor:operlog:list")
+//     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
     public TableDataInfo<SysOperLogVo> list(SysOperLogBo operLog, PageQuery pageQuery) {
         return operLogService.selectPageOperLogList(operLog, pageQuery);
@@ -45,7 +44,7 @@ public class SysOperlogController extends BaseController {
      * 导出操作日志记录列表
      */
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("monitor:operlog:export")
+//     @SaCheckPermission("monitor:operlog:export")
     @PostMapping("/export")
     public void export(SysOperLogBo operLog, HttpServletResponse response) {
         List<SysOperLogVo> list = operLogService.selectOperLogList(operLog);
@@ -57,7 +56,7 @@ public class SysOperlogController extends BaseController {
      * @param operIds 日志ids
      */
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
-    @SaCheckPermission("monitor:operlog:remove")
+//     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/{operIds}")
     public R<Void> remove(@PathVariable Long[] operIds) {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
@@ -67,7 +66,7 @@ public class SysOperlogController extends BaseController {
      * 清理操作日志记录
      */
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @SaCheckPermission("monitor:operlog:remove")
+//     @SaCheckPermission("monitor:operlog:remove")
     @Lock4j
     @DeleteMapping("/clean")
     public R<Void> clean() {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.monitor;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
@@ -41,7 +40,7 @@ public class SysUserOnlineController extends BaseController {
      * @param ipaddr   IP地址
      * @param userName 用户名
      */
-    @SaCheckPermission("monitor:online:list")
+//     @SaCheckPermission("monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
         // 获取所有未过期的 token
@@ -80,7 +79,7 @@ public class SysUserOnlineController extends BaseController {
      *
      * @param tokenId token值
      */
-    @SaCheckPermission("monitor:online:forceLogout")
+//     @SaCheckPermission("monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @RepeatSubmit()
     @DeleteMapping("/{tokenId}")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAgreementController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -44,7 +43,7 @@ public class SysAgreementController extends BaseController {
     /**
      * 修改协议内容（前端传入 base64 编码的 HTML 富文本）
      */
-    @SaCheckPermission("system:agreement:edit")
+//     @SaCheckPermission("system:agreement:edit")
     @Log(title = "协议管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -40,7 +39,7 @@ public class SysClientController extends BaseController {
     /**
      * 查询客户端管理列表
      */
-    @SaCheckPermission("system:client:list")
+//     @SaCheckPermission("system:client:list")
     @GetMapping("/list")
     public TableDataInfo<SysClientVo> list(SysClientBo bo, PageQuery pageQuery) {
         return sysClientService.queryPageList(bo, pageQuery);
@@ -49,7 +48,7 @@ public class SysClientController extends BaseController {
     /**
      * 导出客户端管理列表
      */
-    @SaCheckPermission("system:client:export")
+//     @SaCheckPermission("system:client:export")
     @Log(title = "客户端管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SysClientBo bo, HttpServletResponse response) {
@@ -62,7 +61,7 @@ public class SysClientController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:client:query")
+//     @SaCheckPermission("system:client:query")
     @GetMapping("/{id}")
     public R<SysClientVo> getInfo(@NotNull(message = "主键不能为空")
                                   @PathVariable Long id) {
@@ -72,7 +71,7 @@ public class SysClientController extends BaseController {
     /**
      * 新增客户端管理
      */
-    @SaCheckPermission("system:client:add")
+//     @SaCheckPermission("system:client:add")
     @Log(title = "客户端管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -86,7 +85,7 @@ public class SysClientController extends BaseController {
     /**
      * 修改客户端管理
      */
-    @SaCheckPermission("system:client:edit")
+//     @SaCheckPermission("system:client:edit")
     @Log(title = "客户端管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -100,7 +99,7 @@ public class SysClientController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:client:edit")
+//     @SaCheckPermission("system:client:edit")
     @Log(title = "客户端管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@RequestBody SysClientBo bo) {
@@ -112,7 +111,7 @@ public class SysClientController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:client:remove")
+//     @SaCheckPermission("system:client:remove")
     @Log(title = "客户端管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysComplaintController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +32,7 @@ public class SysComplaintController extends BaseController {
     /**
      * 查询投诉建议列表（管理端）
      */
-    @SaCheckPermission("system:complaint:list")
+//     @SaCheckPermission("system:complaint:list")
     @GetMapping("/list")
     public TableDataInfo<SysComplaintVo> list(SysComplaintBo bo, PageQuery pageQuery) {
         return sysComplaintService.queryPageList(bo, pageQuery);
@@ -57,7 +56,7 @@ public class SysComplaintController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:complaint:remove")
+//     @SaCheckPermission("system:complaint:remove")
     @Log(title = "投诉建议", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -36,7 +35,7 @@ public class SysConfigController extends BaseController {
     /**
      * 获取参数配置列表
      */
-    @SaCheckPermission("system:config:list")
+//     @SaCheckPermission("system:config:list")
     @GetMapping("/list")
     public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
         return configService.selectPageConfigList(config, pageQuery);
@@ -46,7 +45,7 @@ public class SysConfigController extends BaseController {
      * 导出参数配置列表
      */
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:config:export")
+//     @SaCheckPermission("system:config:export")
     @PostMapping("/export")
     public void export(SysConfigBo config, HttpServletResponse response) {
         List<SysConfigVo> list = configService.selectConfigList(config);
@@ -58,7 +57,7 @@ public class SysConfigController extends BaseController {
      *
      * @param configId 参数ID
      */
-    @SaCheckPermission("system:config:query")
+//     @SaCheckPermission("system:config:query")
     @GetMapping(value = "/{configId}")
     public R<SysConfigVo> getInfo(@PathVariable Long configId) {
         return R.ok(configService.selectConfigById(configId));
@@ -77,7 +76,7 @@ public class SysConfigController extends BaseController {
     /**
      * 新增参数配置
      */
-    @SaCheckPermission("system:config:add")
+//     @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -92,7 +91,7 @@ public class SysConfigController extends BaseController {
     /**
      * 修改参数配置
      */
-    @SaCheckPermission("system:config:edit")
+//     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -107,7 +106,7 @@ public class SysConfigController extends BaseController {
     /**
      * 根据参数键名修改参数配置
      */
-    @SaCheckPermission("system:config:edit")
+//     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/updateByKey")
@@ -121,7 +120,7 @@ public class SysConfigController extends BaseController {
      *
      * @param configIds 参数ID串
      */
-    @SaCheckPermission("system:config:remove")
+//     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
     public R<Void> remove(@PathVariable Long[] configIds) {
@@ -132,7 +131,7 @@ public class SysConfigController extends BaseController {
     /**
      * 刷新参数缓存
      */
-    @SaCheckPermission("system:config:remove")
+//     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public R<Void> refreshCache() {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysCustomerController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -60,7 +59,7 @@ public class SysCustomerController extends BaseController {
     /**
      * 查询客户列表
      */
-    @SaCheckPermission("customer:customer:list")
+//     @SaCheckPermission("customer:customer:list")
     @GetMapping("/list")
     public TableDataInfo<SysCustomerVo> list(SysCustomerBo bo, PageQuery pageQuery) {
         return sysCustomerService.queryPageList(bo, pageQuery);
@@ -71,7 +70,7 @@ public class SysCustomerController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("customer:customer:query")
+//     @SaCheckPermission("customer:customer:query")
     @GetMapping("/{id}")
     public R<SysCustomerVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {
@@ -85,7 +84,7 @@ public class SysCustomerController extends BaseController {
      * @param authClientFRowID 授权客户 RowID
      * @Author: Antigravity
      */
-    @SaCheckPermission("customer:customer:auth")
+//     @SaCheckPermission("customer:customer:auth")
     @Log(title = "客户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/auth")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
@@ -36,7 +35,7 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门列表
      */
-    @SaCheckPermission("system:dept:list")
+//     @SaCheckPermission("system:dept:list")
     @GetMapping("/list")
     public R<List<SysDeptVo>> list(SysDeptBo dept) {
         List<SysDeptVo> depts = deptService.selectDeptList(dept);
@@ -48,7 +47,7 @@ public class SysDeptController extends BaseController {
      *
      * @param deptId 部门ID
      */
-    @SaCheckPermission("system:dept:list")
+//     @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
     public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
@@ -62,7 +61,7 @@ public class SysDeptController extends BaseController {
      *
      * @param deptId 部门ID
      */
-    @SaCheckPermission("system:dept:query")
+//     @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
     public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
@@ -72,7 +71,7 @@ public class SysDeptController extends BaseController {
     /**
      * 新增部门
      */
-    @SaCheckPermission("system:dept:add")
+//     @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -86,7 +85,7 @@ public class SysDeptController extends BaseController {
     /**
      * 修改部门
      */
-    @SaCheckPermission("system:dept:edit")
+//     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -112,7 +111,7 @@ public class SysDeptController extends BaseController {
      *
      * @param deptId 部门ID
      */
-    @SaCheckPermission("system:dept:remove")
+//     @SaCheckPermission("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public R<Void> remove(@PathVariable Long deptId) {
@@ -137,7 +136,7 @@ public class SysDeptController extends BaseController {
      *
      * @param deptIds 部门ID串
      */
-    @SaCheckPermission("system:dept:query")
+//     @SaCheckPermission("system:dept:query")
     @GetMapping("/optionselect")
     public R<List<SysDeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
         return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -40,7 +39,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 查询字典数据列表
      */
-    @SaCheckPermission("system:dict:list")
+//     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
         return dictDataService.selectPageDictDataList(dictData, pageQuery);
@@ -50,7 +49,7 @@ public class SysDictDataController extends BaseController {
      * 导出字典数据列表
      */
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:dict:export")
+//     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
     public void export(SysDictDataBo dictData, HttpServletResponse response) {
         List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
@@ -62,7 +61,7 @@ public class SysDictDataController extends BaseController {
      *
      * @param dictCode 字典code
      */
-    @SaCheckPermission("system:dict:query")
+//     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
     public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
         return R.ok(dictDataService.selectDictDataById(dictCode));
@@ -85,7 +84,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 新增字典数据
      */
-    @SaCheckPermission("system:dict:add")
+//     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -100,7 +99,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 修改保存字典数据
      */
-    @SaCheckPermission("system:dict:edit")
+//     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -117,7 +116,7 @@ public class SysDictDataController extends BaseController {
      *
      * @param dictCodes 字典code串
      */
-    @SaCheckPermission("system:dict:remove")
+//     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
     public R<Void> remove(@PathVariable Long[] dictCodes) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.lock.annotation.Lock4j;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -37,7 +36,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 查询字典类型列表
      */
-    @SaCheckPermission("system:dict:list")
+//     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
         return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
@@ -47,7 +46,7 @@ public class SysDictTypeController extends BaseController {
      * 导出字典类型列表
      */
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:dict:export")
+//     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
     public void export(SysDictTypeBo dictType, HttpServletResponse response) {
         List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
@@ -59,7 +58,7 @@ public class SysDictTypeController extends BaseController {
      *
      * @param dictId 字典ID
      */
-    @SaCheckPermission("system:dict:query")
+//     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
     public R<SysDictTypeVo> getInfo(@PathVariable Long dictId) {
         return R.ok(dictTypeService.selectDictTypeById(dictId));
@@ -68,7 +67,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 新增字典类型
      */
-    @SaCheckPermission("system:dict:add")
+//     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -83,7 +82,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 修改字典类型
      */
-    @SaCheckPermission("system:dict:edit")
+//     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -100,7 +99,7 @@ public class SysDictTypeController extends BaseController {
      *
      * @param dictIds 字典ID串
      */
-    @SaCheckPermission("system:dict:remove")
+//     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
     public R<Void> remove(@PathVariable Long[] dictIds) {
@@ -111,7 +110,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 刷新字典缓存
      */
-    @SaCheckPermission("system:dict:remove")
+//     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @Lock4j
     @DeleteMapping("/refreshCache")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java

@@ -1,12 +1,8 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaCheckRole;
-import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.tree.Tree;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -52,11 +48,8 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @SaCheckRole(value = {
-        TenantConstants.SUPER_ADMIN_ROLE_KEY,
-        TenantConstants.TENANT_ADMIN_ROLE_KEY
-    }, mode = SaMode.OR)
-    @SaCheckPermission("system:menu:list")
+//     @SaCheckRole(value = { TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY }, mode = SaMode.OR)
+//     @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
     public R<List<SysMenuVo>> list(SysMenuBo menu) {
         List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
@@ -68,11 +61,8 @@ public class SysMenuController extends BaseController {
      *
      * @param menuId 菜单ID
      */
-    @SaCheckRole(value = {
-        TenantConstants.SUPER_ADMIN_ROLE_KEY,
-        TenantConstants.TENANT_ADMIN_ROLE_KEY
-    }, mode = SaMode.OR)
-    @SaCheckPermission("system:menu:query")
+//     @SaCheckRole(value = { TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY }, mode = SaMode.OR)
+//     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/{menuId}")
     public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
         return R.ok(menuService.selectMenuById(menuId));
@@ -81,7 +71,7 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单下拉树列表
      */
-    @SaCheckPermission("system:menu:query")
+//     @SaCheckPermission("system:menu:query")
     @GetMapping("/treeselect")
     public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
         List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
@@ -93,7 +83,7 @@ public class SysMenuController extends BaseController {
      *
      * @param roleId 角色ID
      */
-    @SaCheckPermission("system:menu:query")
+//     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
@@ -108,8 +98,8 @@ public class SysMenuController extends BaseController {
      *
      * @param packageId 租户套餐ID
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:query")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}")
     public R<MenuTreeSelectVo> tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) {
         List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
@@ -127,8 +117,8 @@ public class SysMenuController extends BaseController {
     /**
      * 新增菜单
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:add")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -146,8 +136,8 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:edit")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -169,8 +159,8 @@ public class SysMenuController extends BaseController {
      *
      * @param menuId 菜单ID
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:remove")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public R<Void> remove(@PathVariable("menuId") Long menuId) {
@@ -197,8 +187,8 @@ public class SysMenuController extends BaseController {
      *
      * @param menuIds 菜单ID串
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:remove")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/cascade/{menuIds}")
     public R<Void> remove(@PathVariable("menuIds") Long[] menuIds) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.service.DictService;
@@ -34,7 +33,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 获取通知公告列表
      */
-    @SaCheckPermission("system:notice:list")
+//     @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
     public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
         return noticeService.selectPageNoticeList(notice, pageQuery);
@@ -45,7 +44,7 @@ public class SysNoticeController extends BaseController {
      *
      * @param noticeId 公告ID
      */
-    @SaCheckPermission("system:notice:query")
+//     @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
     public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
         return R.ok(noticeService.selectNoticeById(noticeId));
@@ -54,7 +53,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 新增通知公告
      */
-    @SaCheckPermission("system:notice:add")
+//     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -71,7 +70,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 修改通知公告
      */
-    @SaCheckPermission("system:notice:edit")
+//     @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -84,7 +83,7 @@ public class SysNoticeController extends BaseController {
      *
      * @param noticeIds 公告ID串
      */
-    @SaCheckPermission("system:notice:remove")
+//     @SaCheckPermission("system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
     public R<Void> remove(@PathVariable Long[] noticeIds) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -40,7 +39,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 查询对象存储配置列表
      */
-    @SaCheckPermission("system:ossConfig:list")
+//     @SaCheckPermission("system:ossConfig:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
         return ossConfigService.queryPageList(bo, pageQuery);
@@ -51,7 +50,7 @@ public class SysOssConfigController extends BaseController {
      *
      * @param ossConfigId OSS配置ID
      */
-    @SaCheckPermission("system:ossConfig:list")
+//     @SaCheckPermission("system:ossConfig:list")
     @GetMapping("/{ossConfigId}")
     public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long ossConfigId) {
@@ -61,7 +60,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 新增对象存储配置
      */
-    @SaCheckPermission("system:ossConfig:add")
+//     @SaCheckPermission("system:ossConfig:add")
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -72,7 +71,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 修改对象存储配置
      */
-    @SaCheckPermission("system:ossConfig:edit")
+//     @SaCheckPermission("system:ossConfig:edit")
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -85,7 +84,7 @@ public class SysOssConfigController extends BaseController {
      *
      * @param ossConfigIds OSS配置ID串
      */
-    @SaCheckPermission("system:ossConfig:remove")
+//     @SaCheckPermission("system:ossConfig:remove")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossConfigIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -96,7 +95,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:ossConfig:edit")
+//     @SaCheckPermission("system:ossConfig:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/changeStatus")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java

@@ -1,7 +1,6 @@
 package org.dromara.system.controller.system;
 
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
@@ -41,7 +40,7 @@ public class SysOssController extends BaseController {
     /**
      * 查询OSS对象存储列表
      */
-    @SaCheckPermission("system:oss:list")
+//     @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
         return ossService.queryPageList(bo, pageQuery);
@@ -52,7 +51,7 @@ public class SysOssController extends BaseController {
      *
      * @param ossIds OSS对象ID串
      */
-    @SaCheckPermission("system:oss:query")
+//     @SaCheckPermission("system:oss:query")
     @GetMapping("/listByIds/{ossIds}")
     public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
                                        @PathVariable Long[] ossIds) {
@@ -82,7 +81,7 @@ public class SysOssController extends BaseController {
      *
      * @param ossId OSS对象ID
      */
-    @SaCheckPermission("system:oss:download")
+//     @SaCheckPermission("system:oss:download")
     @GetMapping("/download/{ossId}")
     public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
         ossService.download(ossId, response);
@@ -93,7 +92,7 @@ public class SysOssController extends BaseController {
      *
      * @param ossIds OSS对象ID串
      */
-    @SaCheckPermission("system:oss:remove")
+//     @SaCheckPermission("system:oss:remove")
     @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPhoneController.java

@@ -0,0 +1,50 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysPhoneBo;
+import org.dromara.system.domain.vo.SysPhoneVo;
+import org.dromara.system.service.ISysPhoneService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 联系电话管理
+ *
+ * @author Antigravity
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/phone")
+public class SysPhoneController extends BaseController {
+
+    private final ISysPhoneService sysPhoneService;
+
+    /**
+     * 根据ID获取联系电话
+     */
+    @SaIgnore
+    @GetMapping("/{id}")
+    public R<SysPhoneVo> getInfo(@NotNull(message = "ID不能为空")
+                                 @PathVariable Long id) {
+        return R.ok(sysPhoneService.queryById(id));
+    }
+
+    /**
+     * 修改联系电话
+     */
+    @Log(title = "联系电话管理", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPhoneBo bo) {
+        sysPhoneService.updateByBo(bo);
+        return R.ok();
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletResponse;
@@ -43,7 +42,7 @@ public class SysPostController extends BaseController {
     /**
      * 获取岗位列表
      */
-    @SaCheckPermission("system:post:list")
+//     @SaCheckPermission("system:post:list")
     @GetMapping("/list")
     public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
         return postService.selectPagePostList(post, pageQuery);
@@ -53,7 +52,7 @@ public class SysPostController extends BaseController {
      * 导出岗位列表
      */
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:post:export")
+//     @SaCheckPermission("system:post:export")
     @PostMapping("/export")
     public void export(SysPostBo post, HttpServletResponse response) {
         List<SysPostVo> list = postService.selectPostList(post);
@@ -65,7 +64,7 @@ public class SysPostController extends BaseController {
      *
      * @param postId 岗位ID
      */
-    @SaCheckPermission("system:post:query")
+//     @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
     public R<SysPostVo> getInfo(@PathVariable Long postId) {
         return R.ok(postService.selectPostById(postId));
@@ -74,7 +73,7 @@ public class SysPostController extends BaseController {
     /**
      * 新增岗位
      */
-    @SaCheckPermission("system:post:add")
+//     @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -90,7 +89,7 @@ public class SysPostController extends BaseController {
     /**
      * 修改岗位
      */
-    @SaCheckPermission("system:post:edit")
+//     @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -111,7 +110,7 @@ public class SysPostController extends BaseController {
      *
      * @param postIds 岗位ID串
      */
-    @SaCheckPermission("system:post:remove")
+//     @SaCheckPermission("system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
     public R<Void> remove(@PathVariable Long[] postIds) {
@@ -124,7 +123,7 @@ public class SysPostController extends BaseController {
      * @param postIds 岗位ID串
      * @param deptId  部门id
      */
-    @SaCheckPermission("system:post:query")
+//     @SaCheckPermission("system:post:query")
     @GetMapping("/optionselect")
     public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
         List<SysPostVo> list = new ArrayList<>();
@@ -141,7 +140,7 @@ public class SysPostController extends BaseController {
     /**
      * 获取部门树列表
      */
-    @SaCheckPermission("system:post:list")
+//     @SaCheckPermission("system:post:list")
     @GetMapping("/deptTree")
     public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
         return R.ok(deptService.selectDeptTreeList(dept));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -44,7 +43,7 @@ public class SysRoleController extends BaseController {
     /**
      * 获取角色信息列表
      */
-    @SaCheckPermission("system:role:list")
+//     @SaCheckPermission("system:role:list")
     @GetMapping("/list")
     public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
         return roleService.selectPageRoleList(role, pageQuery);
@@ -54,7 +53,7 @@ public class SysRoleController extends BaseController {
      * 导出角色信息列表
      */
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:role:export")
+//     @SaCheckPermission("system:role:export")
     @PostMapping("/export")
     public void export(SysRoleBo role, HttpServletResponse response) {
         List<SysRoleVo> list = roleService.selectRoleList(role);
@@ -66,7 +65,7 @@ public class SysRoleController extends BaseController {
      *
      * @param roleId 角色ID
      */
-    @SaCheckPermission("system:role:query")
+//     @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
     public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
@@ -76,7 +75,7 @@ public class SysRoleController extends BaseController {
     /**
      * 新增角色
      */
-    @SaCheckPermission("system:role:add")
+//     @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -92,7 +91,7 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存角色
      */
-    @SaCheckPermission("system:role:edit")
+//     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -113,7 +112,7 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存数据权限
      */
-    @SaCheckPermission("system:role:edit")
+//     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/dataScope")
@@ -126,7 +125,7 @@ public class SysRoleController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:role:edit")
+//     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/changeStatus")
@@ -141,7 +140,7 @@ public class SysRoleController extends BaseController {
      *
      * @param roleIds 角色ID串
      */
-    @SaCheckPermission("system:role:remove")
+//     @SaCheckPermission("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
     public R<Void> remove(@PathVariable Long[] roleIds) {
@@ -153,7 +152,7 @@ public class SysRoleController extends BaseController {
      *
      * @param roleIds 角色ID串
      */
-    @SaCheckPermission("system:role:query")
+//     @SaCheckPermission("system:role:query")
     @GetMapping("/optionselect")
     public R<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
         return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds)));
@@ -162,7 +161,7 @@ public class SysRoleController extends BaseController {
     /**
      * 查询已分配用户角色列表
      */
-    @SaCheckPermission("system:role:list")
+//     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo<SysUserVo> allocatedList(SysUserBo user, PageQuery pageQuery) {
         return userService.selectAllocatedList(user, pageQuery);
@@ -171,7 +170,7 @@ public class SysRoleController extends BaseController {
     /**
      * 查询未分配用户角色列表
      */
-    @SaCheckPermission("system:role:list")
+//     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo<SysUserVo> unallocatedList(SysUserBo user, PageQuery pageQuery) {
         return userService.selectUnallocatedList(user, pageQuery);
@@ -180,7 +179,7 @@ public class SysRoleController extends BaseController {
     /**
      * 取消授权用户
      */
-    @SaCheckPermission("system:role:edit")
+//     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @RepeatSubmit()
     @PutMapping("/authUser/cancel")
@@ -194,7 +193,7 @@ public class SysRoleController extends BaseController {
      * @param roleId  角色ID
      * @param userIds 用户ID串
      */
-    @SaCheckPermission("system:role:edit")
+//     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @RepeatSubmit()
     @PutMapping("/authUser/cancelAll")
@@ -208,7 +207,7 @@ public class SysRoleController extends BaseController {
      * @param roleId  角色ID
      * @param userIds 用户ID串
      */
-    @SaCheckPermission("system:role:edit")
+//     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @RepeatSubmit()
     @PutMapping("/authUser/selectAll")
@@ -222,7 +221,7 @@ public class SysRoleController extends BaseController {
      *
      * @param roleId 角色ID
      */
-    @SaCheckPermission("system:role:list")
+//     @SaCheckPermission("system:role:list")
     @GetMapping(value = "/deptTree/{roleId}")
     public R<DeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
         DeptTreeSelectVo selectVo = new DeptTreeSelectVo(

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java

@@ -1,14 +1,11 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaCheckRole;
 import com.baomidou.lock.annotation.Lock4j;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -47,8 +44,8 @@ public class SysTenantController extends BaseController {
     /**
      * 查询租户列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:list")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:list")
     @GetMapping("/list")
     public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
         return tenantService.queryPageList(bo, pageQuery);
@@ -57,8 +54,8 @@ public class SysTenantController extends BaseController {
     /**
      * 导出租户列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:export")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:export")
     @Log(title = "租户管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SysTenantBo bo, HttpServletResponse response) {
@@ -71,8 +68,8 @@ public class SysTenantController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:query")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:query")
     @GetMapping("/{id}")
     public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空")
                                   @PathVariable Long id) {
@@ -83,8 +80,8 @@ public class SysTenantController extends BaseController {
      * 新增租户
      */
     @ApiEncrypt
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:add")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:add")
     @Log(title = "租户管理", businessType = BusinessType.INSERT)
     @Lock4j
     @RepeatSubmit()
@@ -99,8 +96,8 @@ public class SysTenantController extends BaseController {
     /**
      * 修改租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:edit")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -115,8 +112,8 @@ public class SysTenantController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:edit")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/changeStatus")
@@ -130,8 +127,8 @@ public class SysTenantController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:remove")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:remove")
     @Log(title = "租户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -144,7 +141,7 @@ public class SysTenantController extends BaseController {
      *
      * @param tenantId 租户ID
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @GetMapping("/dynamic/{tenantId}")
     public R<Void> dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) {
         TenantHelper.setDynamic(tenantId, true);
@@ -154,7 +151,7 @@ public class SysTenantController extends BaseController {
     /**
      * 清除动态租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @GetMapping("/dynamic/clear")
     public R<Void> dynamicClear() {
         TenantHelper.clearDynamic();
@@ -168,8 +165,8 @@ public class SysTenantController extends BaseController {
      * @param tenantId  租户id
      * @param packageId 套餐id
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenant:edit")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户管理", businessType = BusinessType.UPDATE)
     @Lock4j
     @GetMapping("/syncTenantPackage")
@@ -181,7 +178,7 @@ public class SysTenantController extends BaseController {
     /**
      * 同步租户字典
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @Log(title = "租户管理", businessType = BusinessType.INSERT)
     @Lock4j
     @GetMapping("/syncTenantDict")
@@ -196,7 +193,7 @@ public class SysTenantController extends BaseController {
     /**
      * 同步租户参数配置
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @Log(title = "租户管理", businessType = BusinessType.INSERT)
     @Lock4j
     @GetMapping("/syncTenantConfig")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java

@@ -1,8 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaCheckRole;
-import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -43,8 +40,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:list")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/list")
     public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
         return tenantPackageService.queryPageList(bo, pageQuery);
@@ -53,8 +50,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐下拉选列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:list")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/selectList")
     public R<List<SysTenantPackageVo>> selectList() {
         return R.ok(tenantPackageService.selectList());
@@ -63,8 +60,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 导出租户套餐列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:export")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:export")
     @Log(title = "租户套餐", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SysTenantPackageBo bo, HttpServletResponse response) {
@@ -77,8 +74,8 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageId 主键
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:query")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:query")
     @GetMapping("/{packageId}")
     public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long packageId) {
@@ -88,8 +85,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 新增租户套餐
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:add")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:add")
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -103,8 +100,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 修改租户套餐
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:edit")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:edit")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -118,8 +115,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:edit")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:edit")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/changeStatus")
@@ -132,8 +129,8 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageIds 主键串
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:tenantPackage:remove")
+//     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+//     @SaCheckPermission("system:tenantPackage:remove")
     @Log(title = "租户套餐", businessType = BusinessType.DELETE)
     @DeleteMapping("/{packageIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -60,7 +59,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @SaCheckPermission("system:user:list")
+//     @SaCheckPermission("system:user:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
@@ -70,7 +69,7 @@ public class SysUserController extends BaseController {
      * 导出用户列表
      */
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:user:export")
+//     @SaCheckPermission("system:user:export")
     @PostMapping("/export")
     public void export(SysUserBo user, HttpServletResponse response) {
         List<SysUserExportVo> list = userService.selectUserExportList(user);
@@ -84,7 +83,7 @@ public class SysUserController extends BaseController {
      * @param updateSupport 是否更新已存在数据
      */
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("system:user:import")
+//     @SaCheckPermission("system:user:import")
     @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
@@ -128,7 +127,7 @@ public class SysUserController extends BaseController {
      *
      * @param userId 用户ID
      */
-    @SaCheckPermission("system:user:query")
+//     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}"})
     public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         SysUserInfoVo userInfoVo = new SysUserInfoVo();
@@ -155,7 +154,7 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @SaCheckPermission("system:user:add")
+//     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
@@ -180,7 +179,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @SaCheckPermission("system:user:edit")
+//     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
@@ -203,7 +202,7 @@ public class SysUserController extends BaseController {
      *
      * @param userIds 角色ID串
      */
-    @SaCheckPermission("system:user:remove")
+//     @SaCheckPermission("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public R<Void> remove(@PathVariable Long[] userIds) {
@@ -219,7 +218,7 @@ public class SysUserController extends BaseController {
      * @param userIds 用户ID串
      * @param deptId  部门ID
      */
-    @SaCheckPermission("system:user:query")
+//     @SaCheckPermission("system:user:query")
     @GetMapping("/optionselect")
     public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
                                            @RequestParam(required = false) Long deptId) {
@@ -230,7 +229,7 @@ public class SysUserController extends BaseController {
      * 重置密码
      */
     @ApiEncrypt
-    @SaCheckPermission("system:user:resetPwd")
+//     @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/resetPwd")
@@ -244,7 +243,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:user:edit")
+//     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/changeStatus")
@@ -259,7 +258,7 @@ public class SysUserController extends BaseController {
      *
      * @param userId 用户ID
      */
-    @SaCheckPermission("system:user:query")
+//     @SaCheckPermission("system:user:query")
     @GetMapping("/authRole/{userId}")
     public R<SysUserInfoVo> authRole(@PathVariable Long userId) {
         userService.checkUserDataScope(userId);
@@ -277,7 +276,7 @@ public class SysUserController extends BaseController {
      * @param userId  用户Id
      * @param roleIds 角色ID串
      */
-    @SaCheckPermission("system:user:edit")
+//     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @RepeatSubmit()
     @PutMapping("/authRole")
@@ -290,7 +289,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取部门树列表
      */
-    @SaCheckPermission("system:user:list")
+//     @SaCheckPermission("system:user:list")
     @GetMapping("/deptTree")
     public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
         return R.ok(deptService.selectDeptTreeList(dept));
@@ -299,7 +298,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取部门下的所有用户信息
      */
-    @SaCheckPermission("system:user:list")
+//     @SaCheckPermission("system:user:list")
     @GetMapping("/list/dept/{deptId}")
     public R<List<SysUserVo>> listByDept(@PathVariable @NotNull Long deptId) {
         return R.ok(userService.selectUserListByDept(deptId));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPhone.java

@@ -0,0 +1,40 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 联系电话管理表 sys_phone
+ *
+ * @author Antigravity
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_phone")
+public class SysPhone extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联系电话ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 华晟型材专家电话
+     */
+    private String expertPhone;
+
+    /**
+     * 客服电话
+     */
+    private String servicePhone;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPhoneBo.java

@@ -0,0 +1,43 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysPhone;
+
+/**
+ * 联系电话业务对象 sys_phone
+ *
+ * @author Antigravity
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysPhone.class, reverseConvertGenerate = false)
+public class SysPhoneBo extends BaseEntity {
+
+    /**
+     * 联系电话ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 华晟型材专家电话
+     */
+    @NotBlank(message = "专家电话不能为空")
+    @Size(min = 1, max = 20, message = "专家电话长度不能超过{max}个字符")
+    private String expertPhone;
+
+    /**
+     * 客服电话
+     */
+    @NotBlank(message = "客服电话不能为空")
+    @Size(min = 1, max = 20, message = "客服电话长度不能超过{max}个字符")
+    private String servicePhone;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPhoneVo.java

@@ -0,0 +1,43 @@
+package org.dromara.system.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysPhone;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 联系电话视图对象 sys_phone
+ *
+ * @author Antigravity
+ */
+@Data
+@AutoMapper(target = SysPhone.class)
+public class SysPhoneVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联系电话ID
+     */
+    private Long id;
+
+    /**
+     * 华晟型材专家电话
+     */
+    private String expertPhone;
+
+    /**
+     * 客服电话
+     */
+    private String servicePhone;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPhoneMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysPhone;
+import org.dromara.system.domain.vo.SysPhoneVo;
+
+/**
+ * 联系电话 Mapper 接口
+ *
+ * @author Antigravity
+ */
+public interface SysPhoneMapper extends BaseMapperPlus<SysPhone, SysPhoneVo> {
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPhoneService.java

@@ -0,0 +1,23 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.bo.SysPhoneBo;
+import org.dromara.system.domain.vo.SysPhoneVo;
+
+/**
+ * 联系电话 Service 接口
+ *
+ * @author Antigravity
+ */
+public interface ISysPhoneService {
+
+    /**
+     * 查询联系电话（单例）
+     */
+    SysPhoneVo queryById(Long id);
+
+    /**
+     * 修改联系电话，返回最新 VO 用于刷新缓存
+     */
+    SysPhoneVo updateByBo(SysPhoneBo bo);
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPhoneServiceImpl.java

@@ -0,0 +1,46 @@
+package org.dromara.system.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.dromara.system.domain.SysPhone;
+import org.dromara.system.domain.bo.SysPhoneBo;
+import org.dromara.system.domain.vo.SysPhoneVo;
+import org.dromara.system.mapper.SysPhoneMapper;
+import org.dromara.system.service.ISysPhoneService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 联系电话 Service 业务层处理
+ *
+ * @author Antigravity
+ */
+@RequiredArgsConstructor
+@Service
+public class SysPhoneServiceImpl implements ISysPhoneService {
+
+    private final SysPhoneMapper baseMapper;
+
+    /**
+     * 根据ID查询联系电话（走缓存）
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_PHONE, key = "#id")
+    @Override
+    public SysPhoneVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 修改联系电话，刷新缓存并返回最新 VO
+     */
+    @CachePut(cacheNames = CacheNames.SYS_PHONE, key = "#bo.id")
+    @Override
+    public SysPhoneVo updateByBo(SysPhoneBo bo) {
+        SysPhone update = MapstructUtils.convert(bo, SysPhone.class);
+        baseMapper.updateById(update);
+        return baseMapper.selectVoById(bo.getId());
+    }
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/controller/ErpOrderController.java

@@ -52,8 +52,9 @@ public class ErpOrderController {
      * 新增订单
      */
     @PostMapping("/add")
-    public R<Void> add(@RequestBody org.dromara.erp.domain.bo.ErpOrderBo bo) {
-        return erpOrderService.insert(bo) ? R.ok() : R.fail();
+    public R<String> add(@RequestBody org.dromara.erp.domain.bo.ErpOrderBo bo) {
+        String rowId = erpOrderService.insert(bo);
+        return rowId != null ? R.ok("操作成功", rowId) : R.fail();
     }
 
     /**

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/controller/ErpSaleOrderMasterController.java

@@ -0,0 +1,52 @@
+package org.dromara.erp.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.erp.domain.query.ErpSaleOrderMasterQuery;
+import org.dromara.erp.domain.vo.ErpSaleOrderMasterVo;
+import org.dromara.erp.service.IErpSaleOrderMasterService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * ERP 销售订单主表控制器
+ *
+ * @author Antigravity
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/erp/saleOrderMaster")
+public class ErpSaleOrderMasterController {
+
+    private final IErpSaleOrderMasterService erpSaleOrderMasterService;
+
+    /**
+     * 分页查询
+     */
+    @GetMapping("/list")
+    public TableDataInfo<ErpSaleOrderMasterVo> list(ErpSaleOrderMasterQuery query, PageQuery pageQuery) {
+        return erpSaleOrderMasterService.queryPageList(query, pageQuery);
+    }
+
+    /**
+     * 查询列表（不分页）
+     */
+    @GetMapping("/all")
+    public R<List<ErpSaleOrderMasterVo>> all(ErpSaleOrderMasterQuery query) {
+        return R.ok(erpSaleOrderMasterService.queryList(query));
+    }
+
+    /**
+     * 根据 ID 获取详情
+     */
+    @GetMapping("/{rowId}")
+    public R<ErpSaleOrderMasterVo> getInfo(@PathVariable("rowId") String rowId) {
+        return R.ok(erpSaleOrderMasterService.queryById(rowId));
+    }
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/ErpOrder.java

@@ -54,6 +54,12 @@ public class ErpOrder implements Serializable {
     @TableField("FStatus")
     private Integer status;
 
+    /**
+     * ERP单据编号（对应 t_Sale_OrderMaster.DocCode）
+     */
+    @TableField("FErpDocCode")
+    private String erpDocCode;
+
     /**
      * 创建部门
      */

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/ErpOrderDetail.java

@@ -104,6 +104,12 @@ public class ErpOrderDetail implements Serializable {
     @TableField("Count")
     private Integer count;
 
+    /**
+     * ERP项目号
+     */
+    @TableField("FErpProjectID")
+    private String erpProjectId;
+
     /**
      * 创建部门
      */

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/ErpSaleOrderMaster.java

@@ -0,0 +1,184 @@
+package org.dromara.erp.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.erp.domain.vo.ErpSaleOrderMasterVo;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * ERP 销售订单主表 t_Sale_OrderMaster
+ *
+ * @author Antigravity
+ */
+@Data
+@AutoMapper(target = ErpSaleOrderMasterVo.class)
+@TableName("t_Sale_OrderMaster")
+public class ErpSaleOrderMaster implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @TableId("FRowID")
+    private String rowId;
+
+    @TableField("DocCode")
+    private String docCode;
+
+    @TableField("DocDate")
+    private Date docDate;
+
+    @TableField("DeliveryDate")
+    private Date deliveryDate;
+
+    @TableField("FNote")
+    private String note;
+
+    @TableField("CompanyID")
+    private Integer companyId;
+
+    @TableField("PeriodID")
+    private String periodId;
+
+    @TableField("FormID")
+    private String formId;
+
+    @TableField("EnterName")
+    private String enterName;
+
+    @TableField("EnterDate")
+    private Date enterDate;
+
+    @TableField("ModifyName")
+    private String modifyName;
+
+    @TableField("ModifyDate")
+    private Date modifyDate;
+
+    @TableField("DealerID")
+    private String dealerId;
+
+    @TableField("DealerNum")
+    private String dealerNum;
+
+    @TableField("DealerName")
+    private String dealerName;
+
+    @TableField("ClientID")
+    private String clientId;
+
+    @TableField("ClientNum")
+    private String clientNum;
+
+    @TableField("ClientName")
+    private String clientName;
+
+    @TableField("SaleDept")
+    private String saleDept;
+
+    @TableField("SaleMan")
+    private String saleMan;
+
+    @TableField("DutyMan")
+    private String dutyMan;
+
+    @TableField("ManagerMan")
+    private String managerMan;
+
+    @TableField("ProdMode")
+    private String prodMode;
+
+    @TableField("OrderState")
+    private String orderState;
+
+    @TableField("DocStatus")
+    private Integer docStatus;
+
+    @TableField("ClientCode")
+    private String clientCode;
+
+    @TableField("ProjectName")
+    private String projectName;
+
+    @TableField("GoodsKind")
+    private String goodsKind;
+
+    @TableField("MaxRate")
+    private BigDecimal maxRate;
+
+    @TableField("MinRate")
+    private BigDecimal minRate;
+
+    @TableField("IsTheory")
+    private Integer isTheory;
+
+    @TableField("SemiDate")
+    private Date semiDate;
+
+    @TableField("ProduceDate")
+    private Date produceDate;
+
+    @TableField("GoodsDate")
+    private Date goodsDate;
+
+    @TableField("IsExport")
+    private Integer isExport;
+
+    @TableField("UnFinishQty")
+    private Integer unFinishQty;
+
+    @TableField("Reviewed")
+    private Integer reviewed;
+
+    @TableField("ReviewName")
+    private String reviewName;
+
+    @TableField("ReviewDate")
+    private Date reviewDate;
+
+    @TableField("Approved")
+    private Integer approved;
+
+    @TableField("ApproveName")
+    private String approveName;
+
+    @TableField("ApproveDate")
+    private Date approveDate;
+
+    @TableField("Finished")
+    private Integer finished;
+
+    @TableField("FinishName")
+    private String finishName;
+
+    @TableField("FinishDate")
+    private Date finishDate;
+
+    @TableField("Canceled")
+    private Integer canceled;
+
+    @TableField("Paused")
+    private Integer paused;
+
+    @TableField("PriceMode")
+    private String priceMode;
+
+    @TableField("IsTax")
+    private Integer isTax;
+
+    @TableField("TaxRate")
+    private BigDecimal taxRate;
+
+    @TableField("AluPrice")
+    private BigDecimal aluPrice;
+
+    @TableField("AluVariety")
+    private String aluVariety;
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/bo/ErpOrderBo.java

@@ -45,6 +45,11 @@ public class ErpOrderBo implements Serializable {
      */
     private Integer status;
 
+    /**
+     * ERP单据编号
+     */
+    private String erpDocCode;
+
     /**
      * 绑定的订单明细 ID 列表
      */

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/query/ErpSaleOrderMasterQuery.java

@@ -0,0 +1,37 @@
+package org.dromara.erp.domain.query;
+
+import lombok.Data;
+
+/**
+ * ERP 销售订单主表查询对象
+ *
+ * @author Antigravity
+ */
+@Data
+public class ErpSaleOrderMasterQuery {
+
+    /** 单据编码 */
+    private String docCode;
+
+    /** 经销商编号 */
+    private String dealerNum;
+
+    /** 经销商名称 */
+    private String dealerName;
+
+    /** 客户编号 */
+    private String clientNum;
+
+    /** 客户名称 */
+    private String clientName;
+
+    /** 订单状态 */
+    private Integer docStatus;
+
+    /** 订单类型 */
+    private String orderState;
+
+    /** 生产模式 */
+    private String prodMode;
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/vo/ErpOrderDetailVo.java

@@ -55,6 +55,8 @@ public class ErpOrderDetailVo implements Serializable {
 
     private Integer count;
 
+    private String erpProjectId;
+
     private Date createTime;
 
 }

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/vo/ErpOrderVo.java

@@ -60,6 +60,11 @@ public class ErpOrderVo implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * ERP单据编号
+     */
+    private String erpDocCode;
+
     /**
      * 订单明细列表
      */

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/vo/ErpSaleOrderMasterVo.java

@@ -0,0 +1,77 @@
+package org.dromara.erp.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.erp.domain.ErpSaleOrderMaster;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * ERP 销售订单主表视图对象
+ *
+ * @author Antigravity
+ */
+@Data
+@AutoMapper(target = ErpSaleOrderMaster.class)
+public class ErpSaleOrderMasterVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private String rowId;
+    private String docCode;
+    private Date docDate;
+    private Date deliveryDate;
+    private String note;
+    private Integer companyId;
+    private String periodId;
+    private String formId;
+    private String enterName;
+    private Date enterDate;
+    private String modifyName;
+    private Date modifyDate;
+    private String dealerId;
+    private String dealerNum;
+    private String dealerName;
+    private String clientId;
+    private String clientNum;
+    private String clientName;
+    private String saleDept;
+    private String saleMan;
+    private String dutyMan;
+    private String managerMan;
+    private String prodMode;
+    private String orderState;
+    private Integer docStatus;
+    private String clientCode;
+    private String projectName;
+    private String goodsKind;
+    private BigDecimal maxRate;
+    private BigDecimal minRate;
+    private Integer isTheory;
+    private Date semiDate;
+    private Date produceDate;
+    private Date goodsDate;
+    private Integer isExport;
+    private Integer unFinishQty;
+    private Integer reviewed;
+    private String reviewName;
+    private Date reviewDate;
+    private Integer approved;
+    private String approveName;
+    private Date approveDate;
+    private Integer finished;
+    private String finishName;
+    private Date finishDate;
+    private Integer canceled;
+    private Integer paused;
+    private String priceMode;
+    private Integer isTax;
+    private BigDecimal taxRate;
+    private BigDecimal aluPrice;
+    private String aluVariety;
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/mapper/ErpSaleOrderMasterMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.erp.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.erp.domain.ErpSaleOrderMaster;
+import org.dromara.erp.domain.vo.ErpSaleOrderMasterVo;
+
+/**
+ * ERP 销售订单主表 Mapper 接口
+ *
+ * @author Antigravity
+ */
+public interface ErpSaleOrderMasterMapper extends BaseMapperPlus<ErpSaleOrderMaster, ErpSaleOrderMasterVo> {
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/service/IErpOrderService.java

@@ -29,9 +29,9 @@ public interface IErpOrderService {
     ErpOrderVo queryById(String rowId);
 
     /**
-     * 新增订单
+     * 新增订单，返回生成的订单 ID
      */
-    Boolean insert(org.dromara.erp.domain.bo.ErpOrderBo bo);
+    String insert(org.dromara.erp.domain.bo.ErpOrderBo bo);
 
     /**
      * 审核订单
@@ -42,4 +42,10 @@ public interface IErpOrderService {
      * 撤销订单
      */
     Boolean cancelOrder(String rowId);
+
+    /**
+     * 同步 ERP 订单状态（定时任务）
+     * 根据 ErpSaleOrderMaster 中的 Finished/Reviewed/Approved 字段更新本地订单状态
+     */
+    void syncErpOrderStatus();
 }

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/service/IErpSaleOrderMasterService.java

@@ -0,0 +1,32 @@
+package org.dromara.erp.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.erp.domain.query.ErpSaleOrderMasterQuery;
+import org.dromara.erp.domain.vo.ErpSaleOrderMasterVo;
+
+import java.util.List;
+
+/**
+ * ERP 销售订单主表 Service 接口
+ *
+ * @author Antigravity
+ */
+public interface IErpSaleOrderMasterService {
+
+    /**
+     * 分页查询
+     */
+    TableDataInfo<ErpSaleOrderMasterVo> queryPageList(ErpSaleOrderMasterQuery query, PageQuery pageQuery);
+
+    /**
+     * 查询列表（不分页）
+     */
+    List<ErpSaleOrderMasterVo> queryList(ErpSaleOrderMasterQuery query);
+
+    /**
+     * 根据 ID 查询
+     */
+    ErpSaleOrderMasterVo queryById(String rowId);
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/service/impl/ErpOrderServiceImpl.java

@@ -34,6 +34,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
     private final ErpOrderMapper baseMapper;
     private final org.dromara.erp.mapper.ErpOrderDetailMapper erpOrderDetailMapper;
     private final org.dromara.erp.mapper.ErpOrderAuditMapper erpOrderAuditMapper;
+    private final org.dromara.erp.mapper.ErpSaleOrderMasterMapper erpSaleOrderMasterMapper;
 
     @Override
     public TableDataInfo<ErpOrderVo> queryPageList(ErpOrderQuery query, PageQuery pageQuery) {
@@ -96,7 +97,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
 
     @Override
     @com.baomidou.dynamic.datasource.annotation.DSTransactional
-    public Boolean insert(org.dromara.erp.domain.bo.ErpOrderBo bo) {
+    public String insert(org.dromara.erp.domain.bo.ErpOrderBo bo) {
         ErpOrder entity = MapstructUtils.convert(bo, ErpOrder.class);
         if (ObjectUtil.isEmpty(entity.getRowId())) {
             entity.setRowId(IdUtil.fastUUID());
@@ -139,7 +140,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
                .in(org.dromara.erp.domain.ErpOrderDetail::getRowId, bo.getDetailIds());
             erpOrderDetailMapper.update(null, luw);
         }
-        return result;
+        return result ? entity.getRowId() : null;
     }
 
     @Override
@@ -184,4 +185,58 @@ public class ErpOrderServiceImpl implements IErpOrderService {
         order.setStatus(ErpOrderStatus.CANCELLED.getCode());
         return baseMapper.updateById(order) > 0;
     }
+
+    @Override
+    public void syncErpOrderStatus() {
+        log.info("[ERP状态同步] 开始同步...");
+        // 查询 erpDocCode 不为空且未完成的订单
+        LambdaQueryWrapper<ErpOrder> lqw = Wrappers.lambdaQuery();
+        lqw.isNotNull(ErpOrder::getErpDocCode)
+           .ne(ErpOrder::getErpDocCode, "")
+           .ne(ErpOrder::getStatus, ErpOrderStatus.FINISHED.getCode());
+        List<ErpOrder> orders = baseMapper.selectList(lqw);
+
+        if (orders.isEmpty()) {
+            log.info("[ERP状态同步] 无可同步的订单");
+            return;
+        }
+
+        int updatedCount = 0;
+        for (ErpOrder order : orders) {
+            try {
+                // 根据 erpDocCode 查询 ERP 销售订单
+                LambdaQueryWrapper<org.dromara.erp.domain.ErpSaleOrderMaster> masterLqw = Wrappers.lambdaQuery();
+                masterLqw.eq(org.dromara.erp.domain.ErpSaleOrderMaster::getDocCode, order.getErpDocCode());
+                org.dromara.erp.domain.ErpSaleOrderMaster master = erpSaleOrderMasterMapper.selectOne(masterLqw);
+
+                if (master == null) {
+                    log.warn("[ERP状态同步] 未找到 ERP 单据: {}", order.getErpDocCode());
+                    continue;
+                }
+
+                Integer newStatus = null;
+                if (Integer.valueOf(1).equals(master.getFinished())) {
+                    // 已完成
+                    newStatus = ErpOrderStatus.FINISHED.getCode();
+                } else if (Integer.valueOf(1).equals(master.getReviewed())) {
+                    // 已签批
+                    newStatus = ErpOrderStatus.WAIT_SIGN.getCode();
+                } else if (Integer.valueOf(1).equals(master.getApproved())) {
+                    // 已审核
+                    newStatus = ErpOrderStatus.WAIT_SIGN.getCode();
+                }
+
+                if (newStatus != null && !newStatus.equals(order.getStatus())) {
+                    order.setStatus(newStatus);
+                    baseMapper.updateById(order);
+                    updatedCount++;
+                    log.info("[ERP状态同步] 订单 {} (ERP:{}) 状态更新为: {}",
+                        order.getCode(), order.getErpDocCode(), newStatus);
+                }
+            } catch (Exception e) {
+                log.error("[ERP状态同步] 处理订单 {} 异常: {}", order.getCode(), e.getMessage(), e);
+            }
+        }
+        log.info("[ERP状态同步] 完成，共处理 {} 条，更新 {} 条", orders.size(), updatedCount);
+    }
 }

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/service/impl/ErpSaleOrderMasterServiceImpl.java

@@ -0,0 +1,60 @@
+package org.dromara.erp.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.erp.domain.ErpSaleOrderMaster;
+import org.dromara.erp.domain.query.ErpSaleOrderMasterQuery;
+import org.dromara.erp.domain.vo.ErpSaleOrderMasterVo;
+import org.dromara.erp.mapper.ErpSaleOrderMasterMapper;
+import org.dromara.erp.service.IErpSaleOrderMasterService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * ERP 销售订单主表 Service 业务层处理
+ *
+ * @author Antigravity
+ */
+@RequiredArgsConstructor
+@Service
+public class ErpSaleOrderMasterServiceImpl implements IErpSaleOrderMasterService {
+
+    private final ErpSaleOrderMasterMapper baseMapper;
+
+    @Override
+    public TableDataInfo<ErpSaleOrderMasterVo> queryPageList(ErpSaleOrderMasterQuery query, PageQuery pageQuery) {
+        LambdaQueryWrapper<ErpSaleOrderMaster> lqw = buildQueryWrapper(query);
+        return TableDataInfo.build(baseMapper.selectVoPage(pageQuery.build(), lqw));
+    }
+
+    @Override
+    public List<ErpSaleOrderMasterVo> queryList(ErpSaleOrderMasterQuery query) {
+        LambdaQueryWrapper<ErpSaleOrderMaster> lqw = buildQueryWrapper(query);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    @Override
+    public ErpSaleOrderMasterVo queryById(String rowId) {
+        return baseMapper.selectVoById(rowId);
+    }
+
+    private LambdaQueryWrapper<ErpSaleOrderMaster> buildQueryWrapper(ErpSaleOrderMasterQuery query) {
+        LambdaQueryWrapper<ErpSaleOrderMaster> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotEmpty(query.getDocCode()), ErpSaleOrderMaster::getDocCode, query.getDocCode());
+        lqw.eq(ObjectUtil.isNotEmpty(query.getDealerNum()), ErpSaleOrderMaster::getDealerNum, query.getDealerNum());
+        lqw.like(ObjectUtil.isNotEmpty(query.getDealerName()), ErpSaleOrderMaster::getDealerName, query.getDealerName());
+        lqw.eq(ObjectUtil.isNotEmpty(query.getClientNum()), ErpSaleOrderMaster::getClientNum, query.getClientNum());
+        lqw.like(ObjectUtil.isNotEmpty(query.getClientName()), ErpSaleOrderMaster::getClientName, query.getClientName());
+        lqw.eq(ObjectUtil.isNotEmpty(query.getDocStatus()), ErpSaleOrderMaster::getDocStatus, query.getDocStatus());
+        lqw.eq(ObjectUtil.isNotEmpty(query.getOrderState()), ErpSaleOrderMaster::getOrderState, query.getOrderState());
+        lqw.eq(ObjectUtil.isNotEmpty(query.getProdMode()), ErpSaleOrderMaster::getProdMode, query.getProdMode());
+        lqw.orderByDesc(ErpSaleOrderMaster::getDocDate);
+        return lqw;
+    }
+
+}

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/task/ErpOrderSyncTask.java

@@ -0,0 +1,36 @@
+package org.dromara.erp.task;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.erp.service.IErpOrderService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * ERP 订单状态同步定时任务
+ * <p>
+ * 每分钟执行一次，将 ERP 系统中的订单状态同步到本地订单表
+ *
+ * @author Antigravity
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class ErpOrderSyncTask {
+
+    private final IErpOrderService erpOrderService;
+
+    /**
+     * 每 60 秒同步一次 ERP 订单状态
+     */
+    @Scheduled(fixedRate = 60000)
+    public void syncOrderStatus() {
+        log.debug("[定时任务] 开始同步 ERP 订单状态...");
+        try {
+            erpOrderService.syncErpOrderStatus();
+        } catch (Exception e) {
+            log.error("[定时任务] ERP 订单状态同步异常: {}", e.getMessage(), e);
+        }
+    }
+
+}

script/sql/sqlserver/v1/HS_ERP_Order-create.sql

@@ -1,181 +1,31 @@
--- ----------------------------
--- 协议信息表
--- ----------------------------
-create table sys_agreement
-(
-    id          bigint        NOT NULL,
-    title       nvarchar(100) NOT NULL,
-    content     nvarchar(MAX) DEFAULT ('') NULL,
-    create_dept bigint,
-    create_by   bigint,
-    create_time datetime2(7),
-    update_by   bigint,
-    update_time datetime2(7),
-    CONSTRAINT PK__sys_agreement__id PRIMARY KEY CLUSTERED (id)
-    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
-    ON [PRIMARY]
-)
-ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-EXEC sys.sp_addextendedproperty 'MS_Description', N'协议ID', 'SCHEMA', N'dbo', 'TABLE', N'sys_agreement', 'COLUMN', N'id'
-GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'协议标题', 'SCHEMA', N'dbo', 'TABLE', N'sys_agreement', 'COLUMN', N'title'
-GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'协议内容（富文本HTML）', 'SCHEMA', N'dbo', 'TABLE', N'sys_agreement', 'COLUMN', N'content'
-GO
-
--- ----------------------------
--- 客户表
--- ----------------------------
-create table sys_customer
-(
-    id                 bigint            NOT NULL,
-    user_name          nvarchar(30)      NOT NULL,
-    phone              nvarchar(11)      DEFAULT ('') NULL,
-    wechat_openid      nvarchar(255)     DEFAULT ('') NULL,
-    wechat_unionid     nvarchar(255)     DEFAULT ('') NULL,
-    auth_client_frowid   nvarchar(100)     DEFAULT ('') NULL,
-    avatar             bigint            DEFAULT (NULL) NULL,
-    tenant_id          nvarchar(20)      DEFAULT ('000000') NULL,
-    create_dept        bigint,
-    create_by          bigint,
-    create_time        datetime2(7),
-    update_by          bigint,
-    update_time        datetime2(7),
-    del_flag           nchar             DEFAULT ('0') NULL,
-    CONSTRAINT PK__sys_customer__id PRIMARY KEY CLUSTERED (id)
-    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
-    ON [PRIMARY]
-)
-ON [PRIMARY]
-GO
-
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'客户ID' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'id'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'用户名' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'user_name'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'手机号' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'phone'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'微信OpenID' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'wechat_openid'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'微信UnionID' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'wechat_unionid'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'授权客户ID' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'auth_client_frowid'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'头像OSS ID' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'avatar'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'租户ID' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'tenant_id'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'创建部门' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'create_dept'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'创建者' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'create_by'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'创建时间' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'create_time'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'更新者' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'update_by'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'更新时间' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'update_time'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'删除标志（0代表存在 1代表删除）' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer',
-    'COLUMN', N'del_flag'
-GO
-EXEC sys.sp_addextendedproperty
-    'MS_Description', N'客户表' ,
-    'SCHEMA', N'dbo',
-    'TABLE', N'sys_customer'
+EXEC sys.sp_addextendedproperty 'MS_Description', N'投诉建议表', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint'
 GO
 
 -- ----------------------------
--- 投诉建议表
+-- 联系电话管理表（单例表）
 -- ----------------------------
-create table sys_complaint
+create table sys_phone
 (
     id              bigint            NOT NULL,
-    feedback_type   nvarchar(50)      DEFAULT ('') NULL,
-    content         nvarchar(MAX)     DEFAULT ('') NULL,
-    images          nvarchar(MAX)     DEFAULT ('') NULL,
-    customer_id     bigint            DEFAULT (NULL) NULL,
-    tenant_id       nvarchar(20)      DEFAULT ('000000') NULL,
+    expert_phone    nvarchar(20)      DEFAULT ('') NULL,
+    service_phone   nvarchar(20)      DEFAULT ('') NULL,
     create_dept     bigint,
     create_by       bigint,
     create_time     datetime2(7),
     update_by       bigint,
     update_time     datetime2(7),
-    del_flag        nchar             DEFAULT ('0') NULL,
-    CONSTRAINT PK__sys_complaint__id PRIMARY KEY CLUSTERED (id)
+    CONSTRAINT PK__sys_phone__id PRIMARY KEY CLUSTERED (id)
     WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
     ON [PRIMARY]
 )
-ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+ON [PRIMARY]
 GO
 
-EXEC sys.sp_addextendedproperty 'MS_Description', N'投诉建议ID', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint', 'COLUMN', N'id'
-GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'反馈类型（字典值）', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint', 'COLUMN', N'feedback_type'
-GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'反馈内容', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint', 'COLUMN', N'content'
+EXEC sys.sp_addextendedproperty 'MS_Description', N'联系电话ID', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone', 'COLUMN', N'id'
 GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'图片OSS ID列表（逗号拼接字符串，如 1,2,3）', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint', 'COLUMN', N'images'
+EXEC sys.sp_addextendedproperty 'MS_Description', N'华晟型材专家电话', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone', 'COLUMN', N'expert_phone'
 GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'投诉客户ID', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint', 'COLUMN', N'customer_id'
+EXEC sys.sp_addextendedproperty 'MS_Description', N'客服电话', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone', 'COLUMN', N'service_phone'
 GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'租户ID', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint', 'COLUMN', N'tenant_id'
-GO
-EXEC sys.sp_addextendedproperty 'MS_Description', N'投诉建议表', 'SCHEMA', N'dbo', 'TABLE', N'sys_complaint'
+EXEC sys.sp_addextendedproperty 'MS_Description', N'联系电话管理表', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone'
 GO

script/sql/sqlserver/v1/HS_ERP_Order-update.sql

@@ -6,3 +6,10 @@ VALUES (1, N'用户协议', N'<p>欢迎使用本系统，请仔细阅读以下
 INSERT INTO [dbo].[sys_agreement] ([id], [title], [content], [create_by], [create_time], [update_by], [update_time])
 VALUES (2, N'隐私政策', N'<p>我们非常重视您的个人隐私保护，请仔细阅读以下隐私政策...</p>', 1, GETDATE(), 1, GETDATE());
 GO
+
+-- ----------------------------
+-- sys_phone 初始数据
+-- ----------------------------
+INSERT INTO [dbo].[sys_phone] ([id], [expert_phone], [service_phone], [create_by], [create_time], [update_by], [update_time])
+VALUES (1, N'13888888888', N'13888888888', 1, GETDATE(), 1, GETDATE());
+GO

script/sql/sqlserver/v1/HTSail_CS-create.sql

@@ -11,6 +11,7 @@ CREATE TABLE [dbo].[t_Applet_Order] (
   [FPlacer] bigint NULL,
   [FPlaceTime] datetime DEFAULT GETDATE() NULL,
   [FStatus] int DEFAULT 0 NULL,
+  [FErpDocCode] varchar(50) NULL,
   
   -- 常规审计字段
   [CreateDept] bigint NULL,
@@ -35,6 +36,8 @@ EXEC sp_addextendedproperty 'MS_Description', N'下单时间', 'SCHEMA', N'dbo',
 GO
 EXEC sp_addextendedproperty 'MS_Description', N'订单状态 (0-待审核)', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order', 'COLUMN', N'FStatus'
 GO
+EXEC sp_addextendedproperty 'MS_Description', N'ERP单据编号', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order', 'COLUMN', N'FErpDocCode'
+GO
 EXEC sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order', 'COLUMN', N'CreateDept'
 GO
 
@@ -67,6 +70,7 @@ CREATE TABLE [dbo].[t_Applet_Order_Details] (
   [Length] [dbo].[CustomFloat] NULL,
   [WallThickness] [dbo].[CustomFloat] NULL,
   [Count] int NULL,
+  [FErpProjectID] varchar(50) NULL,
   
   -- 审计字段
   [CreateDept] bigint NULL,
@@ -107,46 +111,8 @@ EXEC sp_addextendedproperty 'MS_Description', N'壁厚(mm)', 'SCHEMA', N'dbo', '
 GO
 EXEC sp_addextendedproperty 'MS_Description', N'支数', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'Count'
 GO
-EXEC sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'CreateDept'
-GO
-
--- ----------------------------
--- Table structure for t_Applet_Order_Audit
--- ----------------------------
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_Applet_Order_Audit]') AND type IN ('U'))
-	DROP TABLE [dbo].[t_Applet_Order_Audit]
-GO
-
-CREATE TABLE [dbo].[t_Applet_Order_Audit] (
-  [FRowID] [dbo].[RowID] NOT NULL,
-  [FOrderID] [dbo].[RowID] NOT NULL,
-  [FAuditor] bigint NULL,
-  [FAuditTime] datetime DEFAULT GETDATE() NULL,
-  [FAuditResult] int NULL, -- 1-通过, 2-驳回
-  [FRejectReason] nvarchar(500) NULL,
-  
-  -- 审计字段
-  [CreateDept] bigint NULL,
-  [CreateBy] bigint NULL,
-  [CreateTime] datetime DEFAULT GETDATE() NULL,
-  [UpdateBy] bigint NULL,
-  [UpdateTime] datetime NULL
-)
+EXEC sp_addextendedproperty 'MS_Description', N'ERP项目号', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'FErpProjectID'
 GO
-
-ALTER TABLE [dbo].[t_Applet_Order_Audit] ADD CONSTRAINT [PK_t_Applet_Order_Audit] PRIMARY KEY CLUSTERED ([FRowID])
+EXEC sp_addextendedproperty 'MS_Description', N'创建部门', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'CreateDept'
 GO
 
--- 字段注释
-EXEC sp_addextendedproperty 'MS_Description', N'审核记录主键', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Audit', 'COLUMN', N'FRowID'
-GO
-EXEC sp_addextendedproperty 'MS_Description', N'订单ID', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Audit', 'COLUMN', N'FOrderID'
-GO
-EXEC sp_addextendedproperty 'MS_Description', N'审核人', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Audit', 'COLUMN', N'FAuditor'
-GO
-EXEC sp_addextendedproperty 'MS_Description', N'审核时间', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Audit', 'COLUMN', N'FAuditTime'
-GO
-EXEC sp_addextendedproperty 'MS_Description', N'审核结果(1-通过, 2-驳回)', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Audit', 'COLUMN', N'FAuditResult'
-GO
-EXEC sp_addextendedproperty 'MS_Description', N'驳回原因', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Audit', 'COLUMN', N'FRejectReason'
-GO