Merge pull request 'v1.0.23' (#33) from dev into master

Reviewed-on: #33

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.26</version>
+	<version>1.0.23</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>

src/main/java/com/imyeyu/api/modules/common/controller/NotifyController.java

@@ -8,7 +8,6 @@ import com.imyeyu.api.modules.common.entity.NotifyDetail;
 import com.imyeyu.api.modules.common.service.NotifyDetailService;
 import com.imyeyu.api.modules.common.service.NotifyService;
 import com.imyeyu.api.modules.common.service.SmsService;
-import com.imyeyu.api.modules.common.vo.NotifyManagementItem;
 import com.imyeyu.api.modules.user.entity.User;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserService;
@@ -71,31 +70,25 @@ public class NotifyController {
 	@RequiredToken
 	@RequestMapping("/detail")
 	public Notify detail(@RequestParam String id) {
-		return fillDetailList(service.get(id));
+		Notify notify = service.get(id);
-	}
+		{
-
+			List<NotifyDetail> detailList = detailService.listByNotifyId(id);
-	/// 查询管理端通知列表
+			Set<String> userIdSet = detailList.stream()
-	///
+			                                  .filter(item -> item.getMsgType() == NotifyDetail.MsgType.INTERNAL)
-	/// @param page 分页参数
+			                                  .flatMap(item -> Stream.of(item.getSendFrom(), item.getSendTo()))
-	/// @return 管理端通知列表
+			                                  .collect(Collectors.toSet());
-	@JsonView(ResponseView.Admin.class)
+			Map<String, User> userMap = userService.mapByIdList(userIdSet);
-	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+			for (NotifyDetail detail : detailList) {
-	@RequiredToken
+				if (TimiJava.isNotEmpty(detail.getSendFrom())) {
-	@PostMapping("/management/list")
+					detail.setFromUser(userMap.get(detail.getSendFrom()));
-	public PageResult<NotifyManagementItem> managementList(@RequestBody(required = false) Page<Notify> page) {
+				}
-		return service.pageManagement(page, userLoginService.getRequireLoginUserId());
+				if (TimiJava.isNotEmpty(detail.getSendTo())) {
-	}
+					detail.setToUser(userMap.get(detail.getSendTo()));
-
+				}
-	/// 查询管理端通知详情及收件人
+			}
-	///
+			notify.setDetailList(detailList);
-	/// @param id 通知 ID
+		}
-	/// @return 通知详情及收件人
+		return notify;
-	@JsonView(ResponseView.Admin.class)
-	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
-	@RequiredToken
-	@PostMapping("/management/detail")
-	public Notify managementDetail(@RequestParam String id) {
-		return fillDetailList(service.getManagement(id, userLoginService.getRequireLoginUserId()));
 	}
 
 	/// 删除通知及其通知详情
@@ -118,26 +111,6 @@ public class NotifyController {
 		service.cancel(id);
 	}
 
-	/// 删除管理端通知及其通知详情
-	///
-	/// @param id 通知 ID
-	@RequireCorePermission(CorePermissionCode.NOTIFY_DELETE)
-	@RequiredToken
-	@PostMapping("/management/delete")
-	public void managementDelete(@RequestParam String id) {
-		service.deleteManagement(id, userLoginService.getRequireLoginUserId());
-	}
-
-	/// 取消管理端尚未成功发送的通知
-	///
-	/// @param id 通知 ID
-	@RequireCorePermission(CorePermissionCode.NOTIFY_CANCEL)
-	@RequiredToken
-	@PostMapping("/management/cancel")
-	public void managementCancel(@RequestParam String id) {
-		service.cancelManagement(id, userLoginService.getRequireLoginUserId());
-	}
-
 	@AOPLog
 	@CaptchaValid
 	@RequestRateLimit(value = 1, inSeconds = 59)
@@ -176,14 +149,14 @@ public class NotifyController {
 		return detail;
 	}
 
-	/// 隐藏当前用户的一条站内通知
+	/// 删除当前用户的一条站内通知
 	///
 	/// @param id 通知详情 ID
 	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
 	@RequiredToken
 	@PostMapping("/internal/delete")
 	public void deleteInternal(@RequestParam String id) {
-		detailService.hideInternalByUserId(id, userLoginService.getRequireLoginUserId());
+		detailService.deleteInternalByUserId(id, userLoginService.getRequireLoginUserId());
 	}
 
 	/// 查询当前用户未读通知数量
@@ -213,30 +186,4 @@ public class NotifyController {
 	public void markAllSiteRead() {
 		detailService.markAllSiteRead(userLoginService.getRequireLoginUserId());
 	}
-
-	/// 回填通知详情中的用户信息
-	///
-	/// @param notify 通知
-	/// @return 已回填用户信息的通知
-	private Notify fillDetailList(Notify notify) {
-		if (notify == null) {
-			return null;
-		}
-		List<NotifyDetail> detailList = detailService.listByNotifyId(notify.getId());
-		Set<String> userIdSet = detailList.stream()
-		                                  .filter(item -> item.getMsgType() == NotifyDetail.MsgType.INTERNAL)
-		                                  .flatMap(item -> Stream.of(item.getSendFrom(), item.getSendTo()))
-		                                  .collect(Collectors.toSet());
-		Map<String, User> userMap = userService.mapByIdList(userIdSet);
-		for (NotifyDetail detail : detailList) {
-			if (TimiJava.isNotEmpty(detail.getSendFrom())) {
-				detail.setFromUser(userMap.get(detail.getSendFrom()));
-			}
-			if (TimiJava.isNotEmpty(detail.getSendTo())) {
-				detail.setToUser(userMap.get(detail.getSendTo()));
-			}
-		}
-		notify.setDetailList(detailList);
-		return notify;
-	}
 }

src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java

@@ -32,8 +32,6 @@ public class Attachment extends UUIDEntity {
 
 		ARTICLE,
 
-		NOTIFY_DETAIL,
-
 		USER,
 
 		GAO_CUSTOMER,

src/main/java/com/imyeyu/api/modules/common/entity/BaseQueueEntity.java

@@ -26,7 +26,7 @@ public class BaseQueueEntity implements IDEntity<String>, Creatable, Destroyable
 	protected String notifyDetailId;
 
 	/** 内容 */
-	protected String content;
+	protected String data;
 
 	/** 参数 */
 	protected JsonNode args;
@@ -51,7 +51,7 @@ public class BaseQueueEntity implements IDEntity<String>, Creatable, Destroyable
 	/// @param detail 通知详情
 	public BaseQueueEntity(NotifyDetail detail) {
 		notifyDetailId = detail.getId();
-		content = detail.getContent();
+		data = detail.getData();
 		args = detail.getArgs();
 		sendTo = detail.getSendTo();
 		sendAt = detail.getSendAt();

src/main/java/com/imyeyu/api/modules/common/entity/NotifyDetail.java

@@ -1,6 +1,5 @@
 package com.imyeyu.api.modules.common.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.imyeyu.api.TimiServerAPI;
@@ -17,8 +16,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * 通知详情
  *
@@ -85,19 +82,6 @@ public class NotifyDetail extends UUIDEntity {
 		FAIL
 	}
 
-	/// 内容类型
-	///
-	/// @author 夜雨
-	/// @since 2026-08-24
-	public enum ContentType {
-
-		/** 纯文本 */
-		TEXT,
-
-		/** TipTap 富文本 */
-		TIP_TAP
-	}
-
 	/** 所属通知 ID */
 	@JsonView(ResponseView.Public.class)
 	private String notifyId;
@@ -116,11 +100,7 @@ public class NotifyDetail extends UUIDEntity {
 
 	/** 内容 */
 	@JsonView(ResponseView.Public.class)
-	private String content;
+	private String data;
-
-	/// 内容类型
-	@JsonView(ResponseView.Public.class)
-	private ContentType contentType;
 
 	/** 参数 */
 	@JsonView(ResponseView.Public.class)
@@ -158,10 +138,6 @@ public class NotifyDetail extends UUIDEntity {
 	@JsonView(ResponseView.Public.class)
 	private Long readAt;
 
-	/// 收件人隐藏时间，仅站内通知生效
-	@JsonIgnore
-	private Long hiddenAt;
-
 	@Transient
 	protected Notify notify;
 
@@ -170,9 +146,4 @@ public class NotifyDetail extends UUIDEntity {
 
 	@Transient
 	protected User toUser;
-
-	/// 媒体附件列表
-	@JsonView(ResponseView.Public.class)
-	@Transient
-	protected List<Attachment> attachmentList;
 }

src/main/java/com/imyeyu/api/modules/common/mapper/AttachmentVariantMapper.java

@@ -71,14 +71,6 @@ public interface AttachmentVariantMapper {
 	/// @param variant 变体
 	void insert(AttachmentVariant variant);
 
-	/// 延长缩略图变体的过期时间
-	///
-	/// @param id       变体 ID
-	/// @param now      当前时间
-	/// @param expireAt 新的过期时间
-	/// @return 更新记录数
-	int updateExpireAt(@Param("id") String id, @Param("now") long now, @Param("expireAt") long expireAt);
-
 	/// 删除变体
 	///
 	/// @param id 变体 ID

src/main/java/com/imyeyu/api/modules/common/mapper/NotifyDetailMapper.java

@@ -16,37 +16,35 @@ import java.util.List;
  */
 public interface NotifyDetailMapper extends BaseMapper<NotifyDetail, String> {
 
-	String NOT_HIDDEN = " AND `hidden_at` IS NULL";
-
 	/** 查询用户的站内通知 */
-	@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + NOT_HIDDEN + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
+	@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
 	List<NotifyDetail> selectSiteByUserId(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
 
 	/** 查询用户的未读站内通知 */
-	@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + " AND `read_at` IS NULL " + NOT_HIDDEN + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
+	@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
 	List<NotifyDetail> selectUnreadSiteByUserId(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
 
 	/** 统计用户的站内通知数量 */
-	@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + NOT_HIDDEN + NOT_DELETE)
+	@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE)
 	long countSiteByUserId(@Param("userId") String userId);
 
 	/** 统计用户的未读站内通知数量 */
-	@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + " AND `read_at` IS NULL " + NOT_HIDDEN + NOT_DELETE)
+	@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
 	long countUnreadSiteByUserId(@Param("userId") String userId);
 
 	/** 查询用户拥有的站内通知 */
-	@Select("SELECT * FROM `notify_detail` WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + NOT_HIDDEN + NOT_DELETE + " LIMIT 1")
+	@Select("SELECT * FROM `notify_detail` WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE + " LIMIT 1")
 	NotifyDetail selectSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
 
-	/** 隐藏用户的站内通知 */
+	/** 删除用户的站内通知 */
-	@Update("UPDATE `notify_detail` SET `hidden_at` = " + UNIX_TIME + ", `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + NOT_HIDDEN + NOT_DELETE)
+	@Update("UPDATE `notify_detail` SET `deleted_at` = " + UNIX_TIME + ", `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE)
-	int hideSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
+	int deleteSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
 
 	/** 标记站内通知已读 */
-	@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + " AND `read_at` IS NULL " + NOT_HIDDEN + NOT_DELETE)
+	@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
 	int markSiteRead(@Param("detailId") String detailId, @Param("userId") String userId, @Param("readAt") long readAt);
 
 	/** 标记用户全部站内通知已读 */
-	@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `send_at` < " + UNIX_TIME + " AND `read_at` IS NULL " + NOT_HIDDEN + NOT_DELETE)
+	@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
 	int markAllSiteRead(@Param("userId") String userId, @Param("readAt") long readAt);
 }

src/main/java/com/imyeyu/api/modules/common/mapper/NotifyMapper.java

@@ -1,12 +1,8 @@
 package com.imyeyu.api.modules.common.mapper;
 
 import com.imyeyu.api.modules.common.entity.Notify;
-import com.imyeyu.api.modules.common.vo.NotifyManagementItem;
-import org.apache.ibatis.annotations.Param;
 import com.imyeyu.spring.mapper.BaseMapper;
 
-import java.util.List;
-
 /**
  * 通知 Mapper
  *
@@ -14,25 +10,4 @@ import java.util.List;
  * @since 2026-05-13 14:46
  */
 public interface NotifyMapper extends BaseMapper<Notify, String> {
-
-	/// 分页查询管理端通知
-	///
-	/// @param userId 管理员用户 ID
-	/// @param offset 分页偏移量
-	/// @param limit 分页大小
-	/// @return 通知列表
-	List<NotifyManagementItem> selectManagementPage(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
-
-	/// 统计管理端通知数量
-	///
-	/// @param userId 管理员用户 ID
-	/// @return 通知数量
-	long countManagement(@Param("userId") String userId);
-
-	/// 查询管理员可管理的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 管理员用户 ID
-	/// @return 通知
-	Notify selectManagement(@Param("notifyId") String notifyId, @Param("userId") String userId);
 }

src/main/java/com/imyeyu/api/modules/common/service/NotifyDetailService.java

@@ -41,11 +41,11 @@ public interface NotifyDetailService extends BaseService<NotifyDetail, String> {
 	/// @return 通知详情
 	NotifyDetail getInternalByUserId(String detailId, String userId);
 
-	/// 隐藏当前用户拥有的站内通知详情
+	/// 删除当前用户拥有的站内通知详情
 	///
 	/// @param detailId 通知详情 ID
 	/// @param userId 用户 ID
-	void hideInternalByUserId(String detailId, String userId);
+	void deleteInternalByUserId(String detailId, String userId);
 
 	/// 查询用户未读站内通知数量
 	///

src/main/java/com/imyeyu/api/modules/common/service/NotifyService.java

@@ -1,9 +1,6 @@
 package com.imyeyu.api.modules.common.service;
 
 import com.imyeyu.api.modules.common.entity.Notify;
-import com.imyeyu.api.modules.common.vo.NotifyManagementItem;
-import com.imyeyu.spring.bean.Page;
-import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.BaseService;
 
 /**
@@ -14,32 +11,6 @@ import com.imyeyu.spring.service.BaseService;
  */
 public interface NotifyService extends BaseService<Notify, String> {
 
-	/// 分页查询当前用户创建的通知
-	///
-	/// @param page 分页参数
-	/// @param userId 用户 ID
-	/// @return 管理端通知列表
-	PageResult<NotifyManagementItem> pageManagement(Page<Notify> page, String userId);
-
-	/// 查询当前用户可管理的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 用户 ID
-	/// @return 通知
-	Notify getManagement(String notifyId, String userId);
-
-	/// 删除当前用户创建的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 用户 ID
-	void deleteManagement(String notifyId, String userId);
-
-	/// 取消当前用户创建的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 用户 ID
-	void cancelManagement(String notifyId, String userId);
-
 	/// 取消通知中尚未成功发送的通知详情
 	///
 	/// @param notifyId 通知 ID

src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentVariantServiceImplement.java

@@ -112,10 +112,7 @@ public class AttachmentVariantServiceImplement implements AttachmentVariantServi
 			now
 		);
 		if (cached != null) {
-			Attachment refreshed = refreshCachedThumb(cached);
+			return cached;
-			if (refreshed != null) {
-				return refreshed;
-			}
 		}
 
 		String lockKey = buildThumbLockKey(source, width, height, fitMode);
@@ -134,10 +131,7 @@ public class AttachmentVariantServiceImplement implements AttachmentVariantServi
 				Time.now()
 			);
 			if (cached != null) {
-				Attachment refreshed = refreshCachedThumb(cached);
+				return cached;
-				if (refreshed != null) {
-					return refreshed;
-				}
 			}
 			AttachmentVariant oldVariant = variantMapper.selectByKey(
 				source.getId(),
@@ -203,10 +197,7 @@ public class AttachmentVariantServiceImplement implements AttachmentVariantServi
 						Time.now()
 					);
 					if (concurrent != null) {
-						Attachment refreshed = refreshCachedThumb(concurrent);
+						return concurrent;
-						if (refreshed != null) {
-							return refreshed;
-						}
 					}
 					throw e;
 				}
@@ -232,20 +223,6 @@ public class AttachmentVariantServiceImplement implements AttachmentVariantServi
 		}
 	}
 
-	/// 延长已命中缩略图缓存的有效期
-	///
-	/// @param cached 已命中的缩略图
-	/// @return 更新成功时返回刷新后的缩略图，记录已不存在或已过期时返回 `null`
-	private Attachment refreshCachedThumb(Attachment cached) {
-		long now = Time.now();
-		long expireAt = now + THUMB_CACHE_TTL;
-		if (!(0 < variantMapper.updateExpireAt(cached.getId(), now, expireAt))) {
-			return null;
-		}
-		cached.setDestroyAt(expireAt);
-		return cached;
-	}
-
 	private String buildThumbLockKey(Attachment source, int width, int height, ThumbnailFitMode fitMode) {
 		return "%s%s:%s:%s:%s:%s".formatted(
 			THUMB_LOCK_KEY_PREFIX,

src/main/java/com/imyeyu/api/modules/common/service/implement/MailQueueServiceImplement.java

@@ -60,7 +60,7 @@ public class MailQueueServiceImplement extends AbstractQueueService<MailQueue, N
 		message.setFrom(queue.getSendFrom());
 		message.setTo(queue.getSendTo());
 		message.setSubject(queue.getSubject());
-		message.setText(queue.getContent());
+		message.setText(queue.getData());
 		mailSender.send(message);
 		log.info("邮件发送成功，目标：{}", queue.getSendTo());
 	}

src/main/java/com/imyeyu/api/modules/common/service/implement/NotifyDetailServiceImplement.java

@@ -1,12 +1,10 @@
 package com.imyeyu.api.modules.common.service.implement;
 
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
-import com.imyeyu.api.modules.common.entity.Attachment;
-import com.imyeyu.api.modules.common.entity.Notify;
 import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.entity.Notify;
 import com.imyeyu.api.modules.common.mapper.NotifyDetailMapper;
 import com.imyeyu.api.modules.common.mapper.NotifyMapper;
-import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.common.service.NotifyDetailService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
@@ -21,7 +19,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 通知详情服务实现
@@ -34,7 +31,6 @@ import java.util.Map;
 public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDetail, String> implements NotifyDetailService {
 
 	private final NotifyMapper notifyMapper;
-	private final AttachmentService attachmentService;
 
 	private final NotifyDetailMapper mapper;
 
@@ -57,22 +53,15 @@ public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDe
 		if (detail.getMsgType() == NotifyDetail.MsgType.INTERNAL) {
 			TimiException.required(detail.getSendTo(), "未找到站内通知接收用户 ID");
 		}
-		detail.setContentType(TimiJava.defaultIfNull(detail.getContentType(), detail.getMsgType() == NotifyDetail.MsgType.INTERNAL
-			? NotifyDetail.ContentType.TIP_TAP
-			: NotifyDetail.ContentType.TEXT));
 
 		detail.setRetry(TimiJava.defaultIfNull(detail.getRetry(), 1));
 		detail.setSendAt(TimiJava.defaultIfNull(detail.getSendAt(), Time.now()));
 		detail.setTimeoutAt(TimiJava.defaultIfNull(detail.getTimeoutAt(), detail.getSendAt() + Time.D));
-		boolean scheduled = Time.now() < detail.getSendAt();
+		detail.setStatus(detail.getMsgType() == NotifyDetail.MsgType.INTERNAL
-		detail.setStatus(detail.getMsgType() == NotifyDetail.MsgType.INTERNAL && !scheduled
+		? NotifyDetail.Status.REMINDED
-			? NotifyDetail.Status.REMINDED
+		: NotifyDetail.Status.WAITING);
-			: NotifyDetail.Status.WAITING);
 		detail.setReadAt(null);
 		super.create(detail);
-		if (detail.getMsgType() == NotifyDetail.MsgType.INTERNAL) {
-			attachmentService.updateByBizId(Attachment.BizType.NOTIFY_DETAIL, detail.getId(), detail.getAttachmentList());
-		}
 
 		if (detail.getMsgType().isQueue()) {
 			// 加入外部消息队列
@@ -88,9 +77,7 @@ public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDe
 	public List<NotifyDetail> listByNotifyId(String notifyId) {
 		NotifyDetail example = new NotifyDetail();
 		example.setNotifyId(notifyId);
-		List<NotifyDetail> detailList = mapper.selectAllByExample(example);
+		return mapper.selectAllByExample(example);
-		loadAttachments(detailList);
-		return detailList;
 	}
 
 	/// 删除通知详情
@@ -148,11 +135,9 @@ public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDe
 		result.setTotal(unreadOnly
 			? mapper.countUnreadSiteByUserId(userId)
 			: mapper.countSiteByUserId(userId));
-		List<NotifyDetail> detailList = unreadOnly
+		result.setList(unreadOnly
 			? mapper.selectUnreadSiteByUserId(userId, validPage.getOffset(), validPage.getLimit())
-			: mapper.selectSiteByUserId(userId, validPage.getOffset(), validPage.getLimit());
+			: mapper.selectSiteByUserId(userId, validPage.getOffset(), validPage.getLimit()));
-		loadAttachments(detailList);
-		result.setList(detailList);
 		return result;
 	}
 
@@ -167,51 +152,19 @@ public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDe
 		TimiException.required(userId, "未找到用户 ID");
 		NotifyDetail detail = mapper.selectSiteByIdAndUserId(detailId, userId);
 		TimiException.required(detail, "未找到站内通知");
-		loadAttachments(detail);
 		return detail;
 	}
 
-	/// 回填通知详情的媒体附件
+	/// 删除当前用户拥有的站内通知详情
-	///
-	/// @param detailList 通知详情列表
-	private void loadAttachments(List<NotifyDetail> detailList) {
-		List<String> detailIdList = detailList.stream()
-				.filter(detail -> detail.getMsgType() == NotifyDetail.MsgType.INTERNAL)
-				.map(NotifyDetail::getId)
-				.toList();
-		if (detailIdList.isEmpty()) {
-			return;
-		}
-		Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(
-			Attachment.BizType.NOTIFY_DETAIL,
-			detailIdList
-		);
-		for (NotifyDetail detail : detailList) {
-			if (detail.getMsgType() == NotifyDetail.MsgType.INTERNAL) {
-				detail.setAttachmentList(attachmentMap.getOrDefault(detail.getId(), List.of()));
-			}
-		}
-	}
-
-	/// 回填通知详情的媒体附件
-	///
-	/// @param detail 通知详情
-	private void loadAttachments(NotifyDetail detail) {
-		if (detail.getMsgType() == NotifyDetail.MsgType.INTERNAL) {
-			detail.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.NOTIFY_DETAIL, detail.getId()));
-		}
-	}
-
-	/// 隐藏当前用户拥有的站内通知详情
 	///
 	/// @param detailId 通知详情 ID
 	/// @param userId 用户 ID
 	@Override
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
-	public void hideInternalByUserId(String detailId, String userId) {
+	public void deleteInternalByUserId(String detailId, String userId) {
 		TimiException.required(detailId, "未找到通知详情 ID");
 		TimiException.required(userId, "未找到用户 ID");
-		int affected = mapper.hideSiteByIdAndUserId(detailId, userId);
+		int affected = mapper.deleteSiteByIdAndUserId(detailId, userId);
 		TimiException.requiredTrue(0 < affected, "未找到站内通知");
 	}
 

src/main/java/com/imyeyu/api/modules/common/service/implement/NotifyServiceImplement.java

@@ -8,13 +8,10 @@ import com.imyeyu.api.modules.common.service.NotifyDetailService;
 import com.imyeyu.api.modules.common.service.NotifyService;
 import com.imyeyu.api.modules.system.entity.Logger;
 import com.imyeyu.api.modules.system.service.LoggerService;
-import com.imyeyu.api.modules.common.vo.NotifyManagementItem;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
-import com.imyeyu.spring.bean.Page;
-import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
@@ -56,10 +53,12 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 		try {
 			TimiException.required(notify, "未找到通知");
 			TimiException.required(notify.getDetailList(), "未找到通知详情列表");
-			String sendFrom = userLoginService.isLogged() ? userLoginService.getRequireLoginUserId() : null;
-			notify.setCreatedBy(sendFrom);
 			super.create(notify);
 
+			String sendFrom = null;
+			if (userLoginService.isLogged()) {
+				sendFrom = userLoginService.getRequireLoginUserId();
+			}
 			for (NotifyDetail detail : notify.getDetailList()) {
 				detail.setNotifyId(notify.getId());
 				if (TimiJava.isNotEmpty(sendFrom)) {
@@ -83,55 +82,6 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 		}
 	}
 
-	/// 分页查询当前用户创建的通知
-	///
-	/// @param page 分页参数
-	/// @param userId 用户 ID
-	/// @return 管理端通知列表
-	@Override
-	public PageResult<NotifyManagementItem> pageManagement(Page<Notify> page, String userId) {
-		TimiException.required(userId, "未找到用户 ID");
-		Page<Notify> validPage = TimiJava.defaultIfNull(page, new Page<>());
-		PageResult<NotifyManagementItem> result = new PageResult<>();
-		result.setTotal(mapper.countManagement(userId));
-		result.setList(mapper.selectManagementPage(userId, validPage.getOffset(), validPage.getLimit()));
-		return result;
-	}
-
-	/// 查询当前用户可管理的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 用户 ID
-	/// @return 通知
-	@Override
-	public Notify getManagement(String notifyId, String userId) {
-		TimiException.required(notifyId, "未找到通知 ID");
-		TimiException.required(userId, "未找到用户 ID");
-		Notify notify = mapper.selectManagement(notifyId, userId);
-		TimiException.required(notify, "未找到可管理的通知");
-		return notify;
-	}
-
-	/// 删除当前用户创建的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 用户 ID
-	@Override
-	public void deleteManagement(String notifyId, String userId) {
-		getManagement(notifyId, userId);
-		delete(notifyId);
-	}
-
-	/// 取消当前用户创建的通知
-	///
-	/// @param notifyId 通知 ID
-	/// @param userId 用户 ID
-	@Override
-	public void cancelManagement(String notifyId, String userId) {
-		getManagement(notifyId, userId);
-		cancel(notifyId);
-	}
-
 	/// 删除通知并级联软删除通知详情
 	///
 	/// @param notifyId 通知 ID

src/main/java/com/imyeyu/api/modules/common/vo/NotifyManagementItem.java

@@ -1,57 +0,0 @@
-package com.imyeyu.api.modules.common.vo;
-
-import com.imyeyu.api.modules.common.entity.NotifyDetail;
-import lombok.Data;
-
-/// 管理端通知列表项
-///
-/// @author 夜雨
-/// @since 2026-08-25
-@Data
-public class NotifyManagementItem {
-
-	/// 通知 ID
-	private String id;
-
-	/// 创建者用户 ID
-	private String createdBy;
-
-	/// 创建时间
-	private Long createdAt;
-
-	/// 更新时间
-	private Long updatedAt;
-
-	/// 通知标题
-	private String subject;
-
-	/// 通知内容
-	private String content;
-
-	/// 内容类型
-	private NotifyDetail.ContentType contentType;
-
-	/// 发送时间
-	private Long sendAt;
-
-	/// 接收用户数量
-	private Long recipientCount;
-
-	/// 已读用户数量
-	private Long readCount;
-
-	/// 等待发送数量
-	private Long waitingCount;
-
-	/// 已发送数量
-	private Long remindedCount;
-
-	/// 超时数量
-	private Long timeoutCount;
-
-	/// 已取消数量
-	private Long cancelCount;
-
-	/// 失败数量
-	private Long failCount;
-}

src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerChartController.java

@@ -3,11 +3,9 @@ package com.imyeyu.api.modules.gao.controller;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.service.GaoCustomerChartService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerChartReq;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import lombok.RequiredArgsConstructor;
@@ -28,7 +26,6 @@ import java.util.List;
 public class GaoCustomerChartController {
 
 	private final GaoCustomerChartService service;
-	private final GaoStoreScopeService storeScopeService;
 
 	/// 查询客户登记每日统计，可同时支撑登记趋势和登记事件结构图表
 	@AOPLog
@@ -36,8 +33,6 @@ public class GaoCustomerChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/daily")
 	public List<GaoEventRecordDailyStatView> eventRecordDaily(@RequestBody GaoCustomerChartReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordDailyStat(req);
 	}
 
@@ -47,8 +42,6 @@ public class GaoCustomerChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/calendar")
 	public List<GaoEventRecordCalendarView> eventRecordCalendar(@RequestBody GaoCustomerChartReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordCalendar(req);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerController.java

@@ -1,17 +1,21 @@
 package com.imyeyu.api.modules.gao.controller;
 
 import com.fasterxml.jackson.annotation.JsonView;
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
+import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -46,9 +50,11 @@ import java.util.Map;
 public class GaoCustomerController {
 
 	private final UserService userService;
+	private final RoleChecker roleChecker;
 	private final AttachmentService attachmentService;
 	private final GaoCustomerService service;
-	private final GaoStoreScopeService storeScopeService;
+	private final GaoStoreService gaoStoreService;
+	private final UserLoginService userLoginService;
 
 	@AOPLog
 	@RequestRateLimit
@@ -56,8 +62,6 @@ public class GaoCustomerController {
 	@PostMapping("/list")
 	@JsonView(ResponseView.Public.class)
 	public PageResult<GaoCustomer> list(@RequestBody GaoCustomerPage page) {
-		TimiException.required(page, "not found page");
-		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		PageResult<GaoCustomer> result = service.pageByQuery(page);
 
 		List<String> idList = result.getList().stream().map(GaoCustomer::getId).distinct().toList();
@@ -75,8 +79,6 @@ public class GaoCustomerController {
 	@JsonView(ResponseView.Public.class)
 	public GaoCustomer detail(@RequestParam String id) {
 		GaoCustomer customer = service.get(id);
-		TimiException.required(customer, "not found customer");
-		storeScopeService.checkStoreId(customer.getStoreId());
 		if (TimiJava.isNotEmpty(customer.getIntroducerCustomerId())) {
 			GaoCustomer introducerCustomer = service.get(customer.getIntroducerCustomerId());
 			introducerCustomer.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.GAO_CUSTOMER, introducerCustomer.getId()));
@@ -95,7 +97,9 @@ public class GaoCustomerController {
 	@PostMapping("/create")
 	@JsonView(ResponseView.Public.class)
 	public String create(@RequestBody GaoCustomer customer) {
-		customer.setStoreId(storeScopeService.resolveStoreId(customer.getStoreId()));
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+			customer.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+		}
 		service.create(customer);
 		return customer.getId();
 	}
@@ -105,12 +109,9 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoCustomer customer) {
-		TimiException.required(customer, "not found customer");
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-		TimiException.required(customer.getId(), "not found customer.id");
+			customer.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
-		GaoCustomer dbCustomer = service.get(customer.getId());
+		}
-		TimiException.required(dbCustomer, "not found customer");
-		storeScopeService.checkStoreId(dbCustomer.getStoreId());
-		customer.setStoreId(dbCustomer.getStoreId());
 		service.updateWithAttachment(customer);
 	}
 
@@ -119,9 +120,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
-		GaoCustomer customer = service.get(id);
-		TimiException.required(customer, "not found customer");
-		storeScopeService.checkStoreId(customer.getStoreId());
 		service.delete(id);
 	}
 
@@ -133,7 +131,6 @@ public class GaoCustomerController {
 	public GaoCustomer findById(@RequestParam String id) {
 		GaoCustomer customer = service.get(id);
 		TimiException.required(customer, "not found customer");
-		storeScopeService.checkStoreId(customer.getStoreId());
 		customer.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.GAO_CUSTOMER, customer.getId()));
 		return customer;
 	}
@@ -144,7 +141,7 @@ public class GaoCustomerController {
 	@PostMapping("/find/code")
 	@JsonView(ResponseView.Public.class)
 	public GaoCustomer findByCode(@RequestParam String storeId, @RequestParam String code) {
-		GaoCustomer customer = service.getByCode(storeScopeService.resolveStoreId(storeId), code);
+		GaoCustomer customer = service.getByCode(storeId, code);
 		if (customer == null) {
 			return null;
 		}
@@ -158,7 +155,7 @@ public class GaoCustomerController {
 	@PostMapping("/find/name")
 	@JsonView(ResponseView.Public.class)
 	public GaoCustomer findByName(@RequestParam String storeId, @RequestParam String name) {
-		GaoCustomer customer = service.getByName(storeScopeService.resolveStoreId(storeId), name);
+		GaoCustomer customer = service.getByName(storeId, name);
 		if (customer == null) {
 			return null;
 		}
@@ -172,12 +169,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_EXPORT)
 	@PostMapping("/export")
 	public void export(@RequestBody Page<GaoCustomer> page) throws IOException {
-		TimiException.required(page, "not found page");
-		if (!storeScopeService.hasGlobalScope()) {
-			GaoCustomer example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoCustomer());
-			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
-			page.setEqualsExample(example);
-		}
 		HttpServletResponse resp = TimiSpring.getResponse();
 		String contentDisposition = Network.getFileDownloadHeader("客户列表-%s.xlsx".formatted(Time.serialize.format(Time.now())));
 		resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -191,9 +182,6 @@ public class GaoCustomerController {
 	@PostMapping("/invited/list")
 	@JsonView(ResponseView.Public.class)
 	public List<GaoCustomer> listInvited(@RequestParam String introducerCustomerId) {
-		GaoCustomer introducerCustomer = service.get(introducerCustomerId);
-		TimiException.required(introducerCustomer, "not found introducerCustomer");
-		storeScopeService.checkStoreId(introducerCustomer.getStoreId());
 		List<GaoCustomer> result = service.listInvited(introducerCustomerId);
 		List<String> idList = result.stream().map(GaoCustomer::getId).distinct().toList();
 		Map<String, List<Attachment>> attachMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, idList);
@@ -208,9 +196,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_UPDATE)
 	@PostMapping("/invite/save")
 	public void saveInvite(@RequestParam String introducerCustomerId, @RequestParam String customerId) {
-		GaoCustomer customer = service.get(customerId);
-		TimiException.required(customer, "not found customer");
-		storeScopeService.checkStoreId(customer.getStoreId());
 		service.saveInviteRelation(introducerCustomerId, customerId);
 	}
 
@@ -219,9 +204,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_UPDATE)
 	@PostMapping("/invite/delete")
 	public void deleteInvite(@RequestParam String customerId) {
-		GaoCustomer customer = service.get(customerId);
-		TimiException.required(customer, "not found customer");
-		storeScopeService.checkStoreId(customer.getStoreId());
 		service.deleteInviteRelation(customerId);
 	}
 
@@ -231,8 +213,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_READ)
 	@PostMapping("/state/daily")
 	public List<GaoCustomerDailyStateView> dailyStat(@RequestBody GaoCustomerTrendStateReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.stateDailyTrend(req);
 	}
 
@@ -242,6 +222,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_READ)
 	@PostMapping("/state/gender")
 	public List<GaoCustomerGenderStatView> genderStat(@RequestParam String storeId) {
-		return service.stateGender(storeScopeService.resolveStoreId(storeId));
+		return service.stateGender(storeId);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventController.java

@@ -1,12 +1,14 @@
 package com.imyeyu.api.modules.gao.controller;
 
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoEvent;
 import com.imyeyu.api.modules.gao.service.GaoEventService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
-import com.imyeyu.java.TimiJava;
+import com.imyeyu.api.modules.user.service.RoleChecker;
-import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import com.imyeyu.spring.bean.Page;
@@ -31,19 +33,15 @@ import java.util.Map;
 public class GaoEventController {
 
 	private final GaoEventService service;
-	private final GaoStoreScopeService storeScopeService;
+	private final RoleChecker roleChecker;
+	private final GaoStoreService gaoStoreService;
+	private final UserLoginService userLoginService;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.EVENT_READ)
 	@PostMapping("/list")
 	public PageResult<GaoEvent> list(@RequestBody Page<GaoEvent> page) {
-		TimiException.required(page, "not found page");
-		if (!storeScopeService.hasGlobalScope()) {
-			GaoEvent example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoEvent());
-			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
-			page.setEqualsExample(example);
-		}
 		PageResult<GaoEvent> result = service.page(page);
 		Map<String, List<String>> roleMap = service.mapRoleCodeListByEventIdList(result.getList().stream().map(GaoEvent::getId).toList());
 		for (GaoEvent event : result.getList()) {
@@ -54,10 +52,9 @@ public class GaoEventController {
 
 	@AOPLog
 	@RequestRateLimit
-	@RequireGaoPermission(GaoPermissionCode.EVENT_READ)
 	@PostMapping("/list/valid")
 	public List<GaoEvent> listValid(@RequestParam String storeId) {
-		return service.listValid(storeScopeService.resolveStoreId(storeId));
+		return service.listValid(storeId);
 	}
 
 	@AOPLog
@@ -66,8 +63,6 @@ public class GaoEventController {
 	@PostMapping("/detail")
 	public GaoEvent detail(@RequestParam String id) {
 		GaoEvent event = service.get(id);
-		TimiException.required(event, "not found event");
-		storeScopeService.checkStoreId(event.getStoreId());
 		event.setRoleCodeList(service.listRoleCode(event.getId()));
 		return event;
 	}
@@ -77,7 +72,9 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_CREATE)
 	@PostMapping("/create")
 	public void create(@RequestBody GaoEvent event) {
-		event.setStoreId(storeScopeService.resolveStoreId(event.getStoreId()));
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+			event.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+		}
 		service.create(event);
 	}
 
@@ -86,12 +83,9 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoEvent event) {
-		TimiException.required(event, "not found event");
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-		TimiException.required(event.getId(), "not found event.id");
+			event.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
-		GaoEvent dbEvent = service.get(event.getId());
+		}
-		TimiException.required(dbEvent, "not found event");
-		storeScopeService.checkStoreId(dbEvent.getStoreId());
-		event.setStoreId(dbEvent.getStoreId());
 		service.update(event);
 	}
 
@@ -100,11 +94,6 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_UPDATE)
 	@PostMapping("/sort")
 	public void sort(@RequestBody List<String> idList) {
-		for (String id : TimiJava.safeIterable(idList)) {
-			GaoEvent event = service.get(id);
-			TimiException.required(event, "not found event");
-			storeScopeService.checkStoreId(event.getStoreId());
-		}
 		service.sort(idList);
 	}
 
@@ -113,9 +102,6 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
-		GaoEvent event = service.get(id);
-		TimiException.required(event, "not found event");
-		storeScopeService.checkStoreId(event.getStoreId());
 		service.delete(id);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventRecordController.java

@@ -1,24 +1,27 @@
 package com.imyeyu.api.modules.gao.controller;
 
 import com.fasterxml.jackson.annotation.JsonView;
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.entity.GaoEvent;
 import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.service.GaoEventService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordPage;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordPageResult;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordRankPage;
+import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.network.Network;
 import com.imyeyu.spring.TimiSpring;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -49,11 +52,13 @@ import java.util.Map;
 public class GaoEventRecordController {
 
 	private final UserService userService;
+	private final RoleChecker roleChecker;
 	private final GaoEventService eventService;
 	private final AttachmentService attachmentService;
 	private final GaoCustomerService customerService;
-	private final GaoStoreScopeService storeScopeService;
+	private final GaoStoreService gaoStoreService;
 	private final GaoEventRecordService service;
+	private final UserLoginService userLoginService;
 
 	@AOPLog
 	@RequestRateLimit
@@ -61,8 +66,6 @@ public class GaoEventRecordController {
 	@PostMapping("/list")
 	@JsonView(ResponseView.Public.class)
 	public GaoEventRecordPageResult list(@RequestBody GaoEventRecordPage page) {
-		TimiException.required(page, "not found page");
-		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		PageResult<GaoEventRecord> pageResult = service.pageByRange(page);
 		GaoEventRecordPageResult result = new GaoEventRecordPageResult();
 		result.setTotal(pageResult.getTotal());
@@ -105,8 +108,6 @@ public class GaoEventRecordController {
 	@JsonView(ResponseView.Public.class)
 	public GaoEventRecord detail(@RequestParam String id) {
 		GaoEventRecord record = service.get(id);
-		TimiException.required(record, "not found event record");
-		storeScopeService.checkStoreId(record.getStoreId());
 		record.setCustomer(customerService.get(record.getCustomerId()));
 		record.getCustomer().setAttachmentList(attachmentService.listByBizId(Attachment.BizType.GAO_CUSTOMER, record.getCustomerId()));
 		record.setEvent(eventService.get(record.getEventId()));
@@ -120,7 +121,9 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_CREATE)
 	@PostMapping("/create")
 	public void create(@RequestBody GaoEventRecord record) {
-		resolveCreateRecordStore(record);
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+			record.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+		}
 		service.create(record);
 	}
 
@@ -129,8 +132,11 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_CREATE)
 	@PostMapping("/create/batch")
 	public void createBatch(@RequestBody List<GaoEventRecord> recordList) {
-		for (GaoEventRecord record : TimiJava.safeIterable(recordList)) {
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-			resolveCreateRecordStore(record);
+			String storeId = gaoStoreService.getBelongIdByRequiredLoginUserId();
+			for (GaoEventRecord record : recordList) {
+				record.setStoreId(storeId);
+			}
 		}
 		service.createBatch(recordList);
 	}
@@ -140,17 +146,11 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_CREATE)
 	@PostMapping("/create/customer")
 	public void createWithCustomer(@RequestBody GaoCustomer customer) {
-		TimiException.required(customer, "not found customer");
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-		if (TimiJava.isNotEmpty(customer.getId())) {
+			String storeId = gaoStoreService.getBelongIdByRequiredLoginUserId();
-			GaoCustomer dbCustomer = customerService.get(customer.getId());
+			for (GaoEventRecord record : TimiJava.safeIterable(customer.getEventRecordList())) {
-			TimiException.required(dbCustomer, "not found customer");
+				record.setStoreId(storeId);
-			storeScopeService.checkStoreId(dbCustomer.getStoreId());
+			}
-			customer.setStoreId(dbCustomer.getStoreId());
-		} else {
-			customer.setStoreId(storeScopeService.resolveStoreId(customer.getStoreId()));
-		}
-		for (GaoEventRecord record : TimiJava.safeIterable(customer.getEventRecordList())) {
-			resolveCreateRecordStore(record);
 		}
 		service.createWithCustomer(customer);
 	}
@@ -160,12 +160,9 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoEventRecord record) {
-		TimiException.required(record, "not found event record");
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-		TimiException.required(record.getId(), "not found event record.id");
+			record.setStoreId(gaoStoreService.getBelongIdByRequiredLoginUserId());
-		GaoEventRecord dbRecord = service.get(record.getId());
+		}
-		TimiException.required(dbRecord, "not found event record");
-		storeScopeService.checkStoreId(dbRecord.getStoreId());
-		record.setStoreId(dbRecord.getStoreId());
 		service.update(record);
 	}
 
@@ -174,9 +171,6 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
-		GaoEventRecord record = service.get(id);
-		TimiException.required(record, "not found event record");
-		storeScopeService.checkStoreId(record.getStoreId());
 		service.delete(id);
 	}
 
@@ -186,8 +180,6 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_EXPORT)
 	@PostMapping("/export")
 	public void export(@RequestBody GaoEventRecordPage page) throws IOException {
-		TimiException.required(page, "not found page");
-		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		HttpServletResponse resp = TimiSpring.getResponse();
 		String contentDisposition = Network.getFileDownloadHeader("登记事件记录-%s.xlsx".formatted(Time.serialize.format(Time.now())));
 		resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -201,8 +193,6 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/rank")
 	public PageResult<GaoCustomerEventRankView> eventRank(@RequestBody GaoEventRecordRankPage page) {
-		TimiException.required(page, "not found page");
-		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		PageResult<GaoCustomerEventRankView> result = service.pageRankByRange(page);
 		List<String> customerIdList = result.getList().stream().map(GaoCustomerEventRankView::getCustomerId).distinct().toList();
 		if (customerIdList.isEmpty()) {
@@ -219,12 +209,4 @@ public class GaoEventRecordController {
 		}
 		return result;
 	}
-
-	private void resolveCreateRecordStore(GaoEventRecord record) {
-		TimiException.required(record, "not found event record");
-		GaoEvent event = eventService.get(record.getEventId());
-		TimiException.required(event, "not found event");
-		storeScopeService.checkStoreId(event.getStoreId());
-		record.setStoreId(event.getStoreId());
-	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoNotifyController.java

@@ -1,158 +0,0 @@
-package com.imyeyu.api.modules.gao.controller;
-
-import com.fasterxml.jackson.annotation.JsonView;
-import com.imyeyu.api.annotation.RequireCorePermission;
-import com.imyeyu.api.bean.CorePermissionCode;
-import com.imyeyu.api.bean.PermissionMatchMode;
-import com.imyeyu.api.modules.common.entity.Attachment;
-import com.imyeyu.api.modules.common.entity.Notify;
-import com.imyeyu.api.modules.common.entity.NotifyDetail;
-import com.imyeyu.api.modules.common.service.AttachmentService;
-import com.imyeyu.api.modules.common.service.NotifyService;
-import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
-import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.entity.GaoUser;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
-import com.imyeyu.api.modules.gao.service.GaoUserService;
-import com.imyeyu.api.modules.user.entity.User;
-import com.imyeyu.api.modules.user.service.UserLoginService;
-import com.imyeyu.api.modules.user.service.UserService;
-import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
-import com.imyeyu.spring.annotation.RequestRateLimit;
-import com.imyeyu.spring.annotation.RequiredToken;
-import com.imyeyu.spring.bean.Page;
-import com.imyeyu.spring.bean.PageResult;
-import com.imyeyu.spring.util.ResponseView;
-import com.imyeyu.utils.Time;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/// GAO 通知接口
-///
-/// 这里的通知接收用户必须属于当前操作人的 GAO 用户范围，当前登录用户本人除外。
-///
-/// @author Codex
-/// @since 2026-08-25
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/gao/notify")
-public class GaoNotifyController {
-
-	private final GaoUserService gaoUserService;
-	private final GaoStoreScopeService storeScopeService;
-	private final NotifyService notifyService;
-	private final UserLoginService userLoginService;
-	private final UserService userService;
-	private final AttachmentService attachmentService;
-
-	/// 查询可作为通知接收人的 GAO 用户
-	///
-	/// 门店管理范围可以查询全部门店或指定门店，店长只能查询当前门店。
-	///
-	/// @param page 分页参数
-	/// @return 可发送用户分页结果
-	@JsonView(ResponseView.Public.class)
-	@RequiredToken
-	@RequestRateLimit
-	@RequireCorePermission(CorePermissionCode.NOTIFY_CREATE)
-	@RequireGaoPermission(value = {GaoPermissionCode.USER_READ, GaoPermissionCode.STORE_READ}, mode = PermissionMatchMode.ANY)
-	@PostMapping("/recipient/list")
-	public PageResult<GaoUser> recipientList(@RequestBody Page<GaoUser> page) {
-		TimiException.required(page, "未找到分页参数");
-		GaoUser example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoUser());
-		if (storeScopeService.hasGlobalScope()) {
-			if (TimiJava.isNotEmpty(example.getStoreId())) {
-				storeScopeService.checkStoreId(example.getStoreId());
-			}
-		} else {
-			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
-		}
-		page.setEqualsExample(example);
-
-		PageResult<GaoUser> result = gaoUserService.pageRecipients(page);
-		fillUser(result.getList());
-		return result;
-	}
-
-	/// 创建 GAO 站内通知
-	///
-	/// 只允许发送站内通知，并逐个校验接收用户是否属于当前操作人的门店范围；当前用户可以接收自己发送的通知。
-	///
-	/// @param notify 通知及通知详情
-	/// @return 创建后的通知
-	@RequiredToken
-	@RequestRateLimit
-	@RequireCorePermission(CorePermissionCode.NOTIFY_CREATE)
-	@RequireGaoPermission(value = {GaoPermissionCode.USER_READ, GaoPermissionCode.STORE_READ}, mode = PermissionMatchMode.ANY)
-	@PostMapping("/create")
-	public Notify create(@RequestBody Notify notify) {
-		checkRecipientBoundary(notify);
-		notifyService.create(notify);
-		return notify;
-	}
-
-	/// 校验通知接收用户边界
-	///
-	/// @param notify 通知
-	private void checkRecipientBoundary(Notify notify) {
-		TimiException.required(notify, "未找到通知");
-		List<NotifyDetail> detailList = notify.getDetailList();
-		TimiException.required(detailList, "未找到通知详情列表");
-		TimiException.requiredTrue(!detailList.isEmpty(), "通知详情列表不能为空");
-
-		Set<String> recipientIdSet = detailList.stream().map(detail -> {
-			TimiException.required(detail, "未找到通知详情");
-			TimiException.requiredTrue(detail.getMsgType() == NotifyDetail.MsgType.INTERNAL, "GAO 通知仅支持站内通知");
-			TimiException.required(detail.getSendTo(), "未找到通知接收用户 ID");
-			if (detail.getSendAt() != null) {
-				TimiException.requiredTrue(Time.now() < detail.getSendAt(), "定时发送时间必须晚于当前时间");
-			}
-			return detail.getSendTo();
-		}).collect(Collectors.toSet());
-		TimiException.requiredTrue(recipientIdSet.size() == detailList.size(), "通知接收用户不能重复");
-
-		String loginUserId = userLoginService.getRequireLoginUserId();
-		Set<String> gaoRecipientIdSet = recipientIdSet.stream()
-			.filter(recipientId -> !loginUserId.equals(recipientId))
-			.collect(Collectors.toSet());
-		Map<String, GaoUser> gaoUserMap = gaoUserService.mapByUserIdList(gaoRecipientIdSet);
-		TimiException.requiredTrue(gaoUserMap.size() == gaoRecipientIdSet.size(), "包含无效的通知接收用户");
-		for (GaoUser gaoUser : gaoUserMap.values()) {
-			TimiException.requiredTrue(Boolean.TRUE.equals(gaoUser.getEnabled()), "通知接收用户已停用");
-			storeScopeService.checkStoreId(gaoUser.getStoreId());
-		}
-	}
-
-	/// 回填 GAO 用户的核心用户资料
-	///
-	/// @param gaoUserList GAO 用户列表
-	private void fillUser(List<GaoUser> gaoUserList) {
-		if (TimiJava.isEmpty(gaoUserList)) {
-			return;
-		}
-		List<String> userIdList = gaoUserList.stream().map(GaoUser::getUserId).toList();
-		Map<String, User> userMap = userService.mapByIdList(userIdList);
-		Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(
-			Attachment.BizType.USER,
-			userIdList,
-			User.AttachType.AVATAR.toString()
-		);
-		for (GaoUser gaoUser : gaoUserList) {
-			User user = userMap.get(gaoUser.getUserId());
-			if (user == null) {
-				continue;
-			}
-			user.setAttachmentList(attachmentMap.getOrDefault(user.getId(), List.of()));
-			gaoUser.setUser(user);
-		}
-	}
-}

src/main/java/com/imyeyu/api/modules/gao/controller/GaoPointAccountController.java

@@ -1,11 +1,14 @@
 package com.imyeyu.api.modules.gao.controller;
 
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
 import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
 import com.imyeyu.api.modules.gao.vo.GaoPointAccountPage;
+import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
@@ -26,7 +29,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/gao/customer/point")
 public class GaoPointAccountController {
 
-	private final GaoStoreScopeService storeScopeService;
+	private final RoleChecker roleChecker;
+	private final GaoStoreService storeService;
 	private final GaoPointAccountService accountService;
 
 	@AOPLog
@@ -35,7 +39,7 @@ public class GaoPointAccountController {
 	@PostMapping("/account/list")
 	public PageResult<GaoPointAccount> list(@RequestBody GaoPointAccountPage page) {
 		TimiException.required(page, "not found page");
-		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
+		page.setStoreId(resolveStoreId(page.getStoreId()));
 		return accountService.pageByQuery(page);
 	}
 
@@ -44,7 +48,7 @@ public class GaoPointAccountController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_ACCOUNT_READ)
 	@PostMapping("/account/detail/customer")
 	public GaoPointAccount detail(@RequestParam String customerId, @RequestParam(required = false) String storeId) {
-		storeId = storeScopeService.resolveStoreId(storeId);
+		storeId = resolveStoreId(storeId);
 		return accountService.getByCustomerId(storeId, customerId);
 	}
 
@@ -53,6 +57,13 @@ public class GaoPointAccountController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_ACCOUNT_READ)
 	@PostMapping("/account/detail")
 	public GaoPointAccount detailById(@RequestParam String id, @RequestParam(required = false) String storeId) {
-		return accountService.getByIdAndStoreId(storeScopeService.resolveStoreId(storeId), id);
+		return accountService.getByIdAndStoreId(resolveStoreId(storeId), id);
+	}
+
+	private String resolveStoreId(String requestedStoreId) {
+		if (roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+			return requestedStoreId;
+		}
+		return storeService.getBelongIdByRequiredLoginUserId();
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoPointLedgerController.java

@@ -1,13 +1,16 @@
 package com.imyeyu.api.modules.gao.controller;
 
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoPointLedger;
 import com.imyeyu.api.modules.gao.service.GaoPointLedgerService;
 import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
 import com.imyeyu.api.modules.gao.vo.GaoPointAdjustRequest;
 import com.imyeyu.api.modules.gao.vo.GaoPointLedgerPage;
+import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
@@ -27,7 +30,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/gao/customer/point")
 public class GaoPointLedgerController {
 
-	private final GaoStoreScopeService storeScopeService;
+	private final RoleChecker roleChecker;
+	private final GaoStoreService storeService;
 	private final GaoPointLedgerService ledgerService;
 	private final GaoPointTriggerService triggerService;
 
@@ -37,7 +41,7 @@ public class GaoPointLedgerController {
 	@PostMapping("/ledger/list")
 	public PageResult<GaoPointLedger> list(@RequestBody GaoPointLedgerPage page) {
 		TimiException.required(page, "not found page");
-		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
+		page.setStoreId(resolveStoreId(page.getStoreId()));
 		return ledgerService.pageByQuery(page);
 	}
 
@@ -46,7 +50,14 @@ public class GaoPointLedgerController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_ADJUST)
 	@PostMapping("/adjust")
 	public void adjust(@RequestBody GaoPointAdjustRequest request) {
-		request.setStoreId(storeScopeService.resolveStoreId(request.getStoreId()));
+		request.setStoreId(resolveStoreId(request.getStoreId()));
 		triggerService.adjust(request);
 	}
+
+	private String resolveStoreId(String requestedStoreId) {
+		if (roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+			return requestedStoreId;
+		}
+		return storeService.getBelongIdByRequiredLoginUserId();
+	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoPointRuleController.java

@@ -1,10 +1,13 @@
 package com.imyeyu.api.modules.gao.controller;
 
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoPointRule;
 import com.imyeyu.api.modules.gao.service.GaoPointRuleService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -29,7 +32,8 @@ import java.util.List;
 @RequestMapping("/gao/customer/point")
 public class GaoPointRuleController {
 
-	private final GaoStoreScopeService storeScopeService;
+	private final RoleChecker roleChecker;
+	private final GaoStoreService storeService;
 	private final GaoPointRuleService ruleService;
 
 	@AOPLog
@@ -38,9 +42,9 @@ public class GaoPointRuleController {
 	@PostMapping("/rule/list")
 	public PageResult<GaoPointRule> list(@RequestBody Page<GaoPointRule> page) {
 		TimiException.required(page, "not found page");
-		if (!storeScopeService.hasGlobalScope()) {
+		if (!isGlobalManager()) {
 			GaoPointRule example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoPointRule());
-			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
+			example.setStoreId(resolveStoreId(null));
 			page.setEqualsExample(example);
 		}
 		return ruleService.page(page);
@@ -53,7 +57,7 @@ public class GaoPointRuleController {
 	public GaoPointRule detail(@RequestParam String id) {
 		GaoPointRule rule = ruleService.get(id);
 		TimiException.required(rule, "not found point rule");
-		storeScopeService.checkStoreId(rule.getStoreId());
+		checkStore(rule.getStoreId());
 		return rule;
 	}
 
@@ -62,7 +66,7 @@ public class GaoPointRuleController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_RULE_CREATE)
 	@PostMapping("/rule/create")
 	public String create(@RequestBody GaoPointRule rule) {
-		rule.setStoreId(storeScopeService.resolveStoreId(rule.getStoreId()));
+		rule.setStoreId(resolveStoreId(rule.getStoreId()));
 		ruleService.create(rule);
 		return rule.getId();
 	}
@@ -72,7 +76,7 @@ public class GaoPointRuleController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_RULE_UPDATE)
 	@PostMapping("/rule/update")
 	public void update(@RequestBody GaoPointRule rule) {
-		rule.setStoreId(storeScopeService.resolveStoreId(rule.getStoreId()));
+		rule.setStoreId(resolveStoreId(rule.getStoreId()));
 		ruleService.update(rule);
 	}
 
@@ -83,7 +87,7 @@ public class GaoPointRuleController {
 	public void sort(@RequestBody List<String> idList) {
 		if (idList != null) {
 			for (GaoPointRule rule : ruleService.listByIdList(idList)) {
-				storeScopeService.checkStoreId(rule.getStoreId());
+				checkStore(rule.getStoreId());
 			}
 		}
 		ruleService.sort(idList);
@@ -96,7 +100,24 @@ public class GaoPointRuleController {
 	public void delete(@RequestParam String id) {
 		GaoPointRule rule = ruleService.get(id);
 		TimiException.required(rule, "not found point rule");
-		storeScopeService.checkStoreId(rule.getStoreId());
+		checkStore(rule.getStoreId());
 		ruleService.delete(id);
 	}
+
+	private String resolveStoreId(String requestedStoreId) {
+		if (isGlobalManager()) {
+			return requestedStoreId;
+		}
+		return storeService.getBelongIdByRequiredLoginUserId();
+	}
+
+	private void checkStore(String storeId) {
+		if (!isGlobalManager()) {
+			TimiException.requiredTrue(resolveStoreId(null).equals(storeId), "无权操作其他门店数据");
+		}
+	}
+
+	private boolean isGlobalManager() {
+		return roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
+	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreBusinessDayController.java

@@ -4,9 +4,6 @@ import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.entity.GaoStoreBusinessDay;
 import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
-import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import com.imyeyu.spring.bean.Page;
@@ -30,17 +27,12 @@ import java.util.List;
 public class GaoStoreBusinessDayController {
 
 	private final GaoStoreBusinessDayService service;
-	private final GaoStoreScopeService storeScopeService;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/list")
 	public PageResult<GaoStoreBusinessDay> list(@RequestBody Page<GaoStoreBusinessDay> page) {
-		TimiException.required(page, "not found page");
-		GaoStoreBusinessDay example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoStoreBusinessDay());
-		example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
-		page.setEqualsExample(example);
 		return service.page(page);
 	}
 
@@ -49,7 +41,7 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/calendar")
 	public List<GaoStoreBusinessDay> calendar(@RequestParam String storeId, @RequestParam Integer beginDateValue, @RequestParam Integer endDateValue) {
-		return service.listByDateRange(storeScopeService.resolveStoreId(storeId), beginDateValue, endDateValue);
+		return service.listByDateRange(storeId, beginDateValue, endDateValue);
 	}
 
 	@AOPLog
@@ -57,10 +49,7 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/detail")
 	public GaoStoreBusinessDay detail(@RequestParam String id) {
-		GaoStoreBusinessDay businessDay = service.get(id);
+		return service.get(id);
-		TimiException.required(businessDay, "not found businessDay");
-		storeScopeService.checkStoreId(businessDay.getStoreId());
-		return businessDay;
 	}
 
 	@AOPLog
@@ -68,7 +57,6 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/create")
 	public String create(@RequestBody GaoStoreBusinessDay businessDay) {
-		businessDay.setStoreId(storeScopeService.resolveStoreId(businessDay.getStoreId()));
 		service.create(businessDay);
 		return businessDay.getId();
 	}
@@ -78,12 +66,6 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoStoreBusinessDay businessDay) {
-		TimiException.required(businessDay, "not found businessDay");
-		TimiException.required(businessDay.getId(), "not found businessDay.id");
-		GaoStoreBusinessDay dbBusinessDay = service.get(businessDay.getId());
-		TimiException.required(dbBusinessDay, "not found businessDay");
-		storeScopeService.checkStoreId(dbBusinessDay.getStoreId());
-		businessDay.setStoreId(dbBusinessDay.getStoreId());
 		service.update(businessDay);
 	}
 
@@ -92,9 +74,6 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
-		GaoStoreBusinessDay businessDay = service.get(id);
-		TimiException.required(businessDay, "not found businessDay");
-		storeScopeService.checkStoreId(businessDay.getStoreId());
 		service.delete(id);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreChartController.java

@@ -3,14 +3,12 @@ package com.imyeyu.api.modules.gao.controller;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.service.GaoStoreChartService;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
 import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import lombok.RequiredArgsConstructor;
@@ -32,7 +30,6 @@ import java.util.List;
 public class GaoStoreChartController {
 
 	private final GaoStoreChartService service;
-	private final GaoStoreScopeService storeScopeService;
 
 	/// 查询客户增长趋势
 	@AOPLog
@@ -40,8 +37,6 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/customer/daily")
 	public List<GaoCustomerDailyStateView> customerDaily(@RequestBody GaoStoreChartReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.customerDailyTrend(req);
 	}
 
@@ -51,7 +46,7 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/customer/gender")
 	public List<GaoCustomerGenderStatView> customerGender(@RequestParam String storeId) {
-		return service.customerGender(storeScopeService.resolveStoreId(storeId));
+		return service.customerGender(storeId);
 	}
 
 	/// 查询登记事件每日统计，可同时支撑登记趋势和事件结构图表
@@ -60,8 +55,6 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/daily")
 	public List<GaoEventRecordDailyStatView> eventRecordDaily(@RequestBody GaoStoreChartReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordDailyStat(req);
 	}
 
@@ -71,8 +64,6 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/number-value/daily")
 	public List<GaoEventRecordNumberValueDailyStatView> eventRecordNumberValueDaily(@RequestBody GaoStoreChartReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordNumberValueDailyStat(req);
 	}
 
@@ -82,8 +73,6 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/calendar")
 	public List<GaoEventRecordCalendarView> eventRecordCalendar(@RequestBody GaoStoreChartReq req) {
-		TimiException.required(req, "not found req");
-		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordCalendar(req);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreController.java

@@ -1,13 +1,13 @@
 package com.imyeyu.api.modules.gao.controller;
 
+import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.entity.GaoStore;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.user.service.PermissionChecker;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.network.Network;
 import com.imyeyu.spring.TimiSpring;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -37,20 +37,14 @@ import java.util.List;
 public class GaoStoreController {
 
 	private final GaoStoreService service;
-	private final GaoStoreScopeService storeScopeService;
 	private final UserLoginService userLoginService;
+	private final PermissionChecker permissionChecker;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/list")
 	public PageResult<GaoStore> list(@RequestBody Page<GaoStore> page) {
-		TimiException.required(page, "not found page");
-		if (!storeScopeService.hasGlobalScope()) {
-			GaoStore example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoStore());
-			example.setId(storeScopeService.resolveStoreId(example.getId()));
-			page.setEqualsExample(example);
-		}
 		return service.page(page);
 	}
 
@@ -59,9 +53,7 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/detail")
 	public GaoStore detail(@RequestParam String id) {
-		GaoStore store = service.get(id);
+		return service.get(id);
-		storeScopeService.checkStore(store);
-		return store;
 	}
 
 	@AOPLog
@@ -78,13 +70,12 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoStore store) {
-		if (storeScopeService.hasGlobalScope()) {
+		if (permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.STORE_CREATE.getValue())) {
 			// 门店管理
 			service.update(store);
 		} else {
 			// 店长
 			GaoStore dbStore = service.get(store.getId());
-			storeScopeService.checkStore(dbStore);
 			dbStore.setName(store.getName());
 			dbStore.setTelephone(store.getTelephone());
 			dbStore.setAddress(store.getAddress());
@@ -107,11 +98,6 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/sort")
 	public void sort(@RequestBody List<String> idList) {
-		if (!storeScopeService.hasGlobalScope()) {
-			for (String id : TimiJava.safeIterable(idList)) {
-				storeScopeService.checkStore(service.get(id));
-			}
-		}
 		service.sort(idList);
 	}
 
@@ -121,12 +107,6 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_EXPORT)
 	@PostMapping("/export")
 	public void export(@RequestBody Page<GaoStore> page) throws IOException {
-		TimiException.required(page, "not found page");
-		if (!storeScopeService.hasGlobalScope()) {
-			GaoStore example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoStore());
-			example.setId(storeScopeService.resolveStoreId(example.getId()));
-			page.setEqualsExample(example);
-		}
 		HttpServletResponse resp = TimiSpring.getResponse();
 		String contentDisposition = Network.getFileDownloadHeader("门店列表-%s.xlsx".formatted(Time.serialize.format(Time.now())));
 		resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

src/main/java/com/imyeyu/api/modules/gao/controller/GaoUserController.java

@@ -6,8 +6,9 @@ import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoUser;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
 import com.imyeyu.api.modules.gao.service.GaoUserInviteService;
 import com.imyeyu.api.modules.gao.service.GaoUserService;
 import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateRequest;
@@ -18,13 +19,13 @@ import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateRequest;
 import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateResponse;
 import com.imyeyu.api.modules.user.entity.Role;
 import com.imyeyu.api.modules.user.entity.User;
-import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
+import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.api.modules.user.service.RoleService;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserRoleService;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.api.modules.user.vo.LoginResponse;
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import com.imyeyu.spring.bean.Page;
@@ -52,11 +53,12 @@ import java.util.UUID;
 public class GaoUserController {
 
 	private final UserService userService;
-	private final AuthorizationScopeService authorizationScopeService;
+	private final RoleService roleService;
+	private final RoleChecker roleChecker;
 	private final GaoUserService service;
 	private final GaoUserInviteService inviteService;
 	private final UserRoleService userRoleService;
-	private final GaoStoreScopeService storeScopeService;
+	private final GaoStoreService gaoStoreService;
 	private final UserLoginService userLoginService;
 	private final AttachmentService attachmentService;
 
@@ -91,11 +93,10 @@ public class GaoUserController {
 	@PostMapping("/list")
 	@JsonView(ResponseView.Public.class)
 	public PageResult<GaoUser> list(@RequestBody Page<GaoUser> page) {
-		TimiException.required(page, "not found page");
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-		if (!storeScopeService.hasGlobalScope()) {
 			// 非全局管理只能看所在店用户
 			page.setEqualsExample(TimiJava.defaultIfNull(page.getEqualsExample(), new GaoUser()));
-			page.getEqualsExample().setStoreId(storeScopeService.resolveStoreId(page.getEqualsExample().getStoreId()));
+			page.getEqualsExample().setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
 		}
 		PageResult<GaoUser> result = service.page(page);
 		{
@@ -117,8 +118,6 @@ public class GaoUserController {
 	@JsonView(ResponseView.Public.class)
 	public GaoUser detail(@RequestParam String id) {
 		GaoUser result = service.get(id);
-		TimiException.required(result, "not found gao user");
-		storeScopeService.checkStoreId(result.getStoreId());
 		{
 			User user = userService.get(result.getUserId());
 			user.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.USER, user.getId()));
@@ -136,7 +135,9 @@ public class GaoUserController {
 	@PostMapping("/create")
 	@JsonView(ResponseView.Public.class)
 	public GaoUser create(@RequestBody GaoUser gaoUser) {
-		gaoUser.setStoreId(storeScopeService.resolveStoreId(gaoUser.getStoreId()));
+		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+			gaoUser.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+		}
 		service.create(gaoUser);
 		return service.get(gaoUser.getId());
 	}
@@ -147,12 +148,6 @@ public class GaoUserController {
 	@PostMapping("/update")
 	@JsonView(ResponseView.Public.class)
 	public GaoUser update(@RequestBody GaoUser gaoUser) {
-		TimiException.required(gaoUser, "not found gao user");
-		TimiException.required(gaoUser.getId(), "not found gao user.id");
-		GaoUser dbGaoUser = service.get(gaoUser.getId());
-		TimiException.required(dbGaoUser, "not found gao user");
-		storeScopeService.checkStoreId(dbGaoUser.getStoreId());
-		gaoUser.setStoreId(dbGaoUser.getStoreId());
 		service.update(gaoUser);
 		return service.get(gaoUser.getId());
 	}
@@ -163,12 +158,6 @@ public class GaoUserController {
 	@PostMapping("/transfer/store")
 	@JsonView(ResponseView.Public.class)
 	public GaoUser transferStore(@RequestBody GaoUser gaoUser) {
-		TimiException.required(gaoUser, "not found gao user");
-		TimiException.required(gaoUser.getId(), "not found gao user.id");
-		GaoUser dbGaoUser = service.get(gaoUser.getId());
-		TimiException.required(dbGaoUser, "not found gao user");
-		storeScopeService.checkStoreId(dbGaoUser.getStoreId());
-		gaoUser.setStoreId(storeScopeService.resolveStoreId(gaoUser.getStoreId()));
 		service.transferStore(gaoUser);
 		return service.get(gaoUser.getId());
 	}
@@ -178,9 +167,6 @@ public class GaoUserController {
 	@RequireGaoPermission(GaoPermissionCode.USER_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
-		GaoUser gaoUser = service.get(id);
-		TimiException.required(gaoUser, "not found gao user");
-		storeScopeService.checkStoreId(gaoUser.getStoreId());
 		service.delete(id);
 	}
 
@@ -189,6 +175,7 @@ public class GaoUserController {
 	@RequireGaoPermission(GaoPermissionCode.USER_READ)
 	@PostMapping("/role/list")
 	public List<Role> roleList() {
-		return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
+		// TODO 此接口获取本模块所有角色，需要限制角色
+		return roleService.listByModuleCode(ModuleCode.GAO);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/mapper/GaoCustomerMapper.java

@@ -6,7 +6,6 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
 import com.imyeyu.spring.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.Collection;
 import java.util.List;
@@ -49,11 +48,4 @@ public interface GaoCustomerMapper extends BaseMapper<GaoCustomer, String> {
 	/// @param page 查询条件
 	/// @return 客户列表
 	List<GaoCustomer> selectByQuery(GaoCustomerPage page);
-
-	/// 原子调整邀请客户数
-	///
-	/// @param customerId 客户 ID
-	/// @param delta 变化量
-	@Update("UPDATE `gao_customer` SET `invited_count` = GREATEST(IFNULL(`invited_count`, 0) + #{delta}, 0), `updated_at` = " + UNIX_TIME + " WHERE `id` = #{customerId}" + NOT_DELETE)
-	void updateInvitedCountDelta(@Param("customerId") String customerId, @Param("delta") Long delta);
 }

src/main/java/com/imyeyu/api/modules/gao/mapper/GaoUserMapper.java

@@ -1,12 +1,7 @@
 package com.imyeyu.api.modules.gao.mapper;
 
 import com.imyeyu.api.modules.gao.entity.GaoUser;
-import com.imyeyu.spring.bean.Page;
 import com.imyeyu.spring.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-import java.util.List;
 
 ///
 /// GAO 用户 Mapper
@@ -14,10 +9,4 @@ import java.util.List;
 /// @author Codex
 /// @since 2026-07-30
 public interface GaoUserMapper extends BaseMapper<GaoUser, String> {
-
-	List<GaoUser> selectByUserIdList(Collection<String> userIdList);
-
-	List<GaoUser> selectRecipientPage(@Param("page") Page<GaoUser> page);
-
-	long countRecipients(@Param("page") Page<GaoUser> page);
 }

src/main/java/com/imyeyu/api/modules/gao/service/GaoStoreScopeService.java

@@ -1,33 +0,0 @@
-package com.imyeyu.api.modules.gao.service;
-
-import com.imyeyu.api.modules.gao.entity.GaoStore;
-
-/// GAO 门店资源范围服务
-///
-/// 同时拥有门店管理和店长角色时，按门店管理角色使用全局范围
-///
-/// @author Codex
-/// @since 2026-08-23
-public interface GaoStoreScopeService {
-
-	/// 判断当前用户是否拥有 GAO 全局范围
-	///
-	/// @return `true` 为允许访问全部门店
-	boolean hasGlobalScope();
-
-	/// 将请求门店 ID 解析为当前可用门店 ID
-	///
-	/// @param requestedStoreId 请求中的门店 ID，可为空
-	/// @return 门店 ID，全局范围可为空
-	String resolveStoreId(String requestedStoreId);
-
-	/// 检查门店是否在当前用户可管理范围内
-	///
-	/// @param storeId 门店 ID
-	void checkStoreId(String storeId);
-
-	/// 检查门店实体是否在当前用户可管理范围内
-	///
-	/// @param store 门店
-	void checkStore(GaoStore store);
-}

src/main/java/com/imyeyu/api/modules/gao/service/GaoUserService.java

@@ -1,13 +1,8 @@
 package com.imyeyu.api.modules.gao.service;
 
 import com.imyeyu.api.modules.gao.entity.GaoUser;
-import com.imyeyu.spring.bean.Page;
-import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.BaseService;
 
-import java.util.Collection;
-import java.util.Map;
-
 ///
 /// GAO 用户服务
 ///
@@ -24,16 +19,4 @@ public interface GaoUserService extends BaseService<GaoUser, String> {
 	///
 	/// @param gaoUser GAO 用户，必须包含 ID 和目标门店 ID
 	void transferStore(GaoUser gaoUser);
-
-	/// 根据核心用户 ID 映射 GAO 用户
-	///
-	/// @param userIdList 核心用户 ID 列表
-	/// @return GAO 用户映射
-	Map<String, GaoUser> mapByUserIdList(Collection<String> userIdList);
-
-	/// 查询可作为通知接收人的启用用户
-	///
-	/// @param page 分页参数
-	/// @return 接收用户分页结果
-	PageResult<GaoUser> pageRecipients(Page<GaoUser> page);
 }

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java

@@ -117,10 +117,12 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 				customer.setAge(ChronoUnit.YEARS.between(customer.getBirthdate(), LocalDate.now()));
 			}
 			customer.setInvitedCount(0L);
+			if (customer.hasIntroducer()) {
+				customer.setInvitedCount(1L);
+			}
 			customer.setCreatorUserId(userLoginService.getRequireLoginUserId());
 
 			super.create(customer);
-			changeInvitedCount(customer.getIntroducerCustomerId(), 1);
 			// 标签
 			if (customer.getTagApply() != null) {
 				tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), customer.getTagApply().getTagIdList());
@@ -367,12 +369,10 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		try {
 			logger.setContent(customerId);
 			GaoCustomer customer = get(customerId);
-			TimiException.required(customer, "not found customer");
-			String oldIntroducerCustomerId = customer.getIntroducerCustomerId();
 			customer.setIntroducerCustomerId(null);
 			mapper.update(customer);
 
-			changeInvitedCount(oldIntroducerCustomerId, -1);
+			changeInvitedCount(customer.getIntroducerCustomerId(), -1);
 			logger.setLevel(Logger.Level.INFO);
 			logger.setResult(customerId);
 		} catch (TimiException e) {
@@ -434,7 +434,9 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		if (TimiJava.isEmpty(customerId) || delta == 0) {
 			return;
 		}
-		mapper.updateInvitedCountDelta(customerId, delta);
+		GaoCustomer customer = get(customerId);
+		customer.setInvitedCount(customer.getInvitedCount() + delta);
+		mapper.update(customer);
 	}
 
 	private void fillPinyin(GaoCustomer customer) {

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoStoreScopeServiceImplement.java

@@ -1,58 +0,0 @@
-package com.imyeyu.api.modules.gao.service.implement;
-
-import com.imyeyu.api.bean.CoreRoleCode;
-import com.imyeyu.api.bean.ModuleCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
-import com.imyeyu.api.modules.gao.entity.GaoStore;
-import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
-import com.imyeyu.api.modules.user.service.RoleChecker;
-import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/// GAO 门店资源范围服务实现
-///
-/// @author Codex
-/// @since 2026-08-23
-@Service
-@RequiredArgsConstructor
-public class GaoStoreScopeServiceImplement implements GaoStoreScopeService {
-
-	private final RoleChecker roleChecker;
-	private final GaoStoreService gaoStoreService;
-
-	@Override
-	public boolean hasGlobalScope() {
-		return roleChecker.hasAny(ModuleCode.CORE, CoreRoleCode.SYSTEM.name(), CoreRoleCode.ADMIN.name())
-			|| roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
-	}
-
-	@Override
-	public String resolveStoreId(String requestedStoreId) {
-		if (hasGlobalScope()) {
-			return requestedStoreId;
-		}
-		String currentStoreId = gaoStoreService.getBelongIdByRequiredLoginUserId();
-		if (TimiJava.isNotEmpty(requestedStoreId)) {
-			TimiException.requiredTrue(currentStoreId.equals(requestedStoreId), "无权操作其他门店");
-		}
-		return currentStoreId;
-	}
-
-	@Override
-	public void checkStoreId(String storeId) {
-		TimiException.required(storeId, "not found storeId");
-		if (!hasGlobalScope()) {
-			String currentStoreId = gaoStoreService.getBelongIdByRequiredLoginUserId();
-			TimiException.requiredTrue(currentStoreId.equals(storeId), "无权操作其他门店");
-		}
-	}
-
-	@Override
-	public void checkStore(GaoStore store) {
-		TimiException.required(store, "not found store");
-		checkStoreId(store.getId());
-	}
-}

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoStoreServiceImplement.java

@@ -25,7 +25,6 @@ import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,7 +54,7 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
 	private final GaoPointAccountService pointAccountService;
 	private final GaoPointRuleService pointRuleService;
 	private final GaoStoreBusinessDayService businessDayService;
-	private final ObjectProvider<GaoUserService> gaoUserServiceProvider;
+	private final GaoUserService gaoUserService;
 	private final TagService tagService;
 
 	private final GaoStoreMapper mapper;
@@ -191,7 +190,7 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
 	///
 	/// @param storeId 门店 ID
 	private void deleteGaoUsers(String storeId) {
-		gaoUserServiceProvider.getObject().deleteByStoreId(storeId);
+		gaoUserService.deleteByStoreId(storeId);
 	}
 
 	/// 清理门店下未被客户删除逻辑覆盖的积分账户

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoUserServiceImplement.java

@@ -13,19 +13,12 @@ import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.mapper.BaseMapper;
-import com.imyeyu.spring.bean.Page;
-import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 ///
 /// GAO 用户服务实现
 ///
@@ -167,21 +160,4 @@ public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, Stri
 			loggerService.create(logger);
 		}
 	}
-
-	@Override
-	public Map<String, GaoUser> mapByUserIdList(Collection<String> userIdList) {
-		if (TimiJava.isEmpty(userIdList)) {
-			return Map.of();
-		}
-		return mapper.selectByUserIdList(userIdList).stream()
-			.collect(Collectors.toMap(GaoUser::getUserId, Function.identity()));
-	}
-
-	@Override
-	public PageResult<GaoUser> pageRecipients(Page<GaoUser> page) {
-		PageResult<GaoUser> result = new PageResult<>();
-		result.setTotal(mapper.countRecipients(page));
-		result.setList(mapper.selectRecipientPage(page));
-		return result;
-	}
 }

src/main/resources/db/migration/timiserver/V41__add_notify_detail_content_type.sql

@@ -1,15 +0,0 @@
-ALTER TABLE `notify_detail`
-  CHANGE COLUMN `data` `content` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容',
-  ADD COLUMN `content_type` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容类型' AFTER `content`;
-
-ALTER TABLE `sms_queue`
-  CHANGE COLUMN `data` `content` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容';
-
-ALTER TABLE `mail_queue`
-  CHANGE COLUMN `data` `content` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容';
-
-ALTER TABLE `http_queue`
-  CHANGE COLUMN `data` `content` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容';
-
-ALTER TABLE `wechat_queue`
-  CHANGE COLUMN `data` `content` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容';

src/main/resources/db/migration/timiserver/V42__fix_gao_customer_invited_count.sql

@@ -1,9 +0,0 @@
-UPDATE `gao_customer` AS `customer`
-SET `invited_count` = (
-	SELECT COUNT(1)
-	FROM `gao_customer` AS `invitee`
-	WHERE
-		`invitee`.`introducer_customer_id` = `customer`.`id`
-		AND `invitee`.`deleted_at` IS NULL
-)
-WHERE `customer`.`deleted_at` IS NULL;

src/main/resources/db/migration/timiserver/V43__add_notify_management_indexes.sql

@@ -1,6 +0,0 @@
-ALTER TABLE `notify`
-	ADD INDEX `idx_created_by_created`(`created_by` ASC, `created_at` DESC) USING BTREE;
-
-ALTER TABLE `notify_detail`
-	ADD INDEX `idx_notify_send_from_deleted`(`notify_id` ASC, `send_from` ASC, `deleted_at` ASC) USING BTREE,
-	ADD INDEX `idx_internal_user_send_at`(`msg_type` ASC, `send_to` ASC, `send_at` ASC, `deleted_at` ASC) USING BTREE;

src/main/resources/db/migration/timiserver/V44__add_notify_detail_hidden_at.sql

@@ -1,4 +0,0 @@
-ALTER TABLE `notify_detail`
-	ADD COLUMN `hidden_at` BIGINT(20) COMMENT '收件人隐藏时间' AFTER `read_at`,
-	DROP INDEX `idx_internal_user_send_at`,
-	ADD INDEX `idx_internal_user_send_at`(`msg_type` ASC, `send_to` ASC, `hidden_at` ASC, `send_at` ASC, `deleted_at` ASC) USING BTREE;

src/main/resources/mapper/timi-server/common/AttachmentVariantMapper.xml

@@ -98,13 +98,6 @@
 		)
 	</insert>
 
-	<update id="updateExpireAt">
-		UPDATE `attachment_variant`
-		SET `expire_at` = #{expireAt}
-		WHERE `id` = #{id}
-		AND `expire_at` &gt; #{now}
-	</update>
-
 	<delete id="delete">
 		DELETE FROM `attachment_variant`
 		WHERE `id` = #{id}

src/main/resources/mapper/timi-server/common/NotifyMapper.xml

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imyeyu.api.modules.common.mapper.NotifyMapper">
-	<select id="selectManagementPage" resultType="com.imyeyu.api.modules.common.vo.NotifyManagementItem">
-		SELECT
-			n.`id`,
-			n.`created_by`,
-			n.`created_at`,
-			n.`updated_at`,
-			MAX(detail.`subject`) AS `subject`,
-			MAX(detail.`content`) AS `content`,
-			MAX(detail.`content_type`) AS `content_type`,
-			MAX(detail.`send_at`) AS `send_at`,
-			COUNT(detail.`id`) AS `recipient_count`,
-			COUNT(CASE WHEN detail.`read_at` IS NOT NULL THEN 1 END) AS `read_count`,
-			COUNT(CASE WHEN detail.`status` = 'WAITING' THEN 1 END) AS `waiting_count`,
-			COUNT(CASE WHEN detail.`status` = 'REMINDED' THEN 1 END) AS `reminded_count`,
-			COUNT(CASE WHEN detail.`status` = 'TIMEOUT' THEN 1 END) AS `timeout_count`,
-			COUNT(CASE WHEN detail.`status` = 'CANCEL' THEN 1 END) AS `cancel_count`,
-			COUNT(CASE WHEN detail.`status` = 'FAIL' THEN 1 END) AS `fail_count`
-		FROM `notify` n
-		INNER JOIN `notify_detail` detail
-			ON detail.`notify_id` = n.`id`
-			AND detail.`msg_type` = 'INTERNAL'
-			AND detail.`deleted_at` IS NULL
-		WHERE n.`deleted_at` IS NULL
-			AND (
-				n.`created_by` = #{userId}
-				OR EXISTS (
-					SELECT 1
-					FROM `notify_detail` owner_detail
-					WHERE owner_detail.`notify_id` = n.`id`
-						AND owner_detail.`send_from` = #{userId}
-						AND owner_detail.`deleted_at` IS NULL
-				)
-			)
-		GROUP BY n.`id`, n.`created_by`, n.`created_at`, n.`updated_at`
-		ORDER BY n.`created_at` DESC
-		LIMIT #{offset}, #{limit}
-	</select>
-
-	<select id="countManagement" resultType="long">
-		SELECT COUNT(*)
-		FROM `notify` n
-		WHERE n.`deleted_at` IS NULL
-			AND (
-				n.`created_by` = #{userId}
-				OR EXISTS (
-					SELECT 1
-					FROM `notify_detail` owner_detail
-					WHERE owner_detail.`notify_id` = n.`id`
-						AND owner_detail.`send_from` = #{userId}
-						AND owner_detail.`deleted_at` IS NULL
-				)
-			)
-			AND EXISTS (
-				SELECT 1
-				FROM `notify_detail` detail
-				WHERE detail.`notify_id` = n.`id`
-					AND detail.`msg_type` = 'INTERNAL'
-					AND detail.`deleted_at` IS NULL
-			)
-	</select>
-
-	<select id="selectManagement" resultType="com.imyeyu.api.modules.common.entity.Notify">
-		SELECT n.*
-		FROM `notify` n
-		WHERE n.`id` = #{notifyId}
-			AND n.`deleted_at` IS NULL
-			AND (
-				n.`created_by` = #{userId}
-				OR EXISTS (
-					SELECT 1
-					FROM `notify_detail` owner_detail
-					WHERE owner_detail.`notify_id` = n.`id`
-						AND owner_detail.`send_from` = #{userId}
-						AND owner_detail.`deleted_at` IS NULL
-				)
-			)
-		LIMIT 1
-	</select>
-</mapper>

src/main/resources/mapper/timi-server/gao/GaoUserMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoUserMapper">
-	<select id="selectByUserIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoUser">
-		SELECT
-			*
-		FROM `gao_user`
-		WHERE
-			`user_id` IN
-			<foreach collection="userIdList" item="userId" separator="," open="(" close=")">
-				#{userId}
-			</foreach>
-			AND `deleted_at` IS NULL
-	</select>
-
-	<select id="selectRecipientPage" resultType="com.imyeyu.api.modules.gao.entity.GaoUser">
-		SELECT *
-		FROM `gao_user`
-		WHERE `enabled` = 1
-			AND (`deleted_at` IS NULL OR FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000) &lt; `deleted_at`)
-		<if test="page.equalsExample != null and page.equalsExample.storeId != null and page.equalsExample.storeId != ''">
-			AND `store_id` = #{page.equalsExample.storeId}
-		</if>
-		ORDER BY COALESCE(`updated_at`, `created_at`) DESC
-		LIMIT #{page.offset}, #{page.limit}
-	</select>
-
-	<select id="countRecipients" resultType="long">
-		SELECT COUNT(*)
-		FROM `gao_user`
-		WHERE `enabled` = 1
-			AND (`deleted_at` IS NULL OR FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000) &lt; `deleted_at`)
-		<if test="page.equalsExample != null and page.equalsExample.storeId != null and page.equalsExample.storeId != ''">
-			AND `store_id` = #{page.equalsExample.storeId}
-		</if>
-	</select>
-</mapper>