服务类型基本改完

ruoyi-modules/yingpaipay-service/src/main/java/org/dromara/service/controller/SysServiceController.java

@@ -106,7 +106,7 @@ public class SysServiceController extends BaseController {
     }
 
     @GetMapping("/listAll")
-    public R<List<SysServiceVo>> listOnStore() {
+    public R<List<SysServiceVo>> listAll() {
         return R.ok(sysServiceService.listAll());
     }
 

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

@@ -88,6 +88,7 @@ public class SysServiceServiceImpl implements ISysServiceService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysService> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(SysService::getSort);
+        lqw.eq(bo.getClassificationId() != null, SysService::getClassificationId, bo.getClassificationId());
         return lqw;
     }
 

script/sql/business/v2/update.sql

@@ -1,26 +1,23 @@
-ALTER TABLE sys_service ADD COLUMN `introduction` text COMMENT '服务介绍';
-ALTER TABLE sys_service ADD COLUMN `order_instruction` text COMMENT '下单须知';
+ALTER TABLE pet_system.sys_service ADD COLUMN `introduction` text COMMENT '服务介绍';
+ALTER TABLE pet_system.sys_service ADD COLUMN `order_instruction` text COMMENT '下单须知';
 
 -- 菜单 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+insert into pet_system.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
 values(2037451324848697345, '服务分类', '2020736413590941698', '1', 'classification', 'service/classification/index', 1, 0, 'C', '0', '0', 'service:classification:list', '#', 103, 1, sysdate(), null, null, '服务分类菜单', 0);
 
 -- 按钮 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
-values(2037451324848697346, '服务分类查询', 2037451324848697345, '1',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:query',        '#', 103, 1, sysdate(), null, null, '', 0);
+insert into pet_system.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2037451324848697346, '服务分类修改', 2037451324848697345, '1',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:edit',        '#', 103, 1, sysdate(), null, null, '', 0);
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+insert into pet_system.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
 values(2037451324848697347, '服务分类新增', 2037451324848697345, '2',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:add',          '#', 103, 1, sysdate(), null, null, '', 0);
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
-values(2037451324848697348, '服务分类修改', 2037451324848697345, '3',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:edit',         '#', 103, 1, sysdate(), null, null, '', 0);
+insert into pet_system.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2037451324848697349, '服务分类删除', 2037451324848697345, '3',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:remove',       '#', 103, 1, sysdate(), null, null, '', 0);
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
-values(2037451324848697349, '服务分类删除', 2037451324848697345, '4',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:remove',       '#', 103, 1, sysdate(), null, null, '', 0);
+ALTER TABLE pet_system.sys_service ADD COLUMN classification_id bigint COMMENT '所属分类ID';
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
-values(2037451324848697350, '服务分类导出', 2037451324848697345, '5',  '#', '', 1, 0, 'F', '0', '0', 'service:classification:export',       '#', 103, 1, sysdate(), null, null, '', 0);
+UPDATE pet_system.sys_menu SET parent_id = 2020736413590941698, menu_name = '服务列表', order_num = 2, path = 'list', component = 'service/list/index', is_frame = '1', is_cache = '0', menu_type = 'C', visible = '0', status = '0', perms = 'service:list:list', icon = 'service-list', remark = '服务列表菜单', platform_id = 0, create_dept = 103, create_time = '2026-02-25 13:44:44', update_by = 1, update_time = '2026-03-27 17:55:14' WHERE menu_id = 2026533580326912001
 
-ALTER TABLE sys_service ADD COLUMN classification_id bigint COMMENT '所属分类ID';
-
-UPDATE sys_menu SET parent_id = 2020736413590941698, menu_name = '服务列表', order_num = 2, path = 'list', component = 'service/list/index', is_frame = '1', is_cache = '0', menu_type = 'C', visible = '0', status = '0', perms = 'service:list:list', icon = 'service-list', remark = '服务列表菜单', platform_id = 0, create_dept = 103, create_time = '2026-02-25 13:44:44', update_by = 1, update_time = '2026-03-27 17:55:14' WHERE menu_id = 2026533580326912001
+INSERT INTO pet_system.sys_agreement(id, title, content)
+VALUES (4, '托运协议', '托运协议')