From 66772a2d80b2612cea4e1e5740c9df3d2f672a39 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 25 Sep 2025 21:51:20 +0800
Subject: [PATCH] 商户角色优化
---
oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java | 2 +-
oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java b/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java
index b150542..0ab42e6 100644
--- a/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java
+++ b/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java
@@ -8,10 +8,9 @@
public enum MerchantRole {
// 商户角色
- OWNER("OWNER", 1,"所有者"),
- ADMIN("ADMIN", 2,"管理员"),
- FINANCE("FINANCE", 3,"财务"),
- OPERATOR("OPERATOR", 4,"操作员");
+ ADMIN("ADMIN", 1,"管理员"),
+ FINANCE("FINANCE", 2,"财务"),
+ OPERATOR("OPERATOR", 3,"操作员");
private final String role;
private final Integer level;
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
index 24bcd05..5dd4a8f 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
@@ -57,7 +57,7 @@
UserMerchant userMerchant = new UserMerchant();
userMerchant.setMerchantId(resources.getMerchantId());
userMerchant.setUserId(resources.getUserId());
- userMerchant.setRoleType(MerchantRole.OWNER.getRole());
+ userMerchant.setRoleType(MerchantRole.ADMIN.getRole());
userMerchantService.create(userMerchant);
}
--
Gitblit v1.9.3