Merge pull request 'v1.0.46' (#58) from dev into master

Reviewed-on: #58

.idea/data_source_mapping.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourcePerFileMappings">
-    <file url="file://$PROJECT_DIR$/src/main/java/com/imyeyu/api/modules/common/mapper/GroovyScriptVersionMapper.java" value="05742bdc-a11a-4147-9168-ef976a70258a" />
-  </component>
-</project>

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.36</version>
+	<version>1.0.46</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>
@@ -215,6 +215,11 @@
 			<artifactId>tinypinyin</artifactId>
 			<version>2.0.3</version>
 		</dependency>
+		<dependency>
+			<groupId>com.hankcs</groupId>
+			<artifactId>hanlp</artifactId>
+			<version>portable-1.8.4</version>
+		</dependency>
 		<dependency>
 			<groupId>com.imyeyu.font.icon</groupId>
 			<artifactId>timi-icon-font</artifactId>

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/config/ThreadPoolConfig.java

@@ -32,4 +32,22 @@ public class ThreadPoolConfig {
 		executor.initialize();
 		return executor;
 	}
+
+	/// 创建操作审计线程池
+	///
+	/// @return 操作审计线程池
+	@Bean(name = "auditTaskExecutor")
+	public ThreadPoolTaskExecutor auditTaskExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		executor.setCorePoolSize(4);
+		executor.setMaxPoolSize(8);
+		executor.setQueueCapacity(2000);
+		executor.setKeepAliveSeconds(60);
+		executor.setWaitForTasksToCompleteOnShutdown(true);
+		executor.setAwaitTerminationSeconds(60);
+		executor.setThreadNamePrefix("audit-task-executor-");
+		executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+		executor.initialize();
+		return executor;
+	}
 }

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

@@ -0,0 +1,96 @@
+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
+	@RequireCorePermission(CorePermissionCode.ARTICLE_READ)
+	@PostMapping("/list")
+	public PageResult<Article> list(@RequestBody Page<Article> page) {
+		return service.page(page);
+	}
+
+	/// 查询文章详情
+	///
+	/// @param id 文章 ID
+	/// @return 文章详情
+	@JsonView(ResponseView.Public.class)
+	@RequestRateLimit
+	@RequestMapping("/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/LoggerController.java

@@ -1,5 +1,6 @@
 package com.imyeyu.api.modules.common.controller;
 
+import com.imyeyu.api.modules.common.vo.ClientLogRequest;
 import com.imyeyu.api.modules.system.entity.Logger;
 import com.imyeyu.api.modules.system.service.LoggerService;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -29,7 +30,9 @@ public class LoggerController {
 	@AOPLog
 	@RequiredToken
 	@PostMapping("/create")
-	public void create(@Valid @RequestBody Logger logger) {
+	public void create(@Valid @RequestBody ClientLogRequest request) {
+		Logger logger = Logger.info(Logger.Module.COMMON, "CLIENT_LOG");
+		logger.setContent(request.getContent());
 		service.create(logger);
 	}
 }

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,10 @@ public class Article extends UUIDEntity implements SettingSupport {
 		/// GAO 门店日记
 		GAO_STORE_DIARY,
 
+		GAO_HELP,
+
+		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)")
-	boolean existsByBizReminded(@Param("bizType") String bizType, @Param("bizRemindedType") String bizRemindedType, @Param("bizRemindedId") String bizRemindedId);
+	/// 原子创建业务提醒
+	int insertIfAbsent(Notify notify);
 
 	/// 分页查询管理端通知
 	///

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 bizRemindedType 被提醒业务类型
-	/// @param bizRemindedId 被提醒业务 ID
-	/// @return true 为已创建
-	boolean existsByBizReminded(String bizType, String bizRemindedType, String bizRemindedId);
+	/// @param notify 通知
+	void createIfAbsent(Notify notify);
 
 	/// 分页查询当前用户创建的通知
 	///

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.service.LoggerService;
-import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 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,43 +43,53 @@ 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");
-		try {
-			TimiException.required(notify, "未找到通知");
-			TimiException.required(notify.getDetailList(), "未找到通知详情列表");
+		prepareCreate(notify);
+		super.create(notify);
+		createDetails(notify);
+	}
 
-			notify.setCreatedBy(TimiJava.defaultIfEmpty(notify.getCreatedBy(), TimiJava.ZERO_UUID));
-			super.create(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);
+	}
 
-			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);
+	/// 校验并补全通知创建字段
+	///
+	/// @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));
+		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);
 		}
 	}
 
@@ -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,32 +148,17 @@ 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);
-			for (NotifyDetail detail : detailList) {
-				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);
+		TimiException.required(notifyId, "未找到通知 ID");
+		TimiException.required(get(notifyId), "未找到通知");
+		List<NotifyDetail> detailList = detailService.listByNotifyId(notifyId);
+		for (NotifyDetail detail : detailList) {
+			detailService.delete(detail.getId());
 		}
+		super.delete(notifyId);
 	}
 
 	/// 取消通知中尚未成功发送的通知详情

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/common/vo/ClientLogRequest.java

@@ -0,0 +1,18 @@
+package com.imyeyu.api.modules.common.vo;
+
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/// 客户端诊断日志请求
+///
+/// 客户端日志不是操作审计，操作编码、模块、级别、用户和 IP 均由服务端决定
+///
+/// @author Codex
+/// @since 2026-09-09
+@Data
+public class ClientLogRequest {
+
+	/// 日志内容
+	@Size(max = 32768, message = "日志内容不能超过 32 KB")
+	private String content;
+}

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/GaoCustomerChartController.java

@@ -5,6 +5,8 @@ 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.GaoCustomerDiseaseWordReq;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseWordView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -51,4 +53,15 @@ public class GaoCustomerChartController {
 		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordCalendar(req);
 	}
+
+	/// 查询客户病症词频
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
+	@PostMapping("/customer/disease/word")
+	public List<GaoCustomerDiseaseWordView> customerDiseaseWord(@RequestBody GaoCustomerDiseaseWordReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
+		return service.customerDiseaseWord(req);
+	}
 }

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/controller/GaoStoreChartController.java

@@ -4,6 +4,7 @@ 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.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
@@ -54,6 +55,15 @@ public class GaoStoreChartController {
 		return service.customerGender(storeScopeService.resolveStoreId(storeId));
 	}
 
+	/// 查询客户年龄分布
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
+	@PostMapping("/customer/age")
+	public List<GaoCustomerAgeStatView> customerAge(@RequestParam String storeId) {
+		return service.customerAge(storeScopeService.resolveStoreId(storeId));
+	}
+
 	/// 查询登记事件每日统计，可同时支撑登记趋势和事件结构图表
 	@AOPLog
 	@RequestRateLimit

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

@@ -6,7 +6,6 @@ import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.entity.TagApply;
 import com.imyeyu.api.modules.user.bean.Gender;
 import com.imyeyu.api.modules.user.entity.User;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.spring.annotation.table.Column;
 import com.imyeyu.spring.annotation.table.Transient;
@@ -62,15 +61,12 @@ public class GaoCustomer extends UUIDEntity {
 	private String name;
 
 	@Column("name_pinyin_full")
-	@JsonIgnore
 	private String namePinyinFull;
 
 	@Column("name_pinyin_initial")
-	@JsonIgnore
 	private String namePinyinInitial;
 
 	@Column("name_pinyin_mixed")
-	@JsonIgnore
 	private String namePinyinMixed;
 
 	/// 性别

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

@@ -1,6 +1,8 @@
 package com.imyeyu.api.modules.gao.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.spring.annotation.table.Column;
 import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
@@ -61,6 +63,18 @@ public class GaoProduct extends UUIDEntity {
 	/// 产品名称
 	private String name;
 
+	@Column("name_pinyin_full")
+	@JsonIgnore
+	private String namePinyinFull;
+
+	@Column("name_pinyin_initial")
+	@JsonIgnore
+	private String namePinyinInitial;
+
+	@Column("name_pinyin_mixed")
+	@JsonIgnore
+	private String namePinyinMixed;
+
 	/// 产品类型
 	private ProductType productType;
 

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;
 
@@ -68,6 +71,14 @@ public class GaoSalesOrderItem extends UUIDEntity {
 	/// 基础单位数量系数快照
 	private BigDecimal baseQuantityPerUnitSnapshot;
 
+	/// 当前 SKU 是否允许业务数量保留小数
+	@Transient
+	private Boolean allowDecimalQuantity;
+
+	/// 当前 SKU 基础单位名称
+	@Transient
+	private String baseUnitName;
+
 	/// 购买数量
 	private BigDecimal quantity;
 

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

@@ -1,7 +1,10 @@
 package com.imyeyu.api.modules.gao.mapper;
 
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateCustomerView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseTextView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
 import com.imyeyu.spring.mapper.BaseMapper;
@@ -27,6 +30,14 @@ public interface GaoCustomerMapper extends BaseMapper<GaoCustomer, String> {
 	/// @return 每日新增客户数
 	List<GaoCustomerDailyStateView> stateDailyNewCustomer(@Param("storeId") String storeId, @Param("beginCreatedAt") Long beginCreatedAt, @Param("endCreatedAt") Long endCreatedAt);
 
+	/// 查询每日新增客户摘要
+	///
+	/// @param storeId 门店 ID
+	/// @param beginCreatedAt 开始创建时间
+	/// @param endCreatedAt 结束创建时间
+	/// @return 每日新增客户摘要
+	List<GaoCustomerDailyStateCustomerView> selectDailyNewCustomer(@Param("storeId") String storeId, @Param("beginCreatedAt") Long beginCreatedAt, @Param("endCreatedAt") Long endCreatedAt);
+
 	/// 统计开始时间前客户总数
 	///
 	/// @param beginCreatedAt 开始创建时间
@@ -38,6 +49,18 @@ public interface GaoCustomerMapper extends BaseMapper<GaoCustomer, String> {
 	/// @return 性别统计列表
 	List<GaoCustomerGenderStatView> stateGender(@Param("storeId") String storeId);
 
+	/// 统计客户年龄分布
+	///
+	/// @param storeId 门店 ID
+	/// @return 客户年龄列表
+	List<GaoCustomerAgeStatView> stateAge(@Param("storeId") String storeId);
+
+	/// 查询客户病症原始文本
+	///
+	/// @param storeId 门店 ID
+	/// @return 客户备注和病症
+	List<GaoCustomerDiseaseTextView> selectDiseaseTextByStoreId(@Param("storeId") String storeId);
+
 	/// 查询客户总数
 	///
 	/// @param page 查询条件
@@ -55,5 +78,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/mapper/GaoProductSkuMapper.java

@@ -13,6 +13,12 @@ import java.util.List;
 /// @since 2026-09-06
 public interface GaoProductSkuMapper extends BaseMapper<GaoProductSku, String> {
 
+	/// 批量查询 SKU
+	///
+	/// @param idList SKU ID 集合
+	/// @return SKU 列表
+	List<GaoProductSku> selectByIdList(@Param("idList") Collection<String> idList);
+
 	/// 按产品查询 SKU
 	List<GaoProductSku> selectByProductId(@Param("productId") String productId);
 

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

@@ -1,6 +1,8 @@
 package com.imyeyu.api.modules.gao.service;
 
 import com.imyeyu.api.modules.gao.vo.GaoCustomerChartReq;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseWordReq;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseWordView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
 
@@ -17,4 +19,7 @@ public interface GaoCustomerChartService {
 
 	/// 查询客户登记日历记录
 	List<GaoEventRecordCalendarView> eventRecordCalendar(GaoCustomerChartReq req);
+
+	/// 查询客户病症词频
+	List<GaoCustomerDiseaseWordView> customerDiseaseWord(GaoCustomerDiseaseWordReq req);
 }

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

@@ -1,6 +1,7 @@
 package com.imyeyu.api.modules.gao.service;
 
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
@@ -87,4 +88,10 @@ public interface GaoCustomerService extends BaseService<GaoCustomer, String> {
 	/// @param storeId 门店 ID
 	/// @return 性别统计列表
 	List<GaoCustomerGenderStatView> stateGender(String storeId);
+
+	/// 统计客户年龄分布
+	///
+	/// @param storeId 门店 ID
+	/// @return 客户年龄列表
+	List<GaoCustomerAgeStatView> stateAge(String storeId);
 }

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

@@ -16,6 +16,9 @@ public interface GaoOrderPaymentService {
 	/// 登记收款
 	GaoFundRecord receive(GaoOrderPaymentReceiveRequest request);
 
+	/// 登记已收款并直接核销
+	GaoFundRecord receiveAndVerify(GaoOrderPaymentReceiveRequest request);
+
 	/// 核销收款
 	GaoFundRecord verify(String fundRecordId);
 

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

@@ -0,0 +1,17 @@
+package com.imyeyu.api.modules.gao.service;
+
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
+import com.imyeyu.api.modules.gao.vo.GaoOrderStraightThroughRequest;
+
+/// GAO 订单创建直通服务
+///
+/// @author Codex
+/// @since 2026-09-13
+public interface GaoOrderStraightThroughService {
+
+	/// 在订单创建事务内完成可选的全额收款和全部履约
+	///
+	/// @param order 销售订单
+	/// @param straightThrough 直通请求，空为不直通
+	void complete(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough);
+}

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

@@ -15,6 +15,12 @@ import java.util.List;
 /// @since 2026-09-06
 public interface GaoProductSkuService extends BaseService<GaoProductSku, String> {
 
+	/// 批量查询 SKU
+	///
+	/// @param idList SKU ID 集合
+	/// @return SKU 列表，包含单位、规格和附件临时数据
+	List<GaoProductSku> listByIdList(Collection<String> idList);
+
 	/// 查询 SKU 详情
 	GaoProductSku detail(String id);
 
@@ -27,6 +33,14 @@ public interface GaoProductSkuService extends BaseService<GaoProductSku, String>
 	/// 查询并校验可销售 SKU 单位
 	GaoProductSkuUnitSelection getSellableSkuUnit(String storeId, String skuId, String skuUnitId);
 
+	/// 查询并校验可用于历史订单履约的 SKU 单位
+	///
+	/// @param storeId 门店 ID
+	/// @param skuId SKU ID
+	/// @param skuUnitId SKU 单位 ID
+	/// @return SKU 单位选择结果
+	GaoProductSkuUnitSelection getFulfillableSkuUnit(String storeId, String skuId, String skuUnitId);
+
 	/// 查询并校验 SKU 单位
 	GaoProductSkuUnitSelection getSkuUnit(String storeId, String skuId, String skuUnitId, boolean purchase);
 

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

@@ -46,6 +46,9 @@ public interface GaoProductStockService {
 	/// 为履约预占库存
 	boolean hasSufficientForFulfillment(String storeId, List<GaoStockChangeItem> items);
 
+	/// 获取履约库存缺口提示，无缺口时返回 null
+	String getFulfillmentStockShortageMessage(String storeId, List<GaoStockChangeItem> items);
+
 	/// 为履约预占库存
 	List<GaoProductStock> reserveForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
 

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

@@ -1,6 +1,7 @@
 package com.imyeyu.api.modules.gao.service;
 
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
@@ -21,6 +22,9 @@ public interface GaoStoreChartService {
 	/// 查询客户性别统计
 	List<GaoCustomerGenderStatView> customerGender(String storeId);
 
+	/// 查询客户年龄分布
+	List<GaoCustomerAgeStatView> customerAge(String storeId);
+
 	/// 查询登记事件每日统计
 	List<GaoEventRecordDailyStatView> eventRecordDailyStat(GaoStoreChartReq req);
 

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

@@ -1,15 +1,23 @@
 package com.imyeyu.api.modules.gao.service.implement;
 
+import com.hankcs.hanlp.seg.common.Term;
+import com.hankcs.hanlp.tokenizer.StandardTokenizer;
+import com.imyeyu.api.modules.gao.mapper.GaoCustomerMapper;
 import com.imyeyu.api.modules.gao.service.GaoCustomerChartService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerChartReq;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseTextView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseWordReq;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseWordView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
 import com.imyeyu.java.bean.timi.TimiException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /// 客户报表服务实现
 ///
@@ -20,6 +28,7 @@ import java.util.List;
 public class GaoCustomerChartServiceImplement implements GaoCustomerChartService {
 
 	private final GaoEventRecordService eventRecordService;
+	private final GaoCustomerMapper customerMapper;
 
 	@Override
 	public List<GaoEventRecordDailyStatView> eventRecordDailyStat(GaoCustomerChartReq req) {
@@ -33,6 +42,42 @@ public class GaoCustomerChartServiceImplement implements GaoCustomerChartService
 		return eventRecordService.calendarByCustomerRange(req);
 	}
 
+	@Override
+	public List<GaoCustomerDiseaseWordView> customerDiseaseWord(GaoCustomerDiseaseWordReq req) {
+		TimiException.required(req, "not found req");
+		TimiException.required(req.getStoreId(), "not found req.storeId");
+
+		int topN = normalizeTopN(req.getTopN());
+		Map<String, Long> wordCountMap = new HashMap<>();
+		for (GaoCustomerDiseaseTextView customer : customerMapper.selectDiseaseTextByStoreId(req.getStoreId())) {
+			countNounWord(customer.getDisease(), wordCountMap);
+			countNounWord(customer.getRemark(), wordCountMap);
+		}
+		return wordCountMap.entrySet().stream()
+			.sorted(Map.Entry.<String, Long>comparingByValue().reversed().thenComparing(Map.Entry.comparingByKey()))
+			.limit(topN)
+			.map(item -> new GaoCustomerDiseaseWordView(item.getKey(), item.getValue()))
+			.toList();
+	}
+
+	private void countNounWord(String text, Map<String, Long> wordCountMap) {
+		if (text == null || text.isBlank()) {
+			return;
+		}
+		for (Term term : StandardTokenizer.segment(text)) {
+			if (term.nature != null && term.nature.toString().startsWith("n")) {
+				wordCountMap.merge(term.word, 1L, Long::sum);
+			}
+		}
+	}
+
+	private int normalizeTopN(Integer topN) {
+		if (topN == null) {
+			return 60;
+		}
+		return Math.clamp(topN, 1, 100);
+	}
+
 	private void checkRangeReq(GaoCustomerChartReq req) {
 		TimiException.required(req, "not found req");
 		TimiException.required(req.getStoreId(), "not found req.storeId");

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;
@@ -12,6 +13,7 @@ import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
 import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
 import com.imyeyu.api.modules.gao.mapper.GaoCustomerPackageMapper;
 import com.imyeyu.api.modules.gao.service.GaoSalesOrderService;
+import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoCustomerPackageService;
 import com.imyeyu.api.modules.gao.service.GaoPackageConfigService;
@@ -24,8 +26,8 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerPackagePurchaseItem;
 import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
 import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.PermissionChecker;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
@@ -44,6 +46,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;
@@ -65,11 +68,11 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 	private final GaoProductSkuService skuService;
 	private final GaoCustomerService customerService;
 	private final GaoSalesOrderService salesOrderService;
+	private final GaoOrderStraightThroughService straightThroughService;
 	private final GaoStoreScopeService storeScopeService;
 	private final AttachmentService attachmentService;
 	private final UserLoginService userLoginService;
 	private final PermissionChecker permissionChecker;
-	private final LoggerService loggerService;
 
 	@Override
 	protected BaseMapper<GaoCustomerPackage, String> mapper() {
@@ -128,10 +131,11 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		return super.get(id);
 	}
 
+	@OperationAudit(AuditOperation.GAO_CUSTOMER_PACKAGE_PURCHASE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoCustomerPackage purchase(GaoCustomerPackagePurchaseRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_CUSTOMER_PACKAGE_PURCHASE", request, () -> purchaseInternal(request));
+		return purchaseInternal(request);
 	}
 
 	private GaoCustomerPackage purchaseInternal(GaoCustomerPackagePurchaseRequest request) {
@@ -151,10 +155,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());
-		List<GaoCustomerPackagePurchaseItem> itemList = resolvePurchaseItems(config.getStoreId(), requestItemList, configItemList, canOverridePriceAndQuantity);
+			GaoPermissionCode.CUSTOMER_PACKAGE_PRICE_OVERRIDE.getValue());
+		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);
@@ -163,6 +170,7 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		if (existingOrder != null) {
 			GaoCustomerPackage existingPackage = getBySalesOrderId(existingOrder.getId());
 			verifyPurchaseIdempotency(existingOrder, existingPackage, request);
+			straightThroughService.complete(salesOrderService.detail(existingOrder.getId()), request.getStraightThrough());
 			return existingPackage;
 		}
 		Long purchasedAt = TimiJava.defaultIfNull(request.getPurchasedAt(), Time.now());
@@ -200,16 +208,19 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		result.setStandardAmountSnapshot(config.getStandardAmount());
 		result.setRemark(request.getRemark());
 		super.create(result);
+		straightThroughService.complete(salesOrder, request.getStraightThrough());
+		salesOrder = salesOrderService.detail(salesOrder.getId());
 		result.setSalesOrder(salesOrder);
 		result.setItemList(salesOrder.getItemList());
 		result.setStatus(salesOrder.getStatus());
 		return result;
 	}
 
+	@OperationAudit(AuditOperation.GAO_CUSTOMER_PACKAGE_CANCEL)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoCustomerPackage cancel(GaoCustomerPackageCancelRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_CUSTOMER_PACKAGE_CANCEL", request, () -> cancelInternal(request));
+		return cancelInternal(request);
 	}
 
 	private GaoCustomerPackage cancelInternal(GaoCustomerPackageCancelRequest request) {
@@ -245,6 +256,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());
@@ -264,6 +276,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());
@@ -283,6 +296,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++) {
@@ -293,14 +332,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<>();
@@ -311,23 +351,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());
-			TimiException.requiredTrue(skuConfigItemList != null && !skuConfigItemList.isEmpty(), "购买 SKU 不属于套餐配置");
+			if (gifted) {
+				TimiException.requiredTrue(canCreateGift, "没有客户套餐创建赠送权限");
+			} else {
+				TimiException.requiredTrue(skuConfigItemList != null && !skuConfigItemList.isEmpty(), "购买 SKU 不属于套餐配置");
+			}
 			GaoProductSkuUnitSelection selection = skuService.getSellableSkuUnit(storeId, requestItem.getSkuId(), requestItem.getSkuUnitId());
-			TimiException.requiredTrue(skuConfigItemList.stream().anyMatch(configItem -> 0 <= configItem.getBaseQuantityPerUnitSnapshot()
-				.compareTo(selection.getUnit().getBaseQuantityPerUnit())), "套餐权益单位不能高于配置单位");
+			if (!gifted) {
+				TimiException.requiredTrue(skuConfigItemList.stream().anyMatch(configItem -> 0 <= configItem.getBaseQuantityPerUnitSnapshot()
+					.compareTo(selection.getUnit().getBaseQuantityPerUnit())), "套餐权益单位不能高于配置单位");
+			}
 			BigDecimal requestBaseQuantity = toBaseQuantity(requestItem.getTotalQuantity(), selection.getUnit().getBaseQuantityPerUnit(), "套餐权益基础数量最多保留三位小数");
-			requestBaseQuantityMap.merge(requestItem.getSkuId(), requestBaseQuantity, BigDecimal::add);
+			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());
@@ -336,8 +385,14 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 			item.setUnitSnapshot(selection.getUnit().getName());
 			item.setBaseQuantityPerUnitSnapshot(selection.getUnit().getBaseQuantityPerUnit());
 			item.setTotalQuantity(requestItem.getTotalQuantity());
-			item.setSort(template.getSort());
-			item.setRemark(template.getRemark());
+			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(), "购买套餐至少需要一个产品");
@@ -377,9 +432,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/GaoCustomerServiceImplement.java

@@ -14,7 +14,9 @@ import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
 import com.imyeyu.api.modules.gao.util.CustomerXSSFBuilder;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateCustomerView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
@@ -410,6 +412,10 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		for (GaoCustomerDailyStateView view : mapper.stateDailyNewCustomer(req.getStoreId(), beginCreatedAt, endCreatedAt)) {
 			newCustomerCountMap.put(view.getDateValue(), TimiJava.defaultIfNull(view.getNewCustomerCount(), 0L));
 		}
+		Map<Integer, List<GaoCustomerDailyStateCustomerView>> customerListMap = new HashMap<>();
+		for (GaoCustomerDailyStateCustomerView customer : mapper.selectDailyNewCustomer(req.getStoreId(), beginCreatedAt, endCreatedAt)) {
+			customerListMap.computeIfAbsent(customer.getDateValue(), key -> new ArrayList<>()).add(customer);
+		}
 		long totalCustomerCount = TimiJava.defaultIfNull(mapper.countCreatedBefore(req.getStoreId(), beginCreatedAt), 0L);
 		List<GaoCustomerDailyStateView> list = new ArrayList<>();
 		for (LocalDate date = beginDate; !date.isAfter(endDate); date = date.plusDays(1)) {
@@ -420,6 +426,7 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 			view.setDateValue(dateValue);
 			view.setNewCustomerCount(newCustomerCount);
 			view.setTotalCustomerCount(totalCustomerCount);
+			view.setCustomerList(customerListMap.getOrDefault(dateValue, List.of()));
 			list.add(view);
 		}
 		return list;
@@ -431,6 +438,12 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		return mapper.stateGender(storeId);
 	}
 
+	@Override
+	public List<GaoCustomerAgeStatView> stateAge(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		return mapper.stateAge(storeId);
+	}
+
 	private void changeInvitedCount(String customerId, long delta) {
 		if (TimiJava.isEmpty(customerId) || delta == 0) {
 			return;

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

@@ -31,8 +31,8 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentPrepareStockRequest;
 import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentRevokeRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
 import com.imyeyu.api.modules.gao.vo.GaoStockChangeItem;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
@@ -79,7 +79,6 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 	private final RoleChecker roleChecker;
 	private final UserLoginService userLoginService;
 	private final AttachmentService attachmentService;
-	private final LoggerService loggerService;
 
 	@Override
 	protected BaseMapper<GaoOrderFulfillment, String> mapper() {
@@ -147,10 +146,11 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		return mapper.countPendingBySalesOrderId(salesOrderId);
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_CREATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoOrderFulfillment create(GaoOrderFulfillmentCreateRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_CREATE", request, () -> createInternal(request));
+		return createInternal(request);
 	}
 
 	private GaoOrderFulfillment createInternal(GaoOrderFulfillmentCreateRequest request) {
@@ -183,10 +183,11 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		return detail(fulfillment.getId());
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_PREPARE_STOCK)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoOrderFulfillment prepareStock(GaoOrderFulfillmentPrepareStockRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_PREPARE_STOCK", request, () -> prepareStockInternal(request));
+		return prepareStockInternal(request);
 	}
 
 	private GaoOrderFulfillment prepareStockInternal(GaoOrderFulfillmentPrepareStockRequest request) {
@@ -206,7 +207,8 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		List<GaoStockChangeItem> stockItems = buildStockItems(order.getStoreId(), sourceList);
 		applySkuSpecSnapshots(stockItems, fulfillmentItemList);
 		TimiException.requiredTrue(!stockItems.isEmpty(), "履约单没有需要占用的实物库存");
-		TimiException.requiredTrue(productStockService.hasSufficientForFulfillment(order.getStoreId(), stockItems), "库存仍然不足，不能准备履约");
+		String stockShortageMessage = productStockService.getFulfillmentStockShortageMessage(order.getStoreId(), stockItems);
+		TimiException.requiredTrue(stockShortageMessage == null, stockShortageMessage);
 		String operatorUserId = userLoginService.getRequireLoginUserId();
 		productStockService.reserveForFulfillment(order.getStoreId(), fulfillment.getId(), stockItems,
 			stockRequestNo(fulfillment, "RESERVE"), operatorUserId);
@@ -217,10 +219,11 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		return detail(fulfillment.getId());
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_VERIFY)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoOrderFulfillment verify(GaoOrderFulfillmentActionRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_VERIFY", request, () -> verifyInternal(request));
+		return verifyInternal(request);
 	}
 
 	private GaoOrderFulfillment verifyInternal(GaoOrderFulfillmentActionRequest request) {
@@ -254,16 +257,18 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		return detail(fulfillment.getId());
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_REJECT)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoOrderFulfillment reject(GaoOrderFulfillmentActionRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_REJECT", request, () -> releaseInternal(request, GaoOrderFulfillment.Status.REJECTED));
+		return releaseInternal(request, GaoOrderFulfillment.Status.REJECTED);
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_CANCEL)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoOrderFulfillment cancel(GaoOrderFulfillmentActionRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_CANCEL", request, () -> cancelInternal(request));
+		return cancelInternal(request);
 	}
 
 	private GaoOrderFulfillment cancelInternal(GaoOrderFulfillmentActionRequest request) {
@@ -306,10 +311,11 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		return detail(fulfillment.getId());
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_REVOKE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoOrderFulfillment revoke(GaoOrderFulfillmentRevokeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_ORDER_FULFILLMENT_REVOKE", request, () -> revokeInternal(request));
+		return revokeInternal(request);
 	}
 
 	private GaoOrderFulfillment revokeInternal(GaoOrderFulfillmentRevokeRequest request) {
@@ -445,12 +451,32 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 			GaoSalesOrderItem.ItemType expectedItemType = order.getOrderType() == GaoSalesOrder.OrderType.PACKAGE
 				? GaoSalesOrderItem.ItemType.PACKAGE_ENTITLEMENT : GaoSalesOrderItem.ItemType.DIRECT_PRODUCT;
 			TimiException.requiredTrue(source.getItemType() == expectedItemType, "订单项类型与订单类型不匹配");
-			GaoProductSkuUnitSelection selection = skuService.getSellableSkuUnit(order.getStoreId(), source.getSkuId(), requestItem.getSkuUnitId());
+			if (requestItem.getSkuUnitId().equals(source.getSkuUnitId())) {
+				result.add(toSourceByOrderSnapshot(order, source, requestItem.getQuantity(), checkAvailable));
+				continue;
+			}
+			GaoProductSkuUnitSelection selection = skuService.getFulfillableSkuUnit(order.getStoreId(), source.getSkuId(), requestItem.getSkuUnitId());
 			result.add(toSource(order, source, selection.getProduct(), selection.getSku(), selection.getUnit(), requestItem.getQuantity(), checkAvailable));
 		}
 		return result;
 	}
 
+	private SourceEntry toSourceByOrderSnapshot(GaoSalesOrder order, GaoSalesOrderItem source, BigDecimal quantity, boolean checkAvailable) {
+		GaoProductSku sku = skuService.get(source.getSkuId());
+		TimiException.required(sku, "履约来源 SKU 不存在");
+		GaoProduct product = productService.get(sku.getProductId());
+		TimiException.required(product, "履约来源产品不存在");
+		TimiException.requiredTrue(order.getStoreId().equals(product.getStoreId()), "履约来源产品不属于当前门店");
+		quantity = requiredPositiveQuantity(quantity, "履约数量");
+		if (!Boolean.TRUE.equals(sku.getAllowDecimalQuantity())) {
+			TimiException.requiredTrue(quantity.stripTrailingZeros().scale() <= 0, "该产品不允许小数数量");
+		}
+		BigDecimal baseQuantityPerUnit = requiredBaseQuantityPerUnit(source.getBaseQuantityPerUnitSnapshot());
+		BigDecimal baseQuantity = toBaseQuantity(quantity, baseQuantityPerUnit, "履约基础数量最多保留三位小数");
+		return buildSource(order, source, source.getSkuUnitId(), source.getUnitSnapshot(), baseQuantityPerUnit, quantity,
+			baseQuantity, product, sku, checkAvailable);
+	}
+
 	private List<SourceEntry> loadPersistedSources(GaoSalesOrder order, List<GaoOrderFulfillmentItem> itemList) {
 		TimiException.requiredTrue(itemList != null && !itemList.isEmpty(), "履约单没有明细");
 		List<GaoOrderFulfillmentItem> sortedItemList = new ArrayList<>(itemList);

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

@@ -16,8 +16,8 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentNoRefundRequest;
 import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentReceiveRequest;
 import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRefundRequest;
 import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRevokeRequest;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.PermissionChecker;
 import com.imyeyu.java.TimiJava;
@@ -44,15 +44,22 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 	private final AttachmentService attachmentService;
 	private final UserLoginService userLoginService;
 	private final PermissionChecker permissionChecker;
-	private final LoggerService loggerService;
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_PAYMENT_RECEIVE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoFundRecord receive(GaoOrderPaymentReceiveRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_PAYMENT_RECEIVE", request, () -> receiveInternal(request));
+		return receiveInternal(request, false);
 	}
 
-	private GaoFundRecord receiveInternal(GaoOrderPaymentReceiveRequest request) {
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_PAYMENT_RECEIVE)
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public GaoFundRecord receiveAndVerify(GaoOrderPaymentReceiveRequest request) {
+		return receiveInternal(request, true);
+	}
+
+	private GaoFundRecord receiveInternal(GaoOrderPaymentReceiveRequest request, boolean verified) {
 		TimiException.required(request, "not found order payment request");
 		TimiException.required(request.getSalesOrderId(), "not found salesOrderId");
 		TimiException.required(request.getAmount(), "收款金额不能为空");
@@ -62,7 +69,7 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		GaoFundRecord existing = fundRecordService.getByRequestNo(order.getStoreId(), requestNo);
 		if (existing != null) {
 			verifySameReceive(existing, order, request);
-			return existing;
+			return verified && existing.getStatus() == GaoFundRecord.Status.PENDING ? verify(existing.getId()) : existing;
 		}
 		TimiException.requiredTrue(order.getStatus() != GaoSalesOrder.Status.CANCELLED, "已取消订单不能收款");
 		TimiException.requiredTrue(order.getRefundStatus() != GaoSalesOrder.RefundStatus.REFUNDED, "已完成退款订单不能收款");
@@ -71,20 +78,38 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		TimiException.requiredTrue(pending + paid + request.getAmount() <= safe(order.getSaleAmount()), "累计收款不能超过成交价");
 		TimiException.requiredTrue(hasPhoto(request.getAttachmentList()), "收款必须上传照片");
 		GaoFundRecord record = newRecord(order, GaoFundRecord.OperationType.RECEIVE, requestNo, request.getAmount(), request.getOccurredAt(), request.getRemark());
-		record.setStatus(GaoFundRecord.Status.PENDING);
+		record.setStatus(verified ? GaoFundRecord.Status.VERIFIED : GaoFundRecord.Status.PENDING);
+		String verifierUserId = verified ? userLoginService.getRequireLoginUserId() : null;
+		Long verifiedAt = verified ? Time.now() : null;
+		if (verified) {
+			record.setVerifierUserId(verifierUserId);
+			record.setVerifiedAt(verifiedAt);
+		}
 		fundRecordService.createByOrderPayment(record);
-		order.setPendingPaidAmount(pending + request.getAmount());
+		if (!verified) {
+			order.setPendingPaidAmount(pending + request.getAmount());
+		} else {
+			Long paidAtBefore = order.getPaidAt();
+			order.setPaidAmount(paid + request.getAmount());
+			orderService.recomputePaymentStatus(order);
+			orderService.updatePayment(order);
+			if (paidAtBefore == null && order.getPaidAt() != null) {
+				pointTriggerService.onSalesOrderPaid(order);
+			}
+			attachmentService.updateByBizId(Attachment.BizType.GAO_FUND_RECORD, record.getId(), request.getAttachmentList());
+			return record;
+		}
 		orderService.recomputePaymentStatus(order);
 		orderService.updatePayment(order);
 		attachmentService.updateByBizId(Attachment.BizType.GAO_FUND_RECORD, record.getId(), request.getAttachmentList());
 		return record;
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_PAYMENT_VERIFY)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoFundRecord verify(String fundRecordId) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_PAYMENT_VERIFY", fundRecordId, () -> {
-			GaoFundRecord record = lockOrderRecord(fundRecordId);
+		GaoFundRecord record = lockOrderRecord(fundRecordId);
 		TimiException.requiredTrue(record.getOperationType() == GaoFundRecord.OperationType.RECEIVE && record.getStatus() == GaoFundRecord.Status.PENDING, "收款记录不是待核销状态");
 		GaoSalesOrder order = orderService.getForUpdate(record.getBizId());
 		Long paidAtBefore = order.getPaidAt();
@@ -102,7 +127,6 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 			pointTriggerService.onSalesOrderPaid(order);
 		}
 		return record;
-		});
 	}
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
@@ -140,10 +164,11 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		return record;
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_REFUND)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoFundRecord refund(GaoOrderPaymentRefundRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_REFUND", request, () -> refundInternal(request));
+		return refundInternal(request);
 	}
 
 	private GaoFundRecord refundInternal(GaoOrderPaymentRefundRequest request) {
@@ -177,11 +202,11 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		return record;
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_CONFIRM_NO_REFUND)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoFundRecord confirmNoRefund(GaoOrderPaymentNoRefundRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_CONFIRM_NO_REFUND", request, () -> {
-			TimiException.required(request, "not found no refund request");
+		TimiException.required(request, "not found no refund request");
 			GaoSalesOrder order = orderService.getForUpdate(request.getSalesOrderId());
 			String requestNo = requiredText(request.getRequestNo(), "not found requestNo");
 			String reason = requiredText(request.getReason(), "确认无需退款原因不能为空");
@@ -199,13 +224,13 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 			order.setRefundStatus(GaoSalesOrder.RefundStatus.REFUNDED);
 			orderService.updatePayment(order);
 			return record;
-		});
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_FUND_REVOKE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoFundRecord revoke(GaoOrderPaymentRevokeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_FUND_REVOKE", request, () -> revokeInternal(request));
+		return revokeInternal(request);
 	}
 
 	private GaoFundRecord revokeInternal(GaoOrderPaymentRevokeRequest request) {

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);
-				if (notifyService.existsByBizReminded(NOTIFY_BIZ_TYPE, reminderType, remindedId)) {
-					continue;
-				}
+				String remindedKey = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId, manager.getUserId(), reminderType);
 				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/GaoOrderStraightThroughServiceImplement.java

@@ -0,0 +1,155 @@
+package com.imyeyu.api.modules.gao.service.implement;
+
+import com.imyeyu.api.bean.ModuleCode;
+import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
+import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.entity.GaoFundRecord;
+import com.imyeyu.api.modules.gao.entity.GaoOrderFulfillment;
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
+import com.imyeyu.api.modules.gao.service.GaoOrderFulfillmentService;
+import com.imyeyu.api.modules.gao.service.GaoOrderPaymentService;
+import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
+import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentCreateRequest;
+import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentActionRequest;
+import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentItemRequest;
+import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentReceiveRequest;
+import com.imyeyu.api.modules.gao.vo.GaoOrderStraightThroughRequest;
+import com.imyeyu.api.modules.user.service.PermissionChecker;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/// GAO 订单创建直通服务实现
+///
+/// @author Codex
+/// @since 2026-09-13
+@Service
+@RequiredArgsConstructor
+public class GaoOrderStraightThroughServiceImplement implements GaoOrderStraightThroughService {
+
+	private final GaoOrderPaymentService paymentService;
+	private final GaoOrderFulfillmentService fulfillmentService;
+	private final PermissionChecker permissionChecker;
+
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public void complete(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough) {
+		if (straightThrough == null) {
+			return;
+		}
+		boolean paymentVerified = Boolean.TRUE.equals(straightThrough.getPaymentVerified());
+		boolean receiveFullPayment = Boolean.TRUE.equals(straightThrough.getReceiveFullPayment());
+		boolean fulfillAll = Boolean.TRUE.equals(straightThrough.getFulfillAll());
+		Long paymentAmount = paymentVerified ? straightThrough.getPaymentAmount() : order.getSaleAmount();
+		if (!paymentVerified && !receiveFullPayment && !fulfillAll) {
+			return;
+		}
+		TimiException.required(order, "not found sales order");
+		TimiException.required(order.getId(), "not found salesOrderId");
+		TimiException.requiredTrue(!(paymentVerified && receiveFullPayment), "已核销收款和已全额收款和核销不能同时启用");
+		if (paymentVerified) {
+			TimiException.required(paymentAmount, "已核销收款金额不能为空");
+			TimiException.requiredTrue(0 < paymentAmount && paymentAmount <= safe(order.getSaleAmount()), "已核销收款金额不能超过订单金额");
+		}
+		TimiException.requiredTrue(!fulfillAll || receiveFullPayment || order.getSaleAmount() == 0
+			|| (paymentVerified && paymentAmount.equals(order.getSaleAmount())),
+			"全部履约直通必须同时完成收款核销");
+		checkPermissions(order.getOrderType(), paymentVerified || receiveFullPayment, fulfillAll);
+		if (receiveFullPayment) {
+			settle(order, straightThrough);
+		} else if (paymentVerified) {
+			verifyReceivedPayment(order, straightThrough, paymentAmount);
+		}
+		if (fulfillAll) {
+			fulfill(order, straightThrough);
+		}
+	}
+
+	private void checkPermissions(GaoSalesOrder.OrderType orderType, boolean paymentCompleted, boolean fulfillAll) {
+		List<String> permissionCodeList = new ArrayList<>();
+		permissionCodeList.add(orderType == GaoSalesOrder.OrderType.PACKAGE
+			? GaoPermissionCode.CUSTOMER_PACKAGE_CREATE.getValue() : GaoPermissionCode.SALES_ORDER_CREATE.getValue());
+		if (paymentCompleted) {
+			permissionCodeList.add(GaoPermissionCode.FUND_RECEIVE_CREATE.getValue());
+			permissionCodeList.add(GaoPermissionCode.FUND_RECEIVE_VERIFY.getValue());
+		}
+		if (fulfillAll) {
+			permissionCodeList.add(GaoPermissionCode.ORDER_FULFILLMENT_CREATE.getValue());
+			permissionCodeList.add(GaoPermissionCode.ORDER_FULFILLMENT_VERIFY.getValue());
+		}
+		permissionChecker.checkAll(ModuleCode.GAO, permissionCodeList.toArray(String[]::new));
+	}
+
+	private void settle(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough) {
+		if (order.getSaleAmount() == null || order.getSaleAmount() == 0) {
+			return;
+		}
+		GaoOrderPaymentReceiveRequest paymentRequest = new GaoOrderPaymentReceiveRequest();
+		paymentRequest.setSalesOrderId(order.getId());
+		paymentRequest.setRequestNo("ORDER-%s-FULL-PAY".formatted(order.getId()));
+		paymentRequest.setAmount(order.getSaleAmount());
+		paymentRequest.setOccurredAt(TimiJava.defaultIfNull(straightThrough.getPaymentOccurredAt(), order.getPurchasedAt()));
+		paymentRequest.setAttachmentList(straightThrough.getPaymentAttachmentList());
+		paymentRequest.setRemark(TimiJava.defaultIfEmpty(straightThrough.getPaymentRemark(), "随订单创建直接全额收款"));
+		GaoFundRecord record = paymentService.receive(paymentRequest);
+		if (record.getStatus() == GaoFundRecord.Status.PENDING) {
+			paymentService.verify(record.getId());
+			return;
+		}
+		TimiException.requiredTrue(record.getStatus() == GaoFundRecord.Status.VERIFIED, "直通收款记录不是已核销状态");
+	}
+
+	private void verifyReceivedPayment(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough, Long paymentAmount) {
+		GaoOrderPaymentReceiveRequest paymentRequest = new GaoOrderPaymentReceiveRequest();
+		paymentRequest.setSalesOrderId(order.getId());
+		paymentRequest.setRequestNo("ORDER-%s-VERIFIED-PAY".formatted(order.getId()));
+		paymentRequest.setAmount(paymentAmount);
+		paymentRequest.setOccurredAt(TimiJava.defaultIfNull(straightThrough.getPaymentOccurredAt(), order.getPurchasedAt()));
+		paymentRequest.setAttachmentList(straightThrough.getPaymentAttachmentList());
+		paymentRequest.setRemark(TimiJava.defaultIfEmpty(straightThrough.getPaymentRemark(), "随订单创建直接核销已有收款"));
+		GaoFundRecord record = paymentService.receiveAndVerify(paymentRequest);
+		TimiException.requiredTrue(record.getStatus() == GaoFundRecord.Status.VERIFIED, "直通收款记录不是已核销状态");
+	}
+
+	private void fulfill(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough) {
+		List<GaoSalesOrderItem> orderItemList = order.getItemList();
+		TimiException.requiredTrue(orderItemList != null && !orderItemList.isEmpty(), "销售订单没有可履约明细");
+		List<GaoOrderFulfillmentItemRequest> itemList = orderItemList.stream().map(item -> {
+			GaoOrderFulfillmentItemRequest result = new GaoOrderFulfillmentItemRequest();
+			result.setSourceOrderItemId(item.getId());
+			result.setSkuUnitId(item.getSkuUnitId());
+			result.setQuantity(item.getQuantity());
+			return result;
+		}).toList();
+		GaoOrderFulfillmentCreateRequest fulfillmentRequest = new GaoOrderFulfillmentCreateRequest();
+		fulfillmentRequest.setSalesOrderId(order.getId());
+		fulfillmentRequest.setRequestNo("ORDER-%s-FULL-FULFILL".formatted(order.getId()));
+		fulfillmentRequest.setDeliveredAt(TimiJava.defaultIfNull(straightThrough.getDeliveredAt(), order.getPurchasedAt()));
+		fulfillmentRequest.setItemList(itemList);
+		fulfillmentRequest.setAttachmentList(straightThrough.getFulfillmentAttachmentList());
+		fulfillmentRequest.setRemark(TimiJava.defaultIfEmpty(straightThrough.getFulfillmentRemark(), "随订单创建直接全部履约"));
+		GaoOrderFulfillment fulfillment = fulfillmentService.create(fulfillmentRequest);
+		if (fulfillment.getStatus() == GaoOrderFulfillment.Status.PENDING) {
+			fulfillmentService.verify(actionRequest(fulfillment.getId()));
+			return;
+		}
+		TimiException.requiredTrue(fulfillment.getStatus() == GaoOrderFulfillment.Status.VERIFIED,
+			fulfillment.getStatus() == GaoOrderFulfillment.Status.WAITING_STOCK ? "库存不足，不能全部履约直通" : "直通履约单不是已核销状态");
+	}
+
+	private GaoOrderFulfillmentActionRequest actionRequest(String fulfillmentId) {
+		GaoOrderFulfillmentActionRequest request = new GaoOrderFulfillmentActionRequest();
+		request.setFulfillmentId(fulfillmentId);
+		return request;
+	}
+
+	private long safe(Long value) {
+		return value == null ? 0L : value;
+	}
+}

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

@@ -6,8 +6,8 @@ import com.imyeyu.api.modules.gao.entity.GaoPackageConfigItem;
 import com.imyeyu.api.modules.gao.entity.GaoProduct;
 import com.imyeyu.api.modules.gao.entity.GaoProductSku;
 import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.gao.mapper.GaoPackageConfigItemMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoPackageConfigMapper;
 import com.imyeyu.api.modules.gao.service.GaoPackageConfigService;
@@ -44,7 +44,6 @@ public class GaoPackageConfigServiceImplement extends AbstractEntityService<GaoP
 	private final GaoPackageConfigItemMapper itemMapper;
 	private final GaoProductSkuService skuService;
 	private final UserLoginService userLoginService;
-	private final LoggerService loggerService;
 
 	@Override
 	protected BaseMapper<GaoPackageConfig, String> mapper() {
@@ -90,13 +89,11 @@ public class GaoPackageConfigServiceImplement extends AbstractEntityService<GaoP
 			.collect(java.util.stream.Collectors.groupingBy(GaoPackageConfigItem::getPackageConfigId));
 	}
 
+	@OperationAudit(AuditOperation.GAO_PACKAGE_CONFIG_CREATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(GaoPackageConfig config) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PACKAGE_CONFIG_CREATE", config, () -> {
-			createInternal(config);
-			return config;
-		});
+		createInternal(config);
 	}
 
 	private void createInternal(GaoPackageConfig config) {
@@ -109,13 +106,11 @@ public class GaoPackageConfigServiceImplement extends AbstractEntityService<GaoP
 		saveItems(config.getId(), config.getItemList());
 	}
 
+	@OperationAudit(AuditOperation.GAO_PACKAGE_CONFIG_UPDATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void update(GaoPackageConfig request) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PACKAGE_CONFIG_UPDATE", request, () -> {
-			updateInternal(request);
-			return request;
-		});
+		updateInternal(request);
 	}
 
 	private void updateInternal(GaoPackageConfig request) {
@@ -141,15 +136,13 @@ public class GaoPackageConfigServiceImplement extends AbstractEntityService<GaoP
 		saveItems(dbConfig.getId(), request.getItemList());
 	}
 
+	@OperationAudit(AuditOperation.GAO_PACKAGE_CONFIG_DELETE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void delete(String id) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PACKAGE_CONFIG_DELETE", id, () -> {
-			GaoPackageConfig config = get(id);
-			TimiException.required(config, "not found package config");
-			super.delete(id);
-			return id;
-		});
+		GaoPackageConfig config = get(id);
+		TimiException.required(config, "not found package config");
+		super.delete(id);
 	}
 
 	/// 套餐配置只允许逻辑删除

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

@@ -6,8 +6,8 @@ import com.imyeyu.api.modules.gao.mapper.GaoProductCategoryMapper;
 import com.imyeyu.api.modules.gao.service.GaoProductCategoryService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoProductCategoryPage;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+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.TimiException;
@@ -37,7 +37,6 @@ public class GaoProductCategoryServiceImplement extends AbstractEntityService<Ga
 	private final GaoProductCategoryMapper mapper;
 	private final GaoStoreScopeService storeScopeService;
 	private final UserLoginService userLoginService;
-	private final LoggerService loggerService;
 
 	@Override
 	protected BaseMapper<GaoProductCategory, String> mapper() {
@@ -59,6 +58,7 @@ public class GaoProductCategoryServiceImplement extends AbstractEntityService<Ga
 		return mapper.selectByStoreId(storeId);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_CATEGORY_SORT)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void sort(List<String> idList) {
@@ -66,58 +66,50 @@ public class GaoProductCategoryServiceImplement extends AbstractEntityService<Ga
 			return;
 		}
 		List<String> distinctIdList = new ArrayList<>(new LinkedHashSet<>(idList));
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_SORT", distinctIdList, () -> {
-			Map<String, GaoProductCategory> categoryMap = mapper.selectByIdList(new LinkedHashSet<>(distinctIdList)).stream()
-				.collect(Collectors.toMap(GaoProductCategory::getId, Function.identity()));
-			TimiException.requiredTrue(categoryMap.size() == distinctIdList.size(), "产品分类列表包含不存在的分类");
-			for (GaoProductCategory category : categoryMap.values()) {
-				storeScopeService.checkStoreId(category.getStoreId());
-			}
-			mapper.updateSort(distinctIdList, Time.now());
-		});
+		Map<String, GaoProductCategory> categoryMap = mapper.selectByIdList(new LinkedHashSet<>(distinctIdList)).stream()
+			.collect(Collectors.toMap(GaoProductCategory::getId, Function.identity()));
+		TimiException.requiredTrue(categoryMap.size() == distinctIdList.size(), "产品分类列表包含不存在的分类");
+		for (GaoProductCategory category : categoryMap.values()) {
+			storeScopeService.checkStoreId(category.getStoreId());
+		}
+		mapper.updateSort(distinctIdList, Time.now());
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_CATEGORY_CREATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(GaoProductCategory category) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_CREATE", category, () -> {
-			prepare(category, null);
-			super.create(category);
-			return category;
-		});
+		prepare(category, null);
+		super.create(category);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_CATEGORY_UPDATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void update(GaoProductCategory request) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_UPDATE", request, () -> {
-			TimiException.required(request, "not found category");
-			TimiException.required(request.getId(), "not found category.id");
-			GaoProductCategory category = get(request.getId());
-			TimiException.required(category, "not found category");
-			storeScopeService.checkStoreId(category.getStoreId());
-			category.setName(request.getName());
-			category.setSort(request.getSort());
-			category.setStatus(request.getStatus());
-			prepare(category, category.getId());
-			super.update(category);
-			return category;
-		});
+		TimiException.required(request, "not found category");
+		TimiException.required(request.getId(), "not found category.id");
+		GaoProductCategory category = get(request.getId());
+		TimiException.required(category, "not found category");
+		storeScopeService.checkStoreId(category.getStoreId());
+		category.setName(request.getName());
+		category.setSort(request.getSort());
+		category.setStatus(request.getStatus());
+		prepare(category, category.getId());
+		super.update(category);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_CATEGORY_DISABLE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void disable(String id) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_CATEGORY_DISABLE", id, () -> {
-			GaoProductCategory category = get(id);
-			TimiException.required(category, "not found category");
-			storeScopeService.checkStoreId(category.getStoreId());
-			category.setStatus(GaoProductCategory.Status.INACTIVE);
-			category.setUpdatedAt(Time.now());
-			category.setSort(TimiJava.defaultIfNull(category.getSort(), 0));
-			super.update(category);
-			return category;
-		});
+		GaoProductCategory category = get(id);
+		TimiException.required(category, "not found category");
+		storeScopeService.checkStoreId(category.getStoreId());
+		category.setStatus(GaoProductCategory.Status.INACTIVE);
+		category.setUpdatedAt(Time.now());
+		category.setSort(TimiJava.defaultIfNull(category.getSort(), 0));
+		super.update(category);
 	}
 
 	@Override

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

@@ -14,9 +14,10 @@ import com.imyeyu.api.modules.gao.service.GaoProductService;
 import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
 import com.imyeyu.api.modules.gao.service.GaoProductSpecService;
 import com.imyeyu.api.modules.gao.vo.GaoProductPage;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.api.util.PinyinUtil;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -52,7 +53,6 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 	private final ObjectProvider<GaoProductSkuService> skuServiceProvider;
 	private final ObjectProvider<GaoProductSpecService> specServiceProvider;
 	private final UserLoginService userLoginService;
-	private final LoggerService loggerService;
 
 	@Override
 	protected BaseMapper<GaoProduct, String> mapper() {
@@ -100,62 +100,56 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		return list.stream().filter(product -> !product.getSkuList().isEmpty()).toList();
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_CREATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(GaoProduct product) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_CREATE", product, () -> {
-			prepare(product, null);
-			super.create(product);
-			Map<String, String> specValueIdMap = saveSpecs(product, product.getSpecList());
-			normalizeSkuSpecValueIds(product.getSkuList(), specValueIdMap);
-			saveSkus(product, product.getSkuList());
-			attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), product.getAttachmentList());
-			return product;
-		});
+		prepare(product, null);
+		super.create(product);
+		Map<String, String> specValueIdMap = saveSpecs(product, product.getSpecList());
+		normalizeSkuSpecValueIds(product.getSkuList(), specValueIdMap);
+		saveSkus(product, product.getSkuList());
+		attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), product.getAttachmentList());
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_UPDATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void update(GaoProduct request) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_UPDATE", request, () -> {
-			TimiException.required(request, "not found product");
-			TimiException.required(request.getId(), "not found product.id");
-			GaoProduct product = get(request.getId());
-			TimiException.required(product, "not found product");
-			product.setCategoryId(request.getCategoryId());
-			product.setCode(TimiJava.defaultIfNull(request.getCode(), product.getCode()));
-			product.setName(TimiJava.defaultIfNull(request.getName(), product.getName()));
-			product.setProductType(TimiJava.defaultIfNull(request.getProductType(), product.getProductType()));
-			product.setStockEnabled(TimiJava.defaultIfNull(request.getStockEnabled(), product.getStockEnabled()));
-			product.setStatus(TimiJava.defaultIfNull(request.getStatus(), product.getStatus()));
-			product.setSort(TimiJava.defaultIfNull(request.getSort(), product.getSort()));
-			product.setRemark(request.getRemark());
-			product.setSkuList(request.getSkuList() == null ? skuServiceProvider.getObject().listByProductId(product.getId()) : request.getSkuList());
-			prepare(product, product.getId());
-			super.update(product);
-			if (request.getSkuList() != null) {
-				saveSkus(product, request.getSkuList());
-			}
-			if (request.getAttachmentList() != null) {
-				attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), request.getAttachmentList());
-			}
-			return product;
-		});
+		TimiException.required(request, "not found product");
+		TimiException.required(request.getId(), "not found product.id");
+		GaoProduct product = get(request.getId());
+		TimiException.required(product, "not found product");
+		product.setCategoryId(request.getCategoryId());
+		product.setCode(TimiJava.defaultIfNull(request.getCode(), product.getCode()));
+		product.setName(TimiJava.defaultIfNull(request.getName(), product.getName()));
+		product.setProductType(TimiJava.defaultIfNull(request.getProductType(), product.getProductType()));
+		product.setStockEnabled(TimiJava.defaultIfNull(request.getStockEnabled(), product.getStockEnabled()));
+		product.setStatus(TimiJava.defaultIfNull(request.getStatus(), product.getStatus()));
+		product.setSort(TimiJava.defaultIfNull(request.getSort(), product.getSort()));
+		product.setRemark(request.getRemark());
+		product.setSkuList(request.getSkuList() == null ? skuServiceProvider.getObject().listByProductId(product.getId()) : request.getSkuList());
+		prepare(product, product.getId());
+		super.update(product);
+		if (request.getSkuList() != null) {
+			saveSkus(product, request.getSkuList());
+		}
+		if (request.getAttachmentList() != null) {
+			attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), request.getAttachmentList());
+		}
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_DISABLE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void disable(String id) {
-		loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_DISABLE", id, () -> {
-			GaoProduct product = get(id);
-			TimiException.required(product, "not found product");
-			TimiException.requiredTrue(skuServiceProvider.getObject().listByProductId(id).stream().noneMatch(sku -> sku.getStatus() == com.imyeyu.api.modules.gao.entity.GaoProductSku.Status.ACTIVE), "请先停用产品的全部 SKU");
-			product.setStatus(GaoProduct.Status.INACTIVE);
-			product.setUpdatedBy(userLoginService.getRequireLoginUserId());
-			product.setUpdatedAt(Time.now());
-			super.update(product);
-			return product;
-		});
+		GaoProduct product = get(id);
+		TimiException.required(product, "not found product");
+		TimiException.requiredTrue(skuServiceProvider.getObject().listByProductId(id).stream().noneMatch(sku -> sku.getStatus() == com.imyeyu.api.modules.gao.entity.GaoProductSku.Status.ACTIVE), "请先停用产品的全部 SKU");
+		product.setStatus(GaoProduct.Status.INACTIVE);
+		product.setUpdatedBy(userLoginService.getRequireLoginUserId());
+		product.setUpdatedAt(Time.now());
+		super.update(product);
 	}
 
 	@Override
@@ -173,6 +167,7 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		TimiException.required(product.getStoreId(), "not found product.storeId");
 		product.setCode(requiredText(product.getCode(), "产品编码不能为空"));
 		product.setName(requiredText(product.getName(), "产品名称不能为空"));
+		fillPinyin(product);
 		product.setProductType(TimiJava.defaultIfNull(product.getProductType(), GaoProduct.ProductType.GOODS));
 		product.setStockEnabled(TimiJava.defaultIfNull(product.getStockEnabled(), product.getProductType() != GaoProduct.ProductType.SERVICE));
 		TimiException.requiredTrue(product.getProductType() != GaoProduct.ProductType.SERVICE || !product.getStockEnabled(), "SERVICE 产品不能启用库存");
@@ -268,4 +263,14 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		TimiException.requiredTrue(!result.isEmpty(), message);
 		return result;
 	}
+
+	/// 填充产品名称拼音搜索字段
+	///
+	/// @param product 产品
+	private void fillPinyin(GaoProduct product) {
+		String name = product.getName();
+		product.setNamePinyinFull(PinyinUtil.full(name));
+		product.setNamePinyinInitial(PinyinUtil.initial(name));
+		product.setNamePinyinMixed(PinyinUtil.mixed(name));
+	}
 }

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

@@ -76,6 +76,16 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 		return sku;
 	}
 
+	@Override
+	public List<GaoProductSku> listByIdList(Collection<String> idList) {
+		if (idList == null || idList.isEmpty()) {
+			return List.of();
+		}
+		List<GaoProductSku> result = mapper.selectByIdList(idList);
+		fillTransient(result);
+		return result;
+	}
+
 	@Override
 	public List<GaoProductSku> listByProductId(String productId) {
 		TimiException.required(productId, "not found productId");
@@ -99,6 +109,22 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 		return getSkuUnit(storeId, skuId, skuUnitId, false);
 	}
 
+	@Override
+	public GaoProductSkuUnitSelection getFulfillableSkuUnit(String storeId, String skuId, String skuUnitId) {
+		TimiException.required(storeId, "门店 ID 不能为空");
+		TimiException.required(skuId, "SKU ID 不能为空");
+		TimiException.required(skuUnitId, "SKU 单位 ID 不能为空");
+		GaoProductSku sku = mapper.selectForUpdate(skuId);
+		TimiException.required(sku, "SKU 不存在");
+		TimiException.requiredTrue(storeId.equals(sku.getStoreId()), "SKU 不属于当前门店");
+		GaoProduct product = productServiceProvider.getObject().get(sku.getProductId());
+		TimiException.required(product, "产品不存在");
+		GaoProductSkuUnit unit = unitMapper.selectForUpdate(skuUnitId);
+		TimiException.required(unit, "SKU 单位不存在");
+		TimiException.requiredTrue(skuId.equals(unit.getSkuId()), "SKU 单位不属于当前 SKU");
+		return new GaoProductSkuUnitSelection(product, sku, unit);
+	}
+
 	@Override
 	public GaoProductSkuUnitSelection getSkuUnit(String storeId, String skuId, String skuUnitId, boolean purchase) {
 		TimiException.required(storeId, "not found storeId");
@@ -344,11 +370,8 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 				TimiException.requiredTrue(1 == unitMapper.updateUnit(unit), "SKU 单位更新失败");
 			}
 		}
-		for (GaoProductSkuUnit existing : existingUnitList) {
-			if (!retainedIdSet.contains(existing.getId())) {
-				unitMapper.delete(existing.getId());
-			}
-		}
+		TimiException.requiredTrue(existingUnitList.stream().allMatch(existing -> retainedIdSet.contains(existing.getId())),
+			"已保存的 SKU 单位不能删除，请关闭允许销售和允许采购");
 	}
 
 	private void saveSpecValues(String skuId, List<String> specValueIdList) {

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

@@ -4,24 +4,24 @@ 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.entity.GaoProduct;
-import com.imyeyu.api.modules.gao.entity.GaoProductStock;
 import com.imyeyu.api.modules.gao.entity.GaoProductSku;
 import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
+import com.imyeyu.api.modules.gao.entity.GaoProductStock;
 import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
 import com.imyeyu.api.modules.gao.mapper.GaoProductStockMapper;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
-import com.imyeyu.api.modules.gao.service.GaoProductStockService;
 import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
 import com.imyeyu.api.modules.gao.service.GaoProductStockRecordService;
+import com.imyeyu.api.modules.gao.service.GaoProductStockService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockChangeRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockManualRevokeRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockPage;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockProductView;
-import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
 import com.imyeyu.api.modules.gao.vo.GaoStockChangeItem;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+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;
@@ -59,7 +59,6 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 	private final GaoProductSkuService skuService;
 	private final GaoStoreScopeService storeScopeService;
 	private final UserLoginService userLoginService;
-	private final LoggerService loggerService;
 
 	@Override
 	public PageResult<GaoProductStock> pageByQuery(GaoProductStockPage page) {
@@ -112,58 +111,75 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		return stock;
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_INITIAL_IN)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoProductStock initialIn(GaoProductStockChangeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_STOCK_INITIAL_IN", request, () -> change(request, GaoProductStockRecord.OperationType.INITIAL_IN));
+		return change(request, GaoProductStockRecord.OperationType.INITIAL_IN);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_MANUAL_IN)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoProductStock manualIn(GaoProductStockChangeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_STOCK_MANUAL_IN", request, () -> change(request, GaoProductStockRecord.OperationType.MANUAL_IN));
+		return change(request, GaoProductStockRecord.OperationType.MANUAL_IN);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_MANUAL_OUT)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoProductStock manualOut(GaoProductStockChangeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_STOCK_MANUAL_OUT", request, () -> change(request, GaoProductStockRecord.OperationType.MANUAL_OUT));
+		return change(request, GaoProductStockRecord.OperationType.MANUAL_OUT);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_MANUAL_REVOKE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoProductStock manualRevoke(GaoProductStockManualRevokeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_STOCK_MANUAL_REVOKE", request, () -> manualRevokeInternal(request));
+		return manualRevokeInternal(request);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_STOCKTAKE_GAIN)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoProductStock stocktakeGain(GaoProductStockChangeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_STOCK_STOCKTAKE_GAIN", request, () -> change(request, GaoProductStockRecord.OperationType.STOCKTAKE_GAIN));
+		return change(request, GaoProductStockRecord.OperationType.STOCKTAKE_GAIN);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_STOCKTAKE_LOSS)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoProductStock stocktakeLoss(GaoProductStockChangeRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_PRODUCT_STOCK_STOCKTAKE_LOSS", request, () -> change(request, GaoProductStockRecord.OperationType.STOCKTAKE_LOSS));
+		return change(request, GaoProductStockRecord.OperationType.STOCKTAKE_LOSS);
 	}
 
 	@Override
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	public boolean hasSufficientForFulfillment(String storeId, List<GaoStockChangeItem> items) {
+		return getFulfillmentStockShortageMessage(storeId, items) == null;
+	}
+
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public String getFulfillmentStockShortageMessage(String storeId, List<GaoStockChangeItem> items) {
 		TimiException.required(storeId, "not found storeId");
 		if (items == null || items.isEmpty()) {
-			return true;
+			return null;
 		}
 		List<GaoStockChangeItem> sortedItems = new ArrayList<>(items);
 		sortedItems.sort(Comparator.comparing(GaoStockChangeItem::getSkuId));
+		List<String> shortageList = new ArrayList<>();
 		for (GaoStockChangeItem item : sortedItems) {
 			GaoProductStock stock = stockMapper.selectForUpdate(storeId, item.getSkuId());
-			if (stock == null || decimal(stock.getOnHandQuantity()).subtract(decimal(stock.getReservedQuantity())).compareTo(item.getBaseQuantity()) < 0) {
-				return false;
+			BigDecimal availableQuantity = stock == null ? ZERO : decimal(stock.getOnHandQuantity()).subtract(decimal(stock.getReservedQuantity()));
+			BigDecimal shortageQuantity = item.getBaseQuantity().subtract(availableQuantity);
+			if (0 < shortageQuantity.signum()) {
+				shortageList.add("%s（%s）可用 %s %s，缺少 %s %s".formatted(
+					item.getProductNameSnapshot(), item.getSkuNameSnapshot(), availableQuantity.toPlainString(), item.getUnitSnapshot(),
+					shortageQuantity.toPlainString(), item.getUnitSnapshot()));
 			}
 		}
-		return true;
+		return shortageList.isEmpty() ? null : "库存不足：" + String.join("；", shortageList);
 	}
 
 	@Override
@@ -216,7 +232,7 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		GaoStockChangeItem item = GaoStockChangeItem.of(product, sku, unit, quantity, baseQuantity);
 		item.setSkuSpecSnapshot(skuService.getSkuSpecSnapshot(sku));
 		List<GaoProductStock> result = executeInternal(storeId, sku.getId(), List.of(item), requestNo,
-			userLoginService.getRequireLoginUserId(), operationType, request.getRemark(), request.getAttachmentList());
+			userLoginService.getRequireLoginUserId(), operationType, request.getOccurredAt(), request.getRemark(), request.getAttachmentList());
 		return result.getFirst();
 	}
 
@@ -295,11 +311,11 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 
 	private List<GaoProductStock> executeInternal(String storeId, String bizId, List<GaoStockChangeItem> sourceList, String requestNo,
 		String operatorUserId, GaoProductStockRecord.OperationType operationType, String remark) {
-		return executeInternal(storeId, bizId, sourceList, requestNo, operatorUserId, operationType, remark, null);
+		return executeInternal(storeId, bizId, sourceList, requestNo, operatorUserId, operationType, null, remark, null);
 	}
 
 	private List<GaoProductStock> executeInternal(String storeId, String bizId, List<GaoStockChangeItem> sourceList, String requestNo,
-		String operatorUserId, GaoProductStockRecord.OperationType operationType, String remark, List<Attachment> attachmentList) {
+		String operatorUserId, GaoProductStockRecord.OperationType operationType, Long occurredAt, String remark, List<Attachment> attachmentList) {
 		TimiException.required(storeId, "not found storeId");
 		TimiException.required(bizId, "not found stock bizId");
 		TimiException.requiredTrue(sourceList != null && !sourceList.isEmpty(), "库存变更至少需要一个产品");
@@ -360,7 +376,7 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 			record.setSourceRecordId(item.getSourceRecordId());
 			record.setRequestNo(normalizedRequestNo);
 			record.setOperatorUserId(operatorUserId);
-			record.setOccurredAt(Time.now());
+			record.setOccurredAt(TimiJava.defaultIfNull(occurredAt, Time.now()));
 			record.setRemark(remark);
 			recordService.createOperationRecord(record, attachmentList);
 			stock.setOnHandQuantity(onHandAfter);

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

@@ -21,6 +21,7 @@ import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.service.GaoFundRecordService;
 import com.imyeyu.api.modules.gao.service.GaoOrderFulfillmentService;
+import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
 import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
 import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
@@ -34,8 +35,8 @@ import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderItemRequest;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
-import com.imyeyu.api.modules.system.entity.Logger;
-import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.system.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.PermissionChecker;
 import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.api.modules.user.service.UserLoginService;
@@ -80,6 +81,7 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 	private final GaoSalesOrderItemMapper itemMapper;
 	private final GaoFundRecordService fundRecordService;
 	private final ObjectProvider<GaoOrderFulfillmentService> fulfillmentServiceProvider;
+	private final ObjectProvider<GaoOrderStraightThroughService> straightThroughServiceProvider;
 	private final GaoCustomerService customerService;
 	private final GaoProductService productService;
 	private final GaoProductSkuService skuService;
@@ -91,7 +93,6 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 	private final PermissionChecker permissionChecker;
 	private final RoleChecker roleChecker;
 	private final UserLoginService userLoginService;
-	private final LoggerService loggerService;
 
 	@Override
 	protected BaseMapper<GaoSalesOrder, String> mapper() {
@@ -116,6 +117,7 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		TimiException.required(order, "not found sales order");
 		storeScopeService.checkStoreId(order.getStoreId());
 		List<GaoSalesOrderItem> itemList = itemMapper.selectBySalesOrderId(order.getId());
+		fillItemDisplayInfo(itemList);
 		for (GaoSalesOrderItem item : itemList) {
 			fillItemBalance(item);
 		}
@@ -139,23 +141,25 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		return order;
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_DIRECT_PRODUCT_CREATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoSalesOrder createDirectProductOrder(GaoDirectProductOrderCreateRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_DIRECT_PRODUCT_CREATE", request, () -> createDirectInternal(request));
+		GaoSalesOrder order = createDirectInternal(request);
+		straightThroughServiceProvider.getObject().complete(order, request.getStraightThrough());
+		return detail(order.getId());
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_UPDATE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoSalesOrder updateRemarkAndAttachments(GaoSalesOrderUpdateRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_UPDATE", request, () -> {
-			TimiException.required(request, "not found sales order update request");
-			TimiException.required(request.getId(), "not found sales order.id");
-			GaoSalesOrder order = getForUpdate(request.getId());
-			TimiException.requiredTrue(1 == mapper.updateRemark(order.getId(), request.getRemark()), "订单备注更新失败");
-			attachmentService.updateByBizId(Attachment.BizType.GAO_SALES_ORDER, order.getId(), request.getAttachmentList());
-			return detail(order.getId());
-		});
+		TimiException.required(request, "not found sales order update request");
+		TimiException.required(request.getId(), "not found sales order.id");
+		GaoSalesOrder order = getForUpdate(request.getId());
+		TimiException.requiredTrue(1 == mapper.updateRemark(order.getId(), request.getRemark()), "订单备注更新失败");
+		attachmentService.updateByBizId(Attachment.BizType.GAO_SALES_ORDER, order.getId(), request.getAttachmentList());
+		return detail(order.getId());
 	}
 
 	private GaoSalesOrder createDirectInternal(GaoDirectProductOrderCreateRequest request) {
@@ -222,10 +226,11 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 			data.getSaleAmount(), data.getItemList());
 	}
 
+	@OperationAudit(AuditOperation.GAO_SALES_ORDER_CANCEL)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoSalesOrder cancel(GaoSalesOrderCancelRequest request) {
-		return loggerService.execute(Logger.Module.GAO, "GAO_SALES_ORDER_CANCEL", request, () -> cancelInternal(request));
+		return cancelInternal(request);
 	}
 
 	private GaoSalesOrder cancelInternal(GaoSalesOrderCancelRequest request) {
@@ -452,9 +457,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");
@@ -510,11 +517,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 对应订单内容不一致");
@@ -562,6 +572,37 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		item.setRemainingBaseQuantity(baseQuantity.subtract(fulfilledBaseQuantity));
 	}
 
+	/// 填充订单项数量展示所需的 SKU 信息
+	///
+	/// @param itemList 订单项列表
+	private void fillItemDisplayInfo(List<GaoSalesOrderItem> itemList) {
+		if (itemList == null || itemList.isEmpty()) {
+			return;
+		}
+		List<String> skuIdList = itemList.stream()
+			.map(GaoSalesOrderItem::getSkuId)
+			.filter(value -> value != null && !value.isBlank())
+			.distinct()
+			.toList();
+		if (skuIdList.isEmpty()) {
+			return;
+		}
+		Map<String, GaoProductSku> skuMap = skuService.listByIdList(skuIdList).stream()
+			.collect(java.util.stream.Collectors.toMap(GaoProductSku::getId, java.util.function.Function.identity()));
+		for (GaoSalesOrderItem item : itemList) {
+			GaoProductSku sku = skuMap.get(item.getSkuId());
+			if (sku == null) {
+				continue;
+			}
+			item.setAllowDecimalQuantity(sku.getAllowDecimalQuantity());
+			item.setBaseUnitName(sku.getUnitList().stream()
+				.filter(unit -> Boolean.TRUE.equals(unit.getIsBase()))
+				.map(GaoProductSkuUnit::getName)
+				.findFirst()
+				.orElse(null));
+		}
+	}
+
 	private void fillItemAttachments(List<GaoSalesOrderItem> itemList) {
 		if (itemList == null || itemList.isEmpty()) {
 			return;

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

@@ -3,6 +3,7 @@ package com.imyeyu.api.modules.gao.service.implement;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.service.GaoStoreChartService;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
@@ -43,6 +44,12 @@ public class GaoStoreChartServiceImplement implements GaoStoreChartService {
 		return customerService.stateGender(storeId);
 	}
 
+	@Override
+	public List<GaoCustomerAgeStatView> customerAge(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		return customerService.stateAge(storeId);
+	}
+
 	@Override
 	public List<GaoEventRecordDailyStatView> eventRecordDailyStat(GaoStoreChartReq req) {
 		checkRangeReq(req);

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

@@ -0,0 +1,18 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+///
+/// 客户年龄统计视图
+///
+/// @author Codex
+/// @since 2026-09-11
+@Data
+public class GaoCustomerAgeStatView {
+
+	/// 客户年龄
+	private Long age;
+
+	/// 该年龄的客户数量
+	private Long count;
+}

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

@@ -0,0 +1,20 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+///
+/// 客户每日统计中的客户摘要
+///
+/// @author Codex
+/// @since 2026-09-11
+@Data
+public class GaoCustomerDailyStateCustomerView {
+
+	/// 用于服务层按日期分组，不返回给前端
+	@JsonIgnore
+	private Integer dateValue;
+
+	/// 客户姓名
+	private String name;
+}

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

@@ -2,6 +2,8 @@ package com.imyeyu.api.modules.gao.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 ///
 /// 客户每日统计视图
 ///
@@ -18,4 +20,7 @@ public class GaoCustomerDailyStateView {
 
 	/// 截止当日客户总数
 	private Long totalCustomerCount;
+
+	/// 当日新增客户列表
+	private List<GaoCustomerDailyStateCustomerView> customerList;
 }

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

@@ -0,0 +1,19 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+/// 客户病症原始文本
+///
+/// 只用于后端分词，不对外返回。
+///
+/// @author Codex
+/// @since 2026-09-11
+@Data
+public class GaoCustomerDiseaseTextView {
+
+	/// 备注
+	private String remark;
+
+	/// 病症
+	private String disease;
+}

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

@@ -0,0 +1,17 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+/// 客户病症词频查询请求
+///
+/// @author Codex
+/// @since 2026-09-11
+@Data
+public class GaoCustomerDiseaseWordReq {
+
+	/// 门店 ID
+	private String storeId;
+
+	/// 返回词语数量
+	private Integer topN;
+}

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

@@ -0,0 +1,19 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/// 客户病症词频
+///
+/// @author Codex
+/// @since 2026-09-11
+@Data
+@AllArgsConstructor
+public class GaoCustomerDiseaseWordView {
+
+	/// 词语
+	private String word;
+
+	/// 词语出现次数
+	private Long value;
+}

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/GaoCustomerPackagePurchaseRequest.java

@@ -33,6 +33,9 @@ public class GaoCustomerPackagePurchaseRequest {
 	/// 购买照片
 	private List<Attachment> attachmentList;
 
+	/// 创建订单后的直通处理
+	private GaoOrderStraightThroughRequest straightThrough;
+
 	/// 备注
 	private String remark;
 }

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;
@@ -22,4 +23,10 @@ public class GaoCustomerPage extends BasePage {
 
 	/// 标签 ID 列表，客户必须同时拥有列表内全部标签
 	private List<String> tagIdList;
+
+	/// 录入时间起始，包含，Unix 毫秒时间戳
+	private Long beginCreatedAt;
+
+	/// 录入时间结束，包含，Unix 毫秒时间戳
+	private Long endCreatedAt;
 }

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

@@ -30,6 +30,9 @@ public class GaoDirectProductOrderCreateRequest {
 	/// 购买照片
 	private List<Attachment> attachmentList;
 
+	/// 创建订单后的直通处理
+	private GaoOrderStraightThroughRequest straightThrough;
+
 	/// 备注
 	private String remark;
 }

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

@@ -0,0 +1,44 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.api.modules.common.entity.Attachment;
+import lombok.Data;
+
+import java.util.List;
+
+/// GAO 订单创建直通请求
+///
+/// @author Codex
+/// @since 2026-09-13
+@Data
+public class GaoOrderStraightThroughRequest {
+
+	/// true 为已有收款并直接核销
+	private Boolean paymentVerified;
+
+	/// 已核销收款金额，单位分
+	private Long paymentAmount;
+
+	/// true 为直接全额收款并核销
+	private Boolean receiveFullPayment;
+
+	/// 实际收款时间，空为订单下单时间
+	private Long paymentOccurredAt;
+
+	/// 收款凭证照片
+	private List<Attachment> paymentAttachmentList;
+
+	/// 收款备注
+	private String paymentRemark;
+
+	/// true 为直接全部履约并核销
+	private Boolean fulfillAll;
+
+	/// 实际履约时间，空为订单下单时间
+	private Long deliveredAt;
+
+	/// 履约凭证照片
+	private List<Attachment> fulfillmentAttachmentList;
+
+	/// 履约备注
+	private String fulfillmentRemark;
+}

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

@@ -30,6 +30,6 @@ public class GaoProductPage extends BasePage {
 	/// 产品类型
 	private GaoProduct.ProductType productType;
 
-	/// 名称或编码关键词
+	/// 名称、拼音或编码关键词
 	private String keyword;
 }

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

@@ -28,6 +28,9 @@ public class GaoProductStockChangeRequest {
 	/// 业务数量
 	private BigDecimal quantity;
 
+	/// 库存发生时间，毫秒时间戳
+	private Long occurredAt;
+
 	/// 备注
 	private String remark;
 

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

@@ -18,6 +18,6 @@ public class GaoProductStockPage extends BasePage {
 	/// 产品 ID
 	private String productId;
 
-	/// 产品或 SKU 名称、编码、规格摘要关键词
+	/// 产品或 SKU 名称、拼音、编码、规格摘要关键词
 	private String keyword;
 }

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

@@ -19,7 +19,7 @@ public class GaoProductStockRecordPage extends BasePage {
 	/// 产品 ID
 	private String productId;
 
-	/// 产品名称或编码关键词
+	/// 产品名称、拼音或编码关键词
 	private String keyword;
 
 	/// 来源业务类型

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

@@ -0,0 +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 {
+
+	COMMON_NOTIFY_CREATE(Logger.Module.COMMON),
+	COMMON_NOTIFY_DELETE(Logger.Module.COMMON),
+	GAO_CUSTOMER_PACKAGE_PURCHASE(Logger.Module.GAO),
+	GAO_CUSTOMER_PACKAGE_CANCEL(Logger.Module.GAO),
+	GAO_SALES_ORDER_PAYMENT_RECEIVE(Logger.Module.GAO),
+	GAO_SALES_ORDER_PAYMENT_VERIFY(Logger.Module.GAO),
+	GAO_SALES_ORDER_REFUND(Logger.Module.GAO),
+	GAO_SALES_ORDER_CONFIRM_NO_REFUND(Logger.Module.GAO),
+	GAO_SALES_ORDER_FUND_REVOKE(Logger.Module.GAO),
+	GAO_ORDER_FULFILLMENT_CREATE(Logger.Module.GAO),
+	GAO_ORDER_FULFILLMENT_PREPARE_STOCK(Logger.Module.GAO),
+	GAO_ORDER_FULFILLMENT_VERIFY(Logger.Module.GAO),
+	GAO_ORDER_FULFILLMENT_REJECT(Logger.Module.GAO),
+	GAO_ORDER_FULFILLMENT_CANCEL(Logger.Module.GAO),
+	GAO_ORDER_FULFILLMENT_REVOKE(Logger.Module.GAO),
+	GAO_PACKAGE_CONFIG_CREATE(Logger.Module.GAO),
+	GAO_PACKAGE_CONFIG_UPDATE(Logger.Module.GAO),
+	GAO_PACKAGE_CONFIG_DELETE(Logger.Module.GAO),
+	GAO_PRODUCT_CATEGORY_SORT(Logger.Module.GAO),
+	GAO_PRODUCT_CATEGORY_CREATE(Logger.Module.GAO),
+	GAO_PRODUCT_CATEGORY_UPDATE(Logger.Module.GAO),
+	GAO_PRODUCT_CATEGORY_DISABLE(Logger.Module.GAO),
+	GAO_PRODUCT_CREATE(Logger.Module.GAO),
+	GAO_PRODUCT_UPDATE(Logger.Module.GAO),
+	GAO_PRODUCT_DISABLE(Logger.Module.GAO),
+	GAO_PRODUCT_STOCK_INITIAL_IN(Logger.Module.GAO),
+	GAO_PRODUCT_STOCK_MANUAL_IN(Logger.Module.GAO),
+	GAO_PRODUCT_STOCK_MANUAL_OUT(Logger.Module.GAO),
+	GAO_PRODUCT_STOCK_MANUAL_REVOKE(Logger.Module.GAO),
+	GAO_PRODUCT_STOCK_STOCKTAKE_GAIN(Logger.Module.GAO),
+	GAO_PRODUCT_STOCK_STOCKTAKE_LOSS(Logger.Module.GAO),
+	GAO_SALES_ORDER_DIRECT_PRODUCT_CREATE(Logger.Module.GAO),
+	GAO_SALES_ORDER_UPDATE(Logger.Module.GAO),
+	GAO_SALES_ORDER_CANCEL(Logger.Module.GAO);
+
+	final Logger.Module module;
+}

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

@@ -0,0 +1,128 @@
+package com.imyeyu.api.modules.system.audit;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.imyeyu.spring.entity.IDEntity;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Array;
+import java.util.Locale;
+import java.util.Set;
+
+/// 操作审计参数和结果序列化器
+///
+/// @author Codex
+/// @since 2026-09-09
+@Component
+@RequiredArgsConstructor
+public class AuditPayloadSerializer {
+
+	private static final int MAX_LENGTH = 32 * 1024;
+
+	private static final Set<String> SECRET_FIELD_SET = Set.of(
+		"password",
+		"passwordconfirm",
+		"token",
+		"accesstoken",
+		"refreshtoken",
+		"secret",
+		"credential",
+		"authorization"
+	);
+
+	private final ObjectMapper objectMapper;
+
+	/// 序列化方法参数
+	///
+	/// @param arguments 方法参数
+	/// @return 脱敏后的参数 JSON
+	public String serializeArguments(Object[] arguments) {
+		if (arguments == null || 0 == arguments.length) {
+			return null;
+		}
+		return serialize(arguments.length == 1 ? arguments[0] : arguments);
+	}
+
+	/// 序列化业务结果
+	///
+	/// @param result 方法返回值
+	/// @param arguments 方法参数
+	/// @return 结果摘要
+	public String serializeResult(Object result, Object[] arguments) {
+		if (result instanceof IDEntity<?> entity && entity.getId() != null) {
+			return truncate(String.valueOf(entity.getId()));
+		}
+		if (result != null) {
+			return summarize(result);
+		}
+		if (arguments != null) {
+			for (Object argument : arguments) {
+				if (argument instanceof IDEntity<?> entity && entity.getId() != null) {
+					return truncate(String.valueOf(entity.getId()));
+				}
+			}
+			if (1 == arguments.length && arguments[0] instanceof CharSequence value) {
+				return truncate(value.toString());
+			}
+		}
+		return null;
+	}
+
+	private String serialize(Object value) {
+		try {
+			JsonNode node = objectMapper.valueToTree(value);
+			mask(node);
+			return truncate(objectMapper.writeValueAsString(node));
+		} catch (Exception e) {
+			return value == null ? null : truncate(value.getClass().getName());
+		}
+	}
+
+	private void mask(JsonNode node) {
+		if (node == null) {
+			return;
+		}
+		if (node.isObject()) {
+			ObjectNode objectNode = (ObjectNode) node;
+			objectNode.fieldNames().forEachRemaining(fieldName -> {
+				JsonNode field = objectNode.get(fieldName);
+				if (SECRET_FIELD_SET.contains(fieldName.toLowerCase(Locale.ROOT))) {
+					objectNode.put(fieldName, "***");
+				} else {
+					mask(field);
+				}
+			});
+		} else if (node.isArray()) {
+			node.forEach(this::mask);
+		}
+	}
+
+	private String summarize(Object value) {
+		if (value instanceof CharSequence || value instanceof Number || value instanceof Boolean || value instanceof Enum<?>) {
+			return truncate(String.valueOf(value));
+		}
+		if (value instanceof Iterable<?> iterable) {
+			int size = 0;
+			for (Object ignored : iterable) {
+				size++;
+			}
+			return "%s[%s]".formatted(value.getClass().getSimpleName(), size);
+		}
+		if (value instanceof java.util.Map<?, ?> map) {
+			return "%s[%s]".formatted(value.getClass().getSimpleName(), map.size());
+		}
+		if (value.getClass().isArray()) {
+			return "%s[%s]".formatted(value.getClass().getComponentType().getSimpleName(), Array.getLength(value));
+		}
+		return value.getClass().getSimpleName();
+	}
+
+	private String truncate(String value) {
+		if (value == null || value.length() <= MAX_LENGTH) {
+			return value;
+		}
+		return value.substring(0, MAX_LENGTH) + "...";
+	}
+}

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

@@ -0,0 +1,17 @@
+package com.imyeyu.api.modules.system.audit;
+
+import com.imyeyu.api.modules.system.entity.Logger;
+
+/// 操作审计记录器
+///
+/// 业务切面只依赖该写入端口，不直接依赖日志查询服务
+///
+/// @author Codex
+/// @since 2026-09-09
+public interface AuditRecorder {
+
+	/// 记录操作审计
+	///
+	/// @param logger 审计记录
+	void record(Logger logger);
+}

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

@@ -0,0 +1,22 @@
+package com.imyeyu.api.modules.system.audit;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/// 标记需要记录操作审计的应用服务方法
+///
+/// 只应标记对外的业务操作入口，不要标记被入口调用的内部方法
+///
+/// @author Codex
+/// @since 2026-09-09
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OperationAudit {
+
+	/// 操作编码
+	///
+	/// @return 操作编码
+	AuditOperation value();
+}

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

@@ -0,0 +1,83 @@
+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;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/// 操作审计切面
+///
+/// 该切面放在事务拦截器外层，确保成功日志只在事务提交成功后生成
+///
+/// @author Codex
+/// @since 2026-09-09
+@Aspect
+@Component
+@Order(Ordered.LOWEST_PRECEDENCE - 100)
+@RequiredArgsConstructor
+@Slf4j
+public class OperationAuditAspect {
+
+	private final AuditRecorder auditRecorder;
+
+	private final AuditPayloadSerializer payloadSerializer;
+
+	/// 执行并记录操作审计
+	///
+	/// @param joinPoint      连接点
+	/// @param operationAudit 审计配置
+	/// @return 业务返回值
+	/// @throws Throwable 业务异常
+	@Around("@annotation(operationAudit)")
+	public Object around(ProceedingJoinPoint joinPoint, OperationAudit operationAudit) throws Throwable {
+		AuditOperation operation = operationAudit.value();
+		Object[] arguments = joinPoint.getArgs();
+		Logger logger = new Logger(operation.getModule(), operation.name());
+		logger.setContent(payloadSerializer.serializeArguments(arguments));
+		long startNanos = System.nanoTime();
+		try {
+			Object result = joinPoint.proceed();
+			logger.setLevel(Logger.Level.INFO);
+			logger.setResult(payloadSerializer.serializeResult(result, arguments));
+			logger.setDuration(duration(startNanos));
+			record(logger);
+			return result;
+		} catch (TimiException e) {
+			logger.setLevel(Logger.Level.WARN);
+			logger.setException(e.getMessage());
+			logger.setDuration(duration(startNanos));
+			record(logger);
+			throw e;
+		} catch (Throwable e) {
+			logger.setLevel(Logger.Level.ERROR);
+			logger.setException(TimiJava.serializeThrowable(e));
+			logger.setDuration(duration(startNanos));
+			log.error("业务操作失败: {}", operation.name(), e);
+			record(logger);
+			throw e;
+		}
+	}
+
+	private void record(Logger logger) {
+		try {
+			auditRecorder.record(logger);
+		} catch (Exception e) {
+			log.error("记录操作审计失败: {}", logger.getOperation(), e);
+		}
+	}
+
+	private int duration(long startNanos) {
+		long millis = (System.nanoTime() - startNanos) / 1_000_000L;
+		if (Integer.MAX_VALUE < millis) {
+			return Integer.MAX_VALUE;
+		}
+		return (int) Math.max(0L, millis);
+	}
+}

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

@@ -1,19 +0,0 @@
-package com.imyeyu.api.modules.system.controller;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- *
- *
- * @author 夜雨
- * @since 2026-04-23 16:31
- */
-@Slf4j
-@RequiredArgsConstructor
-@RequestMapping("/system/setting")
-public class SettingController {
-
-
-}

src/main/java/com/imyeyu/api/modules/system/service/LoggerService.java

@@ -6,8 +6,6 @@ import com.imyeyu.spring.service.DestroyableService;
 import com.imyeyu.spring.service.GettableService;
 import com.imyeyu.spring.service.PageableService;
 
-import java.util.function.Supplier;
-
 /**
  * 日志服务
  *
@@ -18,51 +16,6 @@ public interface LoggerService extends GettableService<Logger, String>, Pageable
 
 	void createSync(Logger logger);
 
-	/// 执行并记录有返回值的业务操作
-	///
-	/// @param logger 日志对象，调用方负责设置模块、操作和请求内容
-	/// @param action 业务操作
-	/// @param <T> 返回值类型
-	/// @return 业务操作返回值
-	<T> T execute(Logger logger, Supplier<T> action);
-
-	/// 执行并记录无返回值的业务操作
-	///
-	/// @param logger 日志对象，调用方负责设置模块、操作和请求内容
-	/// @param action 业务操作
-	default void execute(Logger logger, Runnable action) {
-		execute(logger, () -> {
-			action.run();
-			return null;
-		});
-	}
-
-	/// 创建日志并执行有返回值的业务操作
-	///
-	/// @param module 日志模块
-	/// @param operation 操作描述
-	/// @param content 请求内容
-	/// @param action 业务操作
-	/// @param <T> 返回值类型
-	/// @return 业务操作返回值
-	default <T> T execute(Logger.Module module, String operation, Object content, Supplier<T> action) {
-		Logger logger = new Logger(module, operation);
-		logger.setContent(content == null ? null : content.toString());
-		return execute(logger, action);
-	}
-
-	/// 创建日志并执行无返回值的业务操作
-	///
-	/// @param module 日志模块
-	/// @param operation 操作描述
-	/// @param content 请求内容
-	/// @param action 业务操作
-	default void execute(Logger.Module module, String operation, Object content, Runnable action) {
-		Logger logger = new Logger(module, operation);
-		logger.setContent(content == null ? null : content.toString());
-		execute(logger, action);
-	}
-
 	void create(Logger.Module module, Logger.Level level, String operation, String content, String result);
 
 	default void info(Logger.Module module, String operation) {

src/main/java/com/imyeyu/api/modules/system/service/implement/LoggerServiceImplement.java

@@ -1,37 +1,41 @@
 package com.imyeyu.api.modules.system.service.implement;
 
 import com.imyeyu.api.modules.system.entity.Logger;
+import com.imyeyu.api.modules.system.audit.AuditRecorder;
 import com.imyeyu.api.modules.system.mapper.LoggerMapper;
 import com.imyeyu.api.modules.system.service.LoggerService;
 import com.imyeyu.api.modules.user.entity.User;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.TimiSpring;
-import com.imyeyu.spring.entity.IDEntity;
 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.annotation.Qualifier;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
-import java.util.function.Supplier;
-
 /**
  * 日志服务实现
  *
  * @author 夜雨
  * @since 2026-05-13 14:46
  */
-@Slf4j
 @Service
-@RequiredArgsConstructor
-public class LoggerServiceImplement extends AbstractEntityService<Logger, String> implements LoggerService {
+public class LoggerServiceImplement extends AbstractEntityService<Logger, String> implements LoggerService, AuditRecorder {
 
 	private final UserLoginService userLoginService;
 
 	private final LoggerMapper mapper;
 
+	private final ThreadPoolTaskExecutor auditTaskExecutor;
+
+	public LoggerServiceImplement(UserLoginService userLoginService, LoggerMapper mapper,
+		@Qualifier("auditTaskExecutor") ThreadPoolTaskExecutor auditTaskExecutor) {
+		this.userLoginService = userLoginService;
+		this.mapper = mapper;
+		this.auditTaskExecutor = auditTaskExecutor;
+	}
+
 	@Override
 	protected BaseMapper<Logger, String> mapper() {
 		return mapper;
@@ -39,9 +43,13 @@ public class LoggerServiceImplement extends AbstractEntityService<Logger, String
 
 	@Override
 	public void create(Logger logger) {
-		// 默认异步
 		fillContext(logger);
-		Thread.startVirtualThread(() -> createSync(logger));
+		auditTaskExecutor.execute(() -> createSync(logger));
+	}
+
+	@Override
+	public void record(Logger logger) {
+		create(logger);
 	}
 
 	@Override
@@ -50,32 +58,6 @@ public class LoggerServiceImplement extends AbstractEntityService<Logger, String
 		super.create(logger);
 	}
 
-	@Override
-	public <T> T execute(Logger logger, Supplier<T> action) {
-		try {
-			T result = action.get();
-			logger.setLevel(Logger.Level.INFO);
-			if (result instanceof IDEntity<?> entity) {
-				logger.setResult(String.valueOf(entity.getId()));
-			} else if (result != null) {
-				logger.setResult(result.toString());
-			}
-			create(logger);
-			return result;
-		} catch (TimiException e) {
-			logger.setLevel(Logger.Level.WARN);
-			logger.setException(e.getMessage());
-			create(logger);
-			throw e;
-		} catch (RuntimeException e) {
-			logger.setLevel(Logger.Level.ERROR);
-			logger.setException(TimiJava.serializeThrowable(e));
-			log.error("业务操作失败: {}", logger.getOperation(), e);
-			create(logger);
-			throw e;
-		}
-	}
-
 	public void create(Logger.Module module, Logger.Level level, String operation, String content, String result) {
 		Logger log = new Logger(module, level, operation);
 		log.setContent(content);

src/main/java/db/migration/timiserver/V78__backfill_gao_product_pinyin_search.java

@@ -0,0 +1,55 @@
+package db.migration.timiserver;
+
+import com.imyeyu.api.util.PinyinUtil;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+/// 回填 GAO 产品名称拼音搜索字段
+///
+/// @author Codex
+/// @since 2026-09-10
+public class V78__backfill_gao_product_pinyin_search extends BaseJavaMigration {
+
+	private static final int BATCH_SIZE = 500;
+
+	@Override
+	public void migrate(Context context) throws Exception {
+		Connection connection = context.getConnection();
+		try (
+			PreparedStatement select = connection.prepareStatement("""
+				SELECT `id`, `name`
+				FROM `gao_product`
+				WHERE `name` IS NOT NULL
+					AND (`name_pinyin_full` IS NULL OR `name_pinyin_initial` IS NULL OR `name_pinyin_mixed` IS NULL)
+				""");
+			PreparedStatement update = connection.prepareStatement("""
+				UPDATE `gao_product`
+				SET `name_pinyin_full` = ?, `name_pinyin_initial` = ?, `name_pinyin_mixed` = ?
+				WHERE `id` = ?
+				""")) {
+			try (ResultSet resultSet = select.executeQuery()) {
+				int batchSize = 0;
+				while (resultSet.next()) {
+					String name = resultSet.getString("name");
+					update.setString(1, PinyinUtil.full(name));
+					update.setString(2, PinyinUtil.initial(name));
+					update.setString(3, PinyinUtil.mixed(name));
+					update.setString(4, resultSet.getString("id"));
+					update.addBatch();
+					batchSize++;
+					if (batchSize >= BATCH_SIZE) {
+						update.executeBatch();
+						batchSize = 0;
+					}
+				}
+				if (0 < batchSize) {
+					update.executeBatch();
+				}
+			}
+		}
+	}
+}

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/db/migration/timiserver/V77__add_gao_product_pinyin_search_columns.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `gao_product`
+	ADD COLUMN `name_pinyin_full` VARCHAR(768) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '产品名称全拼' AFTER `name`,
+	ADD COLUMN `name_pinyin_initial` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '产品名称拼音首字母' AFTER `name_pinyin_full`,
+	ADD COLUMN `name_pinyin_mixed` VARCHAR(768) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '产品名称混合拼音' AFTER `name_pinyin_initial`,
+	ADD KEY `idx_gao_product_store_name_pinyin_full` (`store_id`, `deleted_at`, `name_pinyin_full`(128)),
+	ADD KEY `idx_gao_product_store_name_pinyin_initial` (`store_id`, `deleted_at`, `name_pinyin_initial`),
+	ADD KEY `idx_gao_product_store_name_pinyin_mixed` (`store_id`, `deleted_at`, `name_pinyin_mixed`(128));

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 != ''">
@@ -50,6 +49,12 @@
 				HAVING COUNT(DISTINCT `ta`.`tag_id`) = #{tagCount}
 			)
 		</if>
+		<if test="beginCreatedAt != null">
+			AND `c`.`created_at` &gt;= #{beginCreatedAt}
+		</if>
+		<if test="endCreatedAt != null">
+			AND `c`.`created_at` &lt;= #{endCreatedAt}
+		</if>
 	</sql>
 
 	<select id="countByQuery" resultType="long">
@@ -64,7 +69,18 @@
 		FROM `gao_customer` `c`
 		WHERE
 			<include refid="queryWhere"/>
-		ORDER BY `c`.`created_at` DESC, `c`.`id` DESC
+		<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>
 
@@ -82,6 +98,19 @@
 		ORDER BY `dateValue` ASC
 	</select>
 
+	<select id="selectDailyNewCustomer" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateCustomerView">
+		SELECT
+			`name`,
+			CAST(DATE_FORMAT(FROM_UNIXTIME(`created_at` / 1000), '%Y%m%d') AS UNSIGNED) AS `dateValue`
+		FROM `gao_customer`
+		WHERE
+			`store_id` = #{storeId}
+			AND `created_at` &gt;= #{beginCreatedAt}
+			AND `created_at` &lt;= #{endCreatedAt}
+			AND `deleted_at` IS NULL
+		ORDER BY `dateValue` ASC, `created_at` ASC, `id` ASC
+	</select>
+
 	<select id="countCreatedBefore" resultType="java.lang.Long">
 		SELECT
 			COUNT(1)
@@ -102,4 +131,31 @@
 			AND `deleted_at` IS NULL
 		GROUP BY IFNULL(CAST(`gender` AS CHAR), 'UNKNOWN')
 	</select>
+
+	<select id="stateAge" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView">
+		SELECT
+			COALESCE(`age`, TIMESTAMPDIFF(YEAR, `birthdate`, CURDATE())) AS `age`,
+			COUNT(1) AS `count`
+		FROM `gao_customer`
+		WHERE
+			`store_id` = #{storeId}
+			AND `deleted_at` IS NULL
+			AND (`age` IS NOT NULL OR `birthdate` IS NOT NULL)
+		GROUP BY COALESCE(`age`, TIMESTAMPDIFF(YEAR, `birthdate`, CURDATE()))
+		ORDER BY COALESCE(`age`, TIMESTAMPDIFF(YEAR, `birthdate`, CURDATE())) ASC
+	</select>
+
+	<select id="selectDiseaseTextByStoreId" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseTextView">
+		SELECT
+			`remark`,
+			`disease`
+		FROM `gao_customer`
+		WHERE
+			`store_id` = #{storeId}
+			AND `deleted_at` IS NULL
+			AND (
+				(`remark` IS NOT NULL AND `remark` != '')
+				OR (`disease` IS NOT NULL AND `disease` != '')
+			)
+	</select>
 </mapper>

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

@@ -348,10 +348,23 @@
 					FROM `daily_stat` d
 					JOIN `open_calendar` o ON d.`registeredDateValue` = o.`dateValue`
 				),
+				`customer_stat` AS (
+					SELECT
+						d.`customerId`,
+						MAX(CASE WHEN d.`registeredDateValue` = #{todayDateValue} THEN 1 ELSE 0 END) AS `hasToday`
+					FROM `daily_stat` d
+					GROUP BY d.`customerId`
+				),
 				`anchor_date` AS (
 					SELECT
-						MAX(`openIndex`) AS `anchorOpenIndex`
-					FROM `open_calendar`
+						s.`customerId`,
+						CASE
+							WHEN s.`hasToday` = 1 THEN MAX(CASE WHEN c.`dateValue` = #{todayDateValue} THEN c.`openIndex` END)
+							ELSE MAX(CASE WHEN c.`dateValue` < #{todayDateValue} THEN c.`openIndex` END)
+						END AS `anchorOpenIndex`
+					FROM `customer_stat` s
+					CROSS JOIN `open_calendar` c
+					GROUP BY s.`customerId`, s.`hasToday`
 				),
 				`continuous_stat` AS (
 					SELECT
@@ -361,7 +374,7 @@
 							ELSE COUNT(1)
 						END AS `recentContinuousEventDays`
 					FROM `continuous_ordered` o
-					JOIN `anchor_date` a
+					JOIN `anchor_date` a ON o.`customerId` = a.`customerId`
 					WHERE
 						o.`openIndex` + o.`dayIndex` = a.`anchorOpenIndex` + 1
 						<if test="eventIdList == null or eventIdList.size() != 1">

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

@@ -53,7 +53,7 @@
 		INNER JOIN `gao_customer` `c` ON `c`.`id` = `a`.`customer_id` AND `c`.`store_id` = `a`.`store_id`
 		WHERE
 			<include refid="queryWhere"/>
-		ORDER BY `a`.`created_at` DESC, `a`.`id` DESC
+		ORDER BY `a`.`total_earned` DESC, `a`.`created_at` DESC, `a`.`id` DESC
 		LIMIT #{offset}, #{limit}
 	</select>
 

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

@@ -13,7 +13,7 @@
 			</choose>
 			<if test="status != null">AND `status` = #{status}</if>
 			<if test="productType != null">AND `product_type` = #{productType}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%') OR `name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 	</select>
 	<select id="selectByQuery" resultType="com.imyeyu.api.modules.gao.entity.GaoProduct">
 		SELECT * FROM `gao_product`
@@ -27,7 +27,7 @@
 			</choose>
 			<if test="status != null">AND `status` = #{status}</if>
 			<if test="productType != null">AND `product_type` = #{productType}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%') OR `name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 		ORDER BY `sort`, `name`, `code`, `created_at` DESC
 		LIMIT #{offset}, #{limit}
 	</select>

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

@@ -1,6 +1,11 @@
 <?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.GaoProductSkuMapper">
+	<select id="selectByIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSku">
+		SELECT * FROM `gao_product_sku` WHERE `deleted_at` IS NULL
+		<choose><when test="idList != null and !idList.isEmpty()">AND `id` IN <foreach collection="idList" item="id" open="(" separator="," close=")">#{id}</foreach></when><otherwise>AND FALSE</otherwise></choose>
+		ORDER BY `id`
+	</select>
 	<select id="selectByProductId" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSku">
 		SELECT * FROM `gao_product_sku` WHERE `product_id` = #{productId} AND `deleted_at` IS NULL ORDER BY `sort`, `created_at`
 	</select>

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

@@ -23,7 +23,7 @@
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
 			<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
 	</select>
 	<select id="selectByQuery" resultType="com.imyeyu.api.modules.gao.entity.GaoProductStock">
 		SELECT s.`id`,
@@ -45,7 +45,7 @@
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
 			<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
 		ORDER BY p.`sort`, p.`name`, p.`code`, k.`sort`, k.`name`, k.`code`
 		LIMIT #{offset}, #{limit}
 	</select>
@@ -57,7 +57,7 @@
 			AND p.`stock_enabled` = 1
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 	</select>
 	<select id="selectProductByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoProductStockProductView">
 		SELECT p.`id` AS `product_id`,
@@ -79,7 +79,7 @@
 			AND p.`stock_enabled` = 1
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 		GROUP BY p.`id`, p.`code`, p.`name`, p.`product_type`, p.`sort`
 		ORDER BY p.`sort`, p.`name`, p.`code`
 		LIMIT #{offset}, #{limit}

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

@@ -31,7 +31,7 @@
 		1 = 1
 		<if test="storeId != null and storeId != ''">AND r.`store_id` = #{storeId}</if>
 		<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
-		<if test="keyword != null and keyword.trim() != ''">AND (r.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
+		<if test="keyword != null and keyword.trim() != ''">AND (r.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR p.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
 		<if test="bizType != null">AND r.`biz_type` = #{bizType}</if>
 		<if test="bizId != null and bizId != ''">AND r.`biz_id` = #{bizId}</if>
 		<if test="operationType != null">AND r.`operation_type` = #{operationType}</if>