Merge pull request 'v1.0.39' (#51) from dev into master

Reviewed-on: #51

pom.xml

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

src/main/java/com/imyeyu/api/bean/CorePermissionCode.java

@@ -45,6 +45,11 @@ public enum CorePermissionCode implements BuiltinPermissionCode {
 	TAG_UPDATE("TAG:UPDATE", "标签修改", false, true),
 	TAG_DELETE("TAG:DELETE", "标签删除", false, true),
 
+	ARTICLE_CREATE("ARTICLE:CREATE", "文章创建", false, true),
+	ARTICLE_READ("ARTICLE:READ", "文章读取", false, true),
+	ARTICLE_UPDATE("ARTICLE:UPDATE", "文章修改", false, true),
+	ARTICLE_DELETE("ARTICLE:DELETE", "文章删除", false, true),
+
 	USER_CREATE("USER:CREATE", "用户创建", false, true),
 	USER_READ("USER:READ", "用户读取", false, true),
 	USER_UPDATE("USER:UPDATE", "用户修改", false, true),

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

@@ -0,0 +1,95 @@
+package com.imyeyu.api.modules.common.controller;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import com.imyeyu.api.annotation.RequireCorePermission;
+import com.imyeyu.api.bean.CorePermissionCode;
+import com.imyeyu.api.modules.common.entity.Article;
+import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.service.ArticleService;
+import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.spring.annotation.AOPLog;
+import com.imyeyu.spring.annotation.RequestRateLimit;
+import com.imyeyu.spring.bean.Page;
+import com.imyeyu.spring.bean.PageResult;
+import com.imyeyu.spring.util.ResponseView;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/// 文章接口
+///
+/// @author Codex
+/// @since 2026-09-09
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/article")
+public class ArticleController {
+
+	private final ArticleService service;
+	private final AttachmentService attachmentService;
+
+	/// 查询文章列表
+	///
+	/// @param page 分页参数
+	/// @return 文章分页
+	@JsonView(ResponseView.Public.class)
+	@RequestRateLimit
+	@PostMapping("/list")
+	public PageResult<Article> list(@RequestBody Page<Article> page) {
+		return service.page(page);
+	}
+
+	/// 查询文章详情
+	///
+	/// @param id 文章 ID
+	/// @return 文章详情
+	@JsonView(ResponseView.Public.class)
+	@RequestRateLimit
+	@PostMapping("/detail")
+	public Article detail(@RequestParam String id) {
+		Article article = service.get(id);
+		article.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.ARTICLE, article.getId()));
+		return article;
+	}
+
+	/// 创建文章
+	///
+	/// @param article 文章
+	/// @return 创建后的文章
+	@AOPLog
+	@JsonView(ResponseView.Public.class)
+	@RequestRateLimit
+	@RequireCorePermission(CorePermissionCode.ARTICLE_CREATE)
+	@PostMapping("/create")
+	public Article create(@RequestBody Article article) {
+		service.create(article);
+		return article;
+	}
+
+	/// 更新文章
+	///
+	/// @param article 文章
+	@AOPLog
+	@RequestRateLimit
+	@RequireCorePermission(CorePermissionCode.ARTICLE_UPDATE)
+	@PostMapping("/update")
+	public void update(@RequestBody Article article) {
+		service.update(article);
+	}
+
+	/// 删除文章
+	///
+	/// @param id 文章 ID
+	@AOPLog
+	@RequestRateLimit
+	@RequireCorePermission(CorePermissionCode.ARTICLE_DELETE)
+	@PostMapping("/delete")
+	public void delete(@RequestParam String id) {
+		service.delete(id);
+	}
+}

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

@@ -15,8 +15,12 @@ import lombok.extern.slf4j.Slf4j;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  *
@@ -26,11 +30,30 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/system/setting")
+@RequestMapping("/setting")
 public class SettingController {
 
 	private final SettingService service;
 
+	/**
+	 * 查询公开配置映射
+	 *
+	 * @param bizType 业务类型
+	 * @param bizId 业务 ID，可为空
+	 * @param code 配置代码列表，可为空
+	 * @return 公开配置映射
+	 */
+	@JsonView(ResponseView.Public.class)
+	@RequestRateLimit
+	@RequestMapping("/map")
+	public Map<String, Setting> map(
+			@RequestParam String bizType,
+			@RequestParam(required = false) String bizId,
+			@RequestParam(required = false) List<String> code
+	) {
+		return service.mapPublic(bizType, bizId, code);
+	}
+
 	/**
 	 * 查询配置列表
 	 *

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

@@ -34,6 +34,8 @@ public class Article extends UUIDEntity implements SettingSupport {
 		/// GAO 门店日记
 		GAO_STORE_DIARY,
 
+		GAO_SYSTEM,
+
 		/// 反馈
 		FEEDBACK
 	}

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

@@ -20,11 +20,11 @@ public class Notify extends UUIDEntity {
 	/** 业务类型 */
 	private String bizType;
 
-	/** 提醒业务类型 */
+	/** 业务提醒类型 */
 	private String bizRemindedType;
 
-	/** 提醒业务 ID */
+	/** 业务提醒查重键 */
-	private String bizRemindedId;
+	private String bizRemindedKey;
 
 	/** 参数 */
 	private String args;

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

@@ -2,9 +2,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 org.apache.ibatis.annotations.Select;
 import com.imyeyu.spring.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,9 +15,8 @@ import java.util.List;
  */
 public interface NotifyMapper extends BaseMapper<Notify, String> {
 
-	/// 查询业务提醒是否已创建
+	/// 原子创建业务提醒
-	@Select("SELECT EXISTS (SELECT 1 FROM `notify` WHERE `biz_type` = #{bizType} AND `biz_reminded_type` = #{bizRemindedType} AND `biz_reminded_id` = #{bizRemindedId} AND `deleted_at` IS NULL)")
+	int insertIfAbsent(Notify notify);
-	boolean existsByBizReminded(@Param("bizType") String bizType, @Param("bizRemindedType") String bizRemindedType, @Param("bizRemindedId") String bizRemindedId);
 
 	/// 分页查询管理端通知
 	///

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

@@ -3,6 +3,8 @@ package com.imyeyu.api.modules.common.mapper;
 import com.imyeyu.api.modules.common.entity.Setting;
 import com.imyeyu.spring.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 系统配置
  *
@@ -10,4 +12,6 @@ import com.imyeyu.spring.mapper.BaseMapper;
  * @since 2021-07-20 22:26
  */
 public interface SettingMapper extends BaseMapper<Setting, String> {
+
+	List<Setting> selectPublicByQuery(String bizType, String bizId, List<String> codeList);
 }

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

@@ -14,13 +14,10 @@ import com.imyeyu.spring.service.BaseService;
  */
 public interface NotifyService extends BaseService<Notify, String> {
 
-	/// 查询业务提醒是否已创建
+	/// 原子创建业务提醒，重复查重键不会创建通知详情
 	///
-	/// @param bizType 业务类型
+	/// @param notify 通知
-	/// @param bizRemindedType 被提醒业务类型
+	void createIfAbsent(Notify notify);
-	/// @param bizRemindedId 被提醒业务 ID
-	/// @return true 为已创建
-	boolean existsByBizReminded(String bizType, String bizRemindedType, String bizRemindedId);
 
 	/// 分页查询当前用户创建的通知
 	///

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

@@ -7,6 +7,7 @@ import com.imyeyu.java.TimiJava;
 import com.imyeyu.spring.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配置服务
@@ -24,6 +25,16 @@ public interface SettingService extends BaseService<Setting, String> {
 
 	List<Setting> listByBizId(String bizType, String bizId);
 
+	/**
+	 * 查询公开配置映射
+	 *
+	 * @param bizType 业务类型
+	 * @param bizId 业务 ID，可为空
+	 * @param code 配置代码列表，可为空
+	 * @return 公开配置映射
+	 */
+	Map<String, Setting> mapPublic(String bizType, String bizId, List<String> code);
+
 	default List<Setting> listBySettingSupport(SettingSupport settingSupport) {
 		String bizType = settingSupport.getClass().getSimpleName().toUpperCase();
 		return listByBizId(bizType, settingSupport.getId());

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

@@ -7,9 +7,8 @@ import com.imyeyu.api.modules.common.mapper.NotifyMapper;
 import com.imyeyu.api.modules.common.service.NotifyDetailService;
 import com.imyeyu.api.modules.common.service.NotifyService;
 import com.imyeyu.api.modules.common.vo.NotifyManagementItem;
-import com.imyeyu.api.modules.system.entity.Logger;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
-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;
@@ -17,12 +16,13 @@ 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 com.imyeyu.utils.Time;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 通知服务实现
@@ -30,13 +30,10 @@ import java.util.List;
  * @author 夜雨
  * @since 2026-05-13 14:46
  */
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class NotifyServiceImplement extends AbstractEntityService<Notify, String> implements NotifyService {
 
-	private final LoggerService loggerService;
-	private final UserLoginService userLoginService;
 	private final NotifyDetailService detailService;
 
 	private final NotifyMapper mapper;
@@ -46,44 +43,54 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 		return mapper;
 	}
 
-	@Override
-	public boolean existsByBizReminded(String bizType, String bizRemindedType, String bizRemindedId) {
-		return mapper.existsByBizReminded(bizType, bizRemindedType, bizRemindedId);
-	}
-
 	/// 创建通知并级联创建通知详情
 	///
 	/// @param notify 通知
+	@OperationAudit(AuditOperation.COMMON_NOTIFY_CREATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(Notify notify) {
-		Logger logger = new Logger(Logger.Module.COMMON, "COMMON_NOTIFY_CREATE");
+		prepareCreate(notify);
-		try {
+		super.create(notify);
+		createDetails(notify);
+	}
+
+	/// 原子创建业务提醒并级联创建通知详情
+	///
+	/// @param notify 通知
+	@OperationAudit(AuditOperation.COMMON_NOTIFY_CREATE)
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void createIfAbsent(Notify notify) {
+		prepareCreate(notify);
+		if (mapper.insertIfAbsent(notify) == 0) {
+			return;
+		}
+		createDetails(notify);
+	}
+
+	/// 校验并补全通知创建字段
+	///
+	/// @param notify 通知
+	private void prepareCreate(Notify notify) {
 		TimiException.required(notify, "未找到通知");
 		TimiException.required(notify.getDetailList(), "未找到通知详情列表");
-
+		notify.setId(TimiJava.defaultIfEmpty(notify.getId(), UUID.randomUUID().toString()));
 		notify.setCreatedBy(TimiJava.defaultIfEmpty(notify.getCreatedBy(), TimiJava.ZERO_UUID));
-			super.create(notify);
+		notify.setCreatedAt(TimiJava.defaultIfNull(notify.getCreatedAt(), Time.now()));
+		notify.setUpdatedAt(null);
+		notify.setDeletedAt(null);
+	}
 
+	/// 创建通知详情
+	///
+	/// @param notify 通知
+	private void createDetails(Notify notify) {
 		for (NotifyDetail detail : notify.getDetailList()) {
 			detail.setNotifyId(notify.getId());
 			detail.setSendFrom(TimiJava.defaultIfEmpty(detail.getSendFrom(), TimiJava.ZERO_UUID));
 			detailService.create(detail);
 		}
-			logger.setLevel(Logger.Level.INFO);
-			logger.setResult(notify.getId());
-		} catch (TimiException e) {
-			logger.setLevel(Logger.Level.WARN);
-			logger.setException(e.getMessage());
-			throw e;
-		} catch (Exception e) {
-			logger.setLevel(Logger.Level.ERROR);
-			logger.setException(TimiJava.serializeThrowable(e));
-			log.error("创建通知失败", e);
-			throw new TimiException(TimiCode.ERROR, "创建通知失败", e);
-		} finally {
-			loggerService.create(logger);
-		}
 	}
 
 	/// 分页查询当前用户创建的通知
@@ -120,6 +127,8 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 	/// @param notifyId 通知 ID
 	/// @param userId 用户 ID
 	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@OperationAudit(AuditOperation.COMMON_NOTIFY_DELETE)
 	public void deleteManagement(String notifyId, String userId) {
 		getManagement(notifyId, userId);
 		delete(notifyId);
@@ -130,6 +139,7 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 	/// @param notifyId 通知 ID
 	/// @param userId 用户 ID
 	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	public void cancelManagement(String notifyId, String userId) {
 		getManagement(notifyId, userId);
 		cancel(notifyId);
@@ -138,11 +148,10 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 	/// 删除通知并级联软删除通知详情
 	///
 	/// @param notifyId 通知 ID
+	@OperationAudit(AuditOperation.COMMON_NOTIFY_DELETE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void delete(String notifyId) {
-		Logger logger = new Logger(Logger.Module.COMMON, "COMMON_NOTIFY_DELETE");
-		try {
 		TimiException.required(notifyId, "未找到通知 ID");
 		TimiException.required(get(notifyId), "未找到通知");
 		List<NotifyDetail> detailList = detailService.listByNotifyId(notifyId);
@@ -150,20 +159,6 @@ public class NotifyServiceImplement extends AbstractEntityService<Notify, String
 			detailService.delete(detail.getId());
 		}
 		super.delete(notifyId);
-			logger.setLevel(Logger.Level.INFO);
-			logger.setResult(notifyId);
-		} catch (TimiException e) {
-			logger.setLevel(Logger.Level.WARN);
-			logger.setException(e.getMessage());
-			throw e;
-		} catch (Exception e) {
-			logger.setLevel(Logger.Level.ERROR);
-			logger.setException(TimiJava.serializeThrowable(e));
-			log.error("删除通知失败", e);
-			throw new TimiException(TimiCode.ERROR, "删除通知失败", e);
-		} finally {
-			loggerService.create(logger);
-		}
 	}
 
 	/// 取消通知中尚未成功发送的通知详情

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

@@ -17,6 +17,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 系统配置服务实现
@@ -53,6 +55,12 @@ public class SettingServiceImplement extends AbstractEntityService<Setting, Stri
 		return mapper.selectAllByExample(example);
 	}
 
+	@Override
+	public Map<String, Setting> mapPublic(String bizType, String bizId, List<String> code) {
+		TimiException.required(bizType, "not found bizType");
+		return mapper.selectPublicByQuery(bizType, bizId, code).stream().collect(Collectors.toMap(Setting::getCode, Function.identity()));
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void updateByBizId(String bizType, String bizId, List<Setting> list) {

src/main/java/com/imyeyu/api/modules/gao/bean/GaoPermissionCode.java

@@ -111,6 +111,8 @@ public enum GaoPermissionCode implements BuiltinPermissionCode {
 
 	CUSTOMER_PACKAGE_PRICE_OVERRIDE("CUSTOMER_PACKAGE:PRICE_OVERRIDE", "客户套餐成交价和权益配额调整", true, true),
 
+	CUSTOMER_PACKAGE_GIFT_CREATE("CUSTOMER_PACKAGE:GIFT_CREATE", "客户套餐创建赠送", true, true),
+
 	FUND_RECORD_READ("FUND_RECORD:READ", "资金流水读取", true, true),
 
 	FUND_RECEIVE_CREATE("FUND_RECEIVE:CREATE", "线下收款创建", true, true),

src/main/java/com/imyeyu/api/modules/gao/bean/GaoSystemSetting.java

@@ -0,0 +1,27 @@
+package com.imyeyu.api.modules.gao.bean;
+
+import com.imyeyu.api.annotation.SettingBizType;
+import com.imyeyu.api.bean.SettingEnum;
+import com.imyeyu.api.modules.common.entity.Setting;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+///
+///
+/// @author 夜雨
+/// @since 2026-09-09 16:11
+@Getter
+@SettingBizType("GAO_SYSTEM")
+@AllArgsConstructor
+public enum GaoSystemSetting implements SettingEnum {
+
+	SERVICE_LICENSE(null, Setting.ValueType.STRING),
+
+	PRIVACY_LICENSE(null, Setting.ValueType.STRING),
+
+	OPEN_SOURCE_LICENSE(null, Setting.ValueType.STRING);
+
+	final String defaultValue;
+
+	final Setting.ValueType valueType;
+}

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

@@ -1,8 +1,8 @@
 package com.imyeyu.api.modules.gao.controller;
 
+import com.imyeyu.api.bean.PermissionMatchMode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.bean.PermissionMatchMode;
 import com.imyeyu.api.modules.gao.entity.GaoFundRecord;
 import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
 import com.imyeyu.api.modules.gao.service.GaoOrderPaymentService;
@@ -17,6 +17,8 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRevokeRequest;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
+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.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
@@ -40,6 +42,7 @@ public class GaoSalesOrderController {
 	private final GaoSalesOrderService service;
 	private final GaoOrderPaymentService paymentService;
 	private final GaoStoreScopeService storeScopeService;
+	private final UserService userService;
 
 	@AOPLog
 	@RequestRateLimit
@@ -56,7 +59,11 @@ public class GaoSalesOrderController {
 	@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
 	@PostMapping("/detail")
 	public GaoSalesOrder detail(@RequestParam String id) {
-		return service.detail(id);
+		GaoSalesOrder result = service.detail(id);
+		if (TimiJava.isNotEmpty(result.getCancelOperatorUserId())) {
+			result.setCancelOperator(userService.get(result.getCancelOperatorUserId()));
+		}
+		return result;
 	}
 
 	@AOPLog

src/main/java/com/imyeyu/api/modules/gao/entity/GaoSalesOrderItem.java

@@ -34,6 +34,9 @@ public class GaoSalesOrderItem extends UUIDEntity {
 	/// 订单项类型
 	private ItemType itemType;
 
+	/// true 为赠送权益
+	private Boolean gifted;
+
 	/// SKU ID
 	private String skuId;
 

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

@@ -55,5 +55,5 @@ public interface GaoCustomerMapper extends BaseMapper<GaoCustomer, String> {
 	/// @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);
+	void updateInvitedCountDelta(String customerId, Long delta);
 }

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

@@ -4,6 +4,7 @@ import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.entity.GaoCustomerPackage;
 import com.imyeyu.api.modules.gao.entity.GaoPackageConfig;
@@ -44,6 +45,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -151,10 +153,13 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 			request.setItemList(defaultPurchaseItems(configItemList));
 		}
 		List<GaoCustomerPackagePurchaseItem> requestItemList = new ArrayList<>(request.getItemList());
+		normalizePurchaseItems(requestItemList);
 		verifyPurchaseItems(requestItemList);
 		boolean canOverridePriceAndQuantity = permissionChecker.hasAny(ModuleCode.GAO,
-			com.imyeyu.api.modules.gao.bean.GaoPermissionCode.CUSTOMER_PACKAGE_PRICE_OVERRIDE.getValue());
+			GaoPermissionCode.CUSTOMER_PACKAGE_PRICE_OVERRIDE.getValue());
-		List<GaoCustomerPackagePurchaseItem> itemList = resolvePurchaseItems(config.getStoreId(), requestItemList, configItemList, canOverridePriceAndQuantity);
+		boolean canCreateGift = permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.CUSTOMER_PACKAGE_GIFT_CREATE.getValue());
+		List<GaoCustomerPackagePurchaseItem> itemList = resolvePurchaseItems(config.getStoreId(), requestItemList, configItemList,
+			canOverridePriceAndQuantity, canCreateGift);
 		itemList.sort(Comparator.comparing(GaoCustomerPackagePurchaseItem::getSort).thenComparing(GaoCustomerPackagePurchaseItem::getSkuId)
 			.thenComparing(GaoCustomerPackagePurchaseItem::getSkuUnitId));
 		request.setItemList(itemList);
@@ -246,6 +251,7 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 			GaoCustomerPackagePurchaseItem item = new GaoCustomerPackagePurchaseItem();
 			item.setSkuId(configItem.getSkuId());
 			item.setSkuUnitId(configItem.getSkuUnitId());
+			item.setGifted(false);
 			item.setProductNameSnapshot(configItem.getProductNameSnapshot());
 			item.setProductIdSnapshot(configItem.getProductIdSnapshot());
 			item.setSkuCodeSnapshot(configItem.getSkuCodeSnapshot());
@@ -265,6 +271,7 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		item.setItemType(GaoSalesOrderItem.ItemType.PACKAGE_ENTITLEMENT);
 		item.setSkuId(source.getSkuId());
 		item.setSkuUnitId(source.getSkuUnitId());
+		item.setGifted(Boolean.TRUE.equals(source.getGifted()));
 		item.setProductNameSnapshot(source.getProductNameSnapshot());
 		item.setProductIdSnapshot(source.getProductIdSnapshot());
 		item.setSkuCodeSnapshot(source.getSkuCodeSnapshot());
@@ -284,6 +291,32 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		return item;
 	}
 
+	private void normalizePurchaseItems(List<GaoCustomerPackagePurchaseItem> itemList) {
+		Map<String, Integer> indexMap = new LinkedHashMap<>();
+		for (int i = 0; i < itemList.size(); i++) {
+			GaoCustomerPackagePurchaseItem item = itemList.get(i);
+			if (item == null) {
+				continue;
+			}
+			item.setGifted(Boolean.TRUE.equals(item.getGifted()));
+			if (item.getSkuId() == null || item.getSkuUnitId() == null || item.getTotalQuantity() == null) {
+				continue;
+			}
+			String key = item.getSkuId() + "|" + item.getSkuUnitId() + "|" + item.getGifted();
+			Integer existingIndex = indexMap.putIfAbsent(key, i);
+			if (existingIndex == null) {
+				continue;
+			}
+			GaoCustomerPackagePurchaseItem existingItem = itemList.get(existingIndex);
+			if (existingItem == null || existingItem.getTotalQuantity() == null) {
+				continue;
+			}
+			existingItem.setTotalQuantity(existingItem.getTotalQuantity().add(item.getTotalQuantity()));
+			itemList.set(i, null);
+		}
+		itemList.removeIf(item -> item == null);
+	}
+
 	private void verifyPurchaseItems(List<GaoCustomerPackagePurchaseItem> itemList) {
 		Set<String> keySet = new HashSet<>();
 		for (int i = 0; i < itemList.size(); i++) {
@@ -294,14 +327,15 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 			TimiException.required(item.getTotalQuantity(), "购买产品数量不能为空");
 			TimiException.requiredTrue(0 <= item.getTotalQuantity().signum(), "购买产品数量不能为负数");
 			TimiException.requiredTrue(3 >= item.getTotalQuantity().stripTrailingZeros().scale(), "购买产品数量最多保留三位小数");
-			String key = item.getSkuId() + "|" + item.getSkuUnitId();
+			item.setGifted(Boolean.TRUE.equals(item.getGifted()));
+			String key = item.getSkuId() + "|" + item.getSkuUnitId() + "|" + item.getGifted();
 			TimiException.requiredTrue(keySet.add(key), "购买套餐内 SKU 和单位不能重复");
 			item.setSort(TimiJava.defaultIfNull(item.getSort(), i));
 		}
 	}
 
 	private List<GaoCustomerPackagePurchaseItem> resolvePurchaseItems(String storeId, List<GaoCustomerPackagePurchaseItem> requestItemList,
-		List<GaoPackageConfigItem> configItemList, boolean canOverridePriceAndQuantity) {
+		List<GaoPackageConfigItem> configItemList, boolean canOverridePriceAndQuantity, boolean canCreateGift) {
 		Map<String, List<GaoPackageConfigItem>> configItemMap = configItemList.stream()
 			.collect(Collectors.groupingBy(GaoPackageConfigItem::getSkuId));
 		Map<String, BigDecimal> configBaseQuantityMap = new HashMap<>();
@@ -312,23 +346,32 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		Map<String, BigDecimal> requestBaseQuantityMap = new HashMap<>();
 		List<GaoCustomerPackagePurchaseItem> result = new ArrayList<>();
 		for (GaoCustomerPackagePurchaseItem requestItem : requestItemList) {
+			boolean gifted = Boolean.TRUE.equals(requestItem.getGifted());
 			List<GaoPackageConfigItem> skuConfigItemList = configItemMap.get(requestItem.getSkuId());
+			if (gifted) {
+				TimiException.requiredTrue(canCreateGift, "没有客户套餐创建赠送权限");
+			} else {
 				TimiException.requiredTrue(skuConfigItemList != null && !skuConfigItemList.isEmpty(), "购买 SKU 不属于套餐配置");
+			}
 			GaoProductSkuUnitSelection selection = skuService.getSellableSkuUnit(storeId, requestItem.getSkuId(), requestItem.getSkuUnitId());
+			if (!gifted) {
 				TimiException.requiredTrue(skuConfigItemList.stream().anyMatch(configItem -> 0 <= configItem.getBaseQuantityPerUnitSnapshot()
 					.compareTo(selection.getUnit().getBaseQuantityPerUnit())), "套餐权益单位不能高于配置单位");
+			}
 			BigDecimal requestBaseQuantity = toBaseQuantity(requestItem.getTotalQuantity(), selection.getUnit().getBaseQuantityPerUnit(), "套餐权益基础数量最多保留三位小数");
+			if (!gifted) {
 				requestBaseQuantityMap.merge(requestItem.getSkuId(), requestBaseQuantity, BigDecimal::add);
+			}
 			if (requestItem.getTotalQuantity().signum() == 0) {
 				continue;
 			}
 			if (!Boolean.TRUE.equals(selection.getSku().getAllowDecimalQuantity())) {
 				TimiException.requiredTrue(requestItem.getTotalQuantity().stripTrailingZeros().scale() <= 0, "该 SKU 不允许小数数量");
 			}
-			GaoPackageConfigItem template = resolveItemTemplate(skuConfigItemList, selection.getUnit().getId());
 			GaoCustomerPackagePurchaseItem item = new GaoCustomerPackagePurchaseItem();
 			item.setSkuId(selection.getSku().getId());
 			item.setSkuUnitId(selection.getUnit().getId());
+			item.setGifted(gifted);
 			item.setProductNameSnapshot(selection.getProduct().getName());
 			item.setProductIdSnapshot(selection.getProduct().getId());
 			item.setSkuCodeSnapshot(selection.getSku().getCode());
@@ -337,8 +380,14 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 			item.setUnitSnapshot(selection.getUnit().getName());
 			item.setBaseQuantityPerUnitSnapshot(selection.getUnit().getBaseQuantityPerUnit());
 			item.setTotalQuantity(requestItem.getTotalQuantity());
+			if (gifted) {
+				item.setSort(requestItem.getSort());
+				item.setRemark(requestItem.getRemark());
+			} else {
+				GaoPackageConfigItem template = resolveItemTemplate(skuConfigItemList, selection.getUnit().getId());
 				item.setSort(template.getSort());
 				item.setRemark(template.getRemark());
+			}
 			result.add(item);
 		}
 		TimiException.requiredTrue(!result.isEmpty(), "购买套餐至少需要一个产品");
@@ -378,9 +427,10 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		List<GaoCustomerPackagePurchaseItem> requestItemList = TimiJava.defaultIfNull(request.getItemList(), List.of());
 		verifyPurchaseItems(requestItemList);
 		TimiException.requiredTrue(existingItemList.size() == requestItemList.size(), "requestNo 对应购买请求内容不一致");
-		Map<String, GaoSalesOrderItem> existingItemMap = existingItemList.stream().collect(Collectors.toMap(item -> item.getSkuId() + "|" + item.getSkuUnitId(), Function.identity()));
+		Map<String, GaoSalesOrderItem> existingItemMap = existingItemList.stream().collect(Collectors.toMap(item -> item.getSkuId() + "|" + item.getSkuUnitId() + "|"
+			+ Boolean.TRUE.equals(item.getGifted()), Function.identity()));
 		for (GaoCustomerPackagePurchaseItem item : requestItemList) {
-			GaoSalesOrderItem existingItem = existingItemMap.get(item.getSkuId() + "|" + item.getSkuUnitId());
+			GaoSalesOrderItem existingItem = existingItemMap.get(item.getSkuId() + "|" + item.getSkuUnitId() + "|" + Boolean.TRUE.equals(item.getGifted()));
 			TimiException.required(existingItem, "requestNo 对应购买请求内容不一致");
 			TimiException.requiredTrue(existingItem.getItemType() == GaoSalesOrderItem.ItemType.PACKAGE_ENTITLEMENT
 				&& existingItem.getQuantity().compareTo(item.getTotalQuantity()) == 0

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

@@ -103,20 +103,17 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
 					log.warn("GAO 订单提醒跳过不存在的店长用户: storeId[{}], userId[{}]", storeId, manager.getUserId());
 					continue;
 				}
-				String remindedId = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId, manager.getUserId(), reminderType);
+				String remindedKey = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId, manager.getUserId(), reminderType);
-				if (notifyService.existsByBizReminded(NOTIFY_BIZ_TYPE, reminderType, remindedId)) {
-					continue;
-				}
 				long sendAt = Time.now();
 				Notify notify = new Notify();
 				notify.setBizType(NOTIFY_BIZ_TYPE);
 				notify.setBizRemindedType(reminderType);
-				notify.setBizRemindedId(remindedId);
+				notify.setBizRemindedKey(remindedKey);
 				notify.setDetailList(List.of(
 					createInternalDetail(manager.getUserId(), content, sendAt),
 					createSmsDetail(user.getPhoneNo(), customerNames, action, content, sendAt)
 				));
-				notifyService.create(notify);
+				notifyService.createIfAbsent(notify);
 			} catch (Exception e) {
 				log.error("GAO 订单提醒发送失败: storeId[{}], userId[{}], reminderType[{}]", storeId, manager.getUserId(), reminderType, e);
 			}

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

@@ -453,9 +453,11 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		for (GaoSalesOrderItem item : itemList) {
 			TimiException.required(item, "销售订单明细不能为空");
 			TimiException.requiredTrue(item.getItemType() == expectedItemType, "订单项类型与订单类型不匹配");
+			item.setGifted(Boolean.TRUE.equals(item.getGifted()));
 			TimiException.required(item.getSkuId(), "订单项 SKU 不能为空");
 			TimiException.required(item.getSkuUnitId(), "订单项 SKU 单位不能为空");
-			TimiException.requiredTrue(skuUnitKeySet.add(item.getSkuId() + "|" + item.getSkuUnitId()),
+			String skuUnitKey = item.getSkuId() + "|" + item.getSkuUnitId() + "|" + item.getGifted();
+			TimiException.requiredTrue(skuUnitKeySet.add(skuUnitKey),
 				"同一订单不能重复 SKU 和单位");
 			TimiException.required(item.getQuantity(), "订单项数量不能为空");
 			TimiException.requiredTrue(0 < item.getQuantity().signum(), "订单项数量必须大于 0");
@@ -511,11 +513,14 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		List<GaoSalesOrderItem> existingItemList = itemMapper.selectBySalesOrderId(existing.getId());
 		TimiException.requiredTrue(existingItemList.size() == requestItemList.size(), "requestNo 对应订单内容不一致");
 		Map<String, GaoSalesOrderItem> existingItemMap = existingItemList.stream()
-			.collect(java.util.stream.Collectors.toMap(item -> item.getSkuId() + "|" + item.getSkuUnitId(), java.util.function.Function.identity()));
+			.collect(java.util.stream.Collectors.toMap(item -> item.getSkuId() + "|" + item.getSkuUnitId() + "|" + Boolean.TRUE.equals(item.getGifted()),
+				java.util.function.Function.identity()));
 		for (GaoSalesOrderItem requestItem : requestItemList) {
-			GaoSalesOrderItem existingItem = existingItemMap.get(requestItem.getSkuId() + "|" + requestItem.getSkuUnitId());
+			GaoSalesOrderItem existingItem = existingItemMap.get(requestItem.getSkuId() + "|" + requestItem.getSkuUnitId() + "|"
+				+ Boolean.TRUE.equals(requestItem.getGifted()));
 			TimiException.required(existingItem, "requestNo 对应订单内容不一致");
 			TimiException.requiredTrue(existingItem.getItemType() == GaoSalesOrderItem.ItemType.PACKAGE_ENTITLEMENT
+				&& Boolean.TRUE.equals(existingItem.getGifted()) == Boolean.TRUE.equals(requestItem.getGifted())
 				&& existingItem.getQuantity().compareTo(requestItem.getQuantity()) == 0
 				&& existingItem.getSort().equals(requestItem.getSort())
 				&& sameText(existingItem.getRemark(), requestItem.getRemark()), "requestNo 对应订单内容不一致");

src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPackagePurchaseItem.java

@@ -17,6 +17,9 @@ public class GaoCustomerPackagePurchaseItem {
 	/// SKU 单位 ID
 	private String skuUnitId;
 
+	/// true 表示请求将该明细作为赠送权益创建
+	private Boolean gifted;
+
 	/// 产品名称快照，由后端生成
 	private String productNameSnapshot;
 

src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPage.java

@@ -1,6 +1,7 @@
 package com.imyeyu.api.modules.gao.vo;
 
-import com.imyeyu.java.bean.BasePage;
+import com.imyeyu.api.modules.gao.entity.GaoCustomer;
+import com.imyeyu.spring.bean.Page;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,7 +13,7 @@ import java.util.List;
 /// @since 2026-08-13
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GaoCustomerPage extends BasePage {
+public class GaoCustomerPage extends Page<GaoCustomer> {
 
 	/// 门店 ID
 	private String storeId;

src/main/java/com/imyeyu/api/modules/system/audit/AuditOperation.java

@@ -1,66 +1,51 @@
 package com.imyeyu.api.modules.system.audit;
 
 import com.imyeyu.api.modules.system.entity.Logger;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 /// 操作审计编码
 ///
 /// @author Codex
 /// @since 2026-09-09
+@Getter
+@AllArgsConstructor
 public enum AuditOperation {
 
-	GAO_CUSTOMER_PACKAGE_PURCHASE(Logger.Module.GAO, "GAO_CUSTOMER_PACKAGE_PURCHASE"),
+	COMMON_NOTIFY_CREATE(Logger.Module.COMMON),
-	GAO_CUSTOMER_PACKAGE_CANCEL(Logger.Module.GAO, "GAO_CUSTOMER_PACKAGE_CANCEL"),
+	COMMON_NOTIFY_DELETE(Logger.Module.COMMON),
-	GAO_SALES_ORDER_PAYMENT_RECEIVE(Logger.Module.GAO, "GAO_SALES_ORDER_PAYMENT_RECEIVE"),
+	GAO_CUSTOMER_PACKAGE_PURCHASE(Logger.Module.GAO),
-	GAO_SALES_ORDER_PAYMENT_VERIFY(Logger.Module.GAO, "GAO_SALES_ORDER_PAYMENT_VERIFY"),
+	GAO_CUSTOMER_PACKAGE_CANCEL(Logger.Module.GAO),
-	GAO_SALES_ORDER_REFUND(Logger.Module.GAO, "GAO_SALES_ORDER_REFUND"),
+	GAO_SALES_ORDER_PAYMENT_RECEIVE(Logger.Module.GAO),
-	GAO_SALES_ORDER_CONFIRM_NO_REFUND(Logger.Module.GAO, "GAO_SALES_ORDER_CONFIRM_NO_REFUND"),
+	GAO_SALES_ORDER_PAYMENT_VERIFY(Logger.Module.GAO),
-	GAO_SALES_ORDER_FUND_REVOKE(Logger.Module.GAO, "GAO_SALES_ORDER_FUND_REVOKE"),
+	GAO_SALES_ORDER_REFUND(Logger.Module.GAO),
-	GAO_ORDER_FULFILLMENT_CREATE(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_CREATE"),
+	GAO_SALES_ORDER_CONFIRM_NO_REFUND(Logger.Module.GAO),
-	GAO_ORDER_FULFILLMENT_PREPARE_STOCK(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_PREPARE_STOCK"),
+	GAO_SALES_ORDER_FUND_REVOKE(Logger.Module.GAO),
-	GAO_ORDER_FULFILLMENT_VERIFY(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_VERIFY"),
+	GAO_ORDER_FULFILLMENT_CREATE(Logger.Module.GAO),
-	GAO_ORDER_FULFILLMENT_REJECT(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_REJECT"),
+	GAO_ORDER_FULFILLMENT_PREPARE_STOCK(Logger.Module.GAO),
-	GAO_ORDER_FULFILLMENT_CANCEL(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_CANCEL"),
+	GAO_ORDER_FULFILLMENT_VERIFY(Logger.Module.GAO),
-	GAO_ORDER_FULFILLMENT_REVOKE(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_REVOKE"),
+	GAO_ORDER_FULFILLMENT_REJECT(Logger.Module.GAO),
-	GAO_PACKAGE_CONFIG_CREATE(Logger.Module.GAO, "GAO_PACKAGE_CONFIG_CREATE"),
+	GAO_ORDER_FULFILLMENT_CANCEL(Logger.Module.GAO),
-	GAO_PACKAGE_CONFIG_UPDATE(Logger.Module.GAO, "GAO_PACKAGE_CONFIG_UPDATE"),
+	GAO_ORDER_FULFILLMENT_REVOKE(Logger.Module.GAO),
-	GAO_PACKAGE_CONFIG_DELETE(Logger.Module.GAO, "GAO_PACKAGE_CONFIG_DELETE"),
+	GAO_PACKAGE_CONFIG_CREATE(Logger.Module.GAO),
-	GAO_PRODUCT_CATEGORY_SORT(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_SORT"),
+	GAO_PACKAGE_CONFIG_UPDATE(Logger.Module.GAO),
-	GAO_PRODUCT_CATEGORY_CREATE(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_CREATE"),
+	GAO_PACKAGE_CONFIG_DELETE(Logger.Module.GAO),
-	GAO_PRODUCT_CATEGORY_UPDATE(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_UPDATE"),
+	GAO_PRODUCT_CATEGORY_SORT(Logger.Module.GAO),
-	GAO_PRODUCT_CATEGORY_DISABLE(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_DISABLE"),
+	GAO_PRODUCT_CATEGORY_CREATE(Logger.Module.GAO),
-	GAO_PRODUCT_CREATE(Logger.Module.GAO, "GAO_PRODUCT_CREATE"),
+	GAO_PRODUCT_CATEGORY_UPDATE(Logger.Module.GAO),
-	GAO_PRODUCT_UPDATE(Logger.Module.GAO, "GAO_PRODUCT_UPDATE"),
+	GAO_PRODUCT_CATEGORY_DISABLE(Logger.Module.GAO),
-	GAO_PRODUCT_DISABLE(Logger.Module.GAO, "GAO_PRODUCT_DISABLE"),
+	GAO_PRODUCT_CREATE(Logger.Module.GAO),
-	GAO_PRODUCT_STOCK_INITIAL_IN(Logger.Module.GAO, "GAO_PRODUCT_STOCK_INITIAL_IN"),
+	GAO_PRODUCT_UPDATE(Logger.Module.GAO),
-	GAO_PRODUCT_STOCK_MANUAL_IN(Logger.Module.GAO, "GAO_PRODUCT_STOCK_MANUAL_IN"),
+	GAO_PRODUCT_DISABLE(Logger.Module.GAO),
-	GAO_PRODUCT_STOCK_MANUAL_OUT(Logger.Module.GAO, "GAO_PRODUCT_STOCK_MANUAL_OUT"),
+	GAO_PRODUCT_STOCK_INITIAL_IN(Logger.Module.GAO),
-	GAO_PRODUCT_STOCK_MANUAL_REVOKE(Logger.Module.GAO, "GAO_PRODUCT_STOCK_MANUAL_REVOKE"),
+	GAO_PRODUCT_STOCK_MANUAL_IN(Logger.Module.GAO),
-	GAO_PRODUCT_STOCK_STOCKTAKE_GAIN(Logger.Module.GAO, "GAO_PRODUCT_STOCK_STOCKTAKE_GAIN"),
+	GAO_PRODUCT_STOCK_MANUAL_OUT(Logger.Module.GAO),
-	GAO_PRODUCT_STOCK_STOCKTAKE_LOSS(Logger.Module.GAO, "GAO_PRODUCT_STOCK_STOCKTAKE_LOSS"),
+	GAO_PRODUCT_STOCK_MANUAL_REVOKE(Logger.Module.GAO),
-	GAO_SALES_ORDER_DIRECT_PRODUCT_CREATE(Logger.Module.GAO, "GAO_SALES_ORDER_DIRECT_PRODUCT_CREATE"),
+	GAO_PRODUCT_STOCK_STOCKTAKE_GAIN(Logger.Module.GAO),
-	GAO_SALES_ORDER_UPDATE(Logger.Module.GAO, "GAO_SALES_ORDER_UPDATE"),
+	GAO_PRODUCT_STOCK_STOCKTAKE_LOSS(Logger.Module.GAO),
-	GAO_SALES_ORDER_CANCEL(Logger.Module.GAO, "GAO_SALES_ORDER_CANCEL");
+	GAO_SALES_ORDER_DIRECT_PRODUCT_CREATE(Logger.Module.GAO),
+	GAO_SALES_ORDER_UPDATE(Logger.Module.GAO),
+	GAO_SALES_ORDER_CANCEL(Logger.Module.GAO);
 
-	private final Logger.Module module;
+	final Logger.Module module;
-
-	private final String code;
-
-	AuditOperation(Logger.Module module, String code) {
-		this.module = module;
-		this.code = code;
-	}
-
-	/// 获取日志模块
-	///
-	/// @return 日志模块
-	public Logger.Module getModule() {
-		return module;
-	}
-
-	/// 获取操作编码
-	///
-	/// @return 操作编码
-	public String getCode() {
-		return code;
-	}
 }

src/main/java/com/imyeyu/api/modules/system/audit/OperationAuditAspect.java

@@ -1,6 +1,7 @@
 package com.imyeyu.api.modules.system.audit;
 
 import com.imyeyu.api.modules.system.entity.Logger;
+import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +39,7 @@ public class OperationAuditAspect {
 	public Object around(ProceedingJoinPoint joinPoint, OperationAudit operationAudit) throws Throwable {
 		AuditOperation operation = operationAudit.value();
 		Object[] arguments = joinPoint.getArgs();
-		Logger logger = new Logger(operation.getModule(), operation.getCode());
+		Logger logger = new Logger(operation.getModule(), operation.name());
 		logger.setContent(payloadSerializer.serializeArguments(arguments));
 		long startNanos = System.nanoTime();
 		try {
@@ -56,9 +57,9 @@ public class OperationAuditAspect {
 			throw e;
 		} catch (Throwable e) {
 			logger.setLevel(Logger.Level.ERROR);
-			logger.setException(serializeThrowable(e));
+			logger.setException(TimiJava.serializeThrowable(e));
 			logger.setDuration(duration(startNanos));
-			log.error("业务操作失败: {}", operation.getCode(), e);
+			log.error("业务操作失败: {}", operation.name(), e);
 			record(logger);
 			throw e;
 		}
@@ -79,12 +80,4 @@ public class OperationAuditAspect {
 		}
 		return (int) Math.max(0L, millis);
 	}
-
-	private String serializeThrowable(Throwable throwable) {
-		java.io.StringWriter stringWriter = new java.io.StringWriter();
-		try (java.io.PrintWriter printWriter = new java.io.PrintWriter(stringWriter)) {
-			throwable.printStackTrace(printWriter);
-		}
-		return stringWriter.toString();
-	}
 }

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

@@ -0,0 +1,5 @@
+ALTER TABLE `gao_sales_order_item`
+	ADD COLUMN `gifted` TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'true 为赠送权益' AFTER `item_type`,
+	DROP KEY `uk_gao_sales_order_item_sku_unit`,
+	ADD UNIQUE KEY `uk_gao_sales_order_item_sku_unit_gifted` (`sales_order_id`, `sku_id`, `sku_unit_id`, `gifted`),
+	ADD KEY `idx_gao_sales_order_item_order_gifted` (`sales_order_id`, `gifted`, `sort`, `created_at`);

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

@@ -0,0 +1,25 @@
+ALTER TABLE `notify`
+	CHANGE COLUMN `biz_reminded_id` `biz_reminded_key` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '业务提醒查重键',
+	ADD COLUMN `biz_reminded_active_key` TINYINT(1) GENERATED ALWAYS AS (IF(`deleted_at` IS NULL, 1, NULL)) STORED COMMENT '未删除查重键' INVISIBLE AFTER `deleted_at`,
+	DROP INDEX `idx_biz_reminded_created`,
+	ADD INDEX `idx_biz_reminded_key_created`(`biz_type` ASC, `biz_reminded_type` ASC, `biz_reminded_key` ASC, `created_at` ASC) USING BTREE;
+
+UPDATE `notify` target
+INNER JOIN (
+	SELECT
+		id,
+		ROW_NUMBER() OVER (
+			PARTITION BY biz_type, biz_reminded_type, biz_reminded_key
+			ORDER BY created_at DESC, id DESC
+		) AS rn
+	FROM `notify`
+	WHERE deleted_at IS NULL
+		AND biz_type IS NOT NULL
+		AND biz_reminded_type IS NOT NULL
+		AND biz_reminded_key IS NOT NULL
+) duplicate ON duplicate.id = target.id
+SET target.deleted_at = UNIX_TIMESTAMP() * 1000
+WHERE duplicate.rn > 1;
+
+ALTER TABLE `notify`
+	ADD UNIQUE INDEX `uk_biz_reminded_key_active`(`biz_type` ASC, `biz_reminded_type` ASC, `biz_reminded_key` ASC, `biz_reminded_active_key` ASC) USING BTREE;

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

@@ -1,6 +1,31 @@
 <?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">
+	<insert id="insertIfAbsent">
+		INSERT INTO `notify` (
+			`id`,
+			`biz_type`,
+			`biz_reminded_type`,
+			`biz_reminded_key`,
+			`args`,
+			`created_by`,
+			`created_at`,
+			`updated_at`,
+			`deleted_at`
+		) VALUES (
+			#{id},
+			#{bizType},
+			#{bizRemindedType},
+			#{bizRemindedKey},
+			#{args},
+			#{createdBy},
+			#{createdAt},
+			#{updatedAt},
+			#{deletedAt}
+		)
+		ON DUPLICATE KEY UPDATE `id` = `id`
+	</insert>
+
 	<select id="selectManagementPage" resultType="com.imyeyu.api.modules.common.vo.NotifyManagementItem">
 		SELECT
 			n.`id`,

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

@@ -0,0 +1,20 @@
+<?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.SettingMapper">
+	<select id="selectPublicByQuery" resultType="com.imyeyu.api.modules.common.entity.Setting">
+		SELECT *
+		FROM `setting`
+		WHERE `biz_type` = #{bizType}
+			AND `is_private` = 0
+			<if test="bizId != null and bizId != ''">
+				AND `biz_id` = #{bizId}
+			</if>
+			<if test="codeList != null and !codeList.isEmpty()">
+				AND `code` IN
+				<foreach collection="codeList" item="code" separator="," open="(" close=")">
+					#{code}
+				</foreach>
+			</if>
+			AND (`deleted_at` IS NULL OR FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000) &lt; `deleted_at`)
+	</select>
+</mapper>

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

@@ -18,7 +18,6 @@
 			</if>
 			AND `deleted_at` IS NULL
 	</select>
-
 	<sql id="queryWhere">
 		`c`.`deleted_at` IS NULL
 		<if test="storeId != null and storeId != ''">
@@ -64,7 +63,18 @@
 		FROM `gao_customer` `c`
 		WHERE
 			<include refid="queryWhere"/>
+		<choose>
+			<when test="orderMap != null and !orderMap.isEmpty()">
+				ORDER BY
+				<foreach collection="orderMap" index="key" item="value" separator=",">
+					<bind name="underscoreKey" value="@com.imyeyu.utils.Text@camelCase2underscore(key)"/>
+					${underscoreKey} ${value}
+				</foreach>
+			</when>
+			<otherwise>
 				ORDER BY `c`.`created_at` DESC, `c`.`id` DESC
+			</otherwise>
+		</choose>
 		LIMIT #{offset}, #{limit}
 	</select>