Merge pull request 'v1.0.58' (#70) from dev into master

Reviewed-on: #70

.gitignore

@@ -4,6 +4,7 @@
 /target
 /temp
 /AGENTS.md
+/.workbuddy
 
 multilingualField/
 !.mvn/wrapper/maven-wrapper.jar

.serena/project.yml

@@ -1,34 +1,6 @@
-# the name by which the project can be referenced within Serena
+# the name by which the project can be referenced within Serena/when chatting with the LLM.
 project_name: "TimiServerAPI"
 
-
-# list of languages for which language servers are started; choose from:
-#   al                  bash                clojure             cpp                 csharp
-#   csharp_omnisharp    dart                elixir              elm                 erlang
-#   fortran             fsharp              go                  groovy              haskell
-#   haxe                java                julia               kotlin              lua
-#   markdown
-#   matlab              nix                 pascal              perl                php
-#   php_phpactor        powershell          python              python_jedi         r
-#   rego                ruby                ruby_solargraph     rust                scala
-#   swift               terraform           toml                typescript          typescript_vts
-#   vue                 yaml                zig
-#   (This list may be outdated. For the current list, see values of Language enum here:
-#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
-#   For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
-# Note:
-#   - For C, use cpp
-#   - For JavaScript, use typescript
-#   - For Free Pascal/Lazarus, use pascal
-# Special requirements:
-#   Some languages require additional setup/installations.
-#   See here for details: https://oraios.github.io/serena/01-about/020_programming-languages.html#language-servers
-# When using multiple languages, the first language server that supports a given file will be used for that file.
-# The first language is the default language and the respective language server will be used as a fallback.
-# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
-languages:
-- java
-
 # the encoding used by text files in the project
 # For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
 encoding: "utf-8"
@@ -50,12 +22,19 @@ ignore_all_files_in_gitignore: true
 
 # advanced configuration option allowing to configure language server-specific options.
 # Maps the language key to the options.
-# Have a look at the docstring of the constructors of the LS implementations within solidlsp (e.g., for C# or PHP) to see which options are available.
+# The settings are considered only if the project is trusted (see global configuration to define trusted projects).
-# No documentation on options means no options are available.
+# See https://oraios.github.io/serena/02-usage/050_configuration.html#language-server-specific-settings
 ls_specific_settings: {}
 
 # list of additional paths to ignore in this project.
 # Same syntax as gitignore, so you can use * and **.
+# Important: quote patterns that start with `*`, otherwise YAML treats them as aliases.
+# Example:
+#   ignored_paths:
+#     - "examples/**"
+#     - ".worktrees/**"
+#     - "**/bin/**"
+#     - "**/obj/**"
 # Note: global ignored_paths from serena_config.yml are also applied additively.
 ignored_paths: []
 
@@ -66,54 +45,17 @@ read_only: false
 
 # list of tool names to exclude.
 # This extends the existing exclusions (e.g. from the global configuration)
-#
+# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
-# Below is the complete list of tools for convenience.
-# To make sure you have the latest list of tools, and to view their descriptions, 
-# execute `uv run scripts/print_tool_overview.py`.
-#
-#  * `activate_project`: Activates a project based on the project name or path.
-#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
-#  * `create_text_file`: Creates/overwrites a file in the project directory.
-#  * `delete_memory`: Delete a memory file. Should only happen if a user asks for it explicitly,
-#       for example by saying that the information retrieved from a memory file is no longer correct
-#       or no longer relevant for the project.
-#  * `edit_memory`: Replaces content matching a regular expression in a memory.
-#  * `execute_shell_command`: Executes a shell command.
-#  * `find_file`: Finds files in the given relative paths
-#  * `find_referencing_symbols`: Finds symbols that reference the given symbol using the language server backend
-#  * `find_symbol`: Performs a global (or local) search using the language server backend.
-#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
-#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
-#  * `initial_instructions`: Provides instructions Serena usage (i.e. the 'Serena Instructions Manual')
-#       for clients that do not read the initial instructions when the MCP server is connected.
-#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
-#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
-#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
-#  * `list_memories`: List available memories. Any memory can be read using the `read_memory` tool.
-#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
-#  * `read_file`: Reads a file within the project directory.
-#  * `read_memory`: Read the content of a memory file. This tool should only be used if the information
-#       is relevant to the current task. You can infer whether the information
-#       is relevant from the memory file name.
-#       You should not read the same memory file multiple times in the same conversation.
-#  * `rename_memory`: Renames or moves a memory. Moving between project and global scope is supported
-#       (e.g., renaming "global/foo" to "bar" moves it from global to project scope).
-#  * `rename_symbol`: Renames a symbol throughout the codebase using language server refactoring capabilities.
-#       For JB, we use a separate tool.
-#  * `replace_content`: Replaces content in a file (optionally using regular expressions).
-#  * `replace_symbol_body`: Replaces the full definition of a symbol using the language server backend.
-#  * `safe_delete_symbol`:
-#  * `search_for_pattern`: Performs a search for a pattern in the project.
-#  * `write_memory`: Write some information (utf-8-encoded) about this project that can be useful for future tasks to a memory in md format.
-#       The memory name should be meaningful.
 excluded_tools: []
 
 # list of tools to include that would otherwise be disabled (particularly optional tools that are disabled by default).
 # This extends the existing inclusions (e.g. from the global configuration).
+# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
 included_optional_tools: []
 
 # fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools.
 # This cannot be combined with non-empty excluded_tools or included_optional_tools.
+# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
 fixed_tools: []
 
 # list of mode names to that are always to be included in the set of active modes
@@ -124,11 +66,14 @@ fixed_tools: []
 # Set this to a list of mode names to always include the respective modes for this project.
 base_modes:
 
-# list of mode names that are to be activated by default.
+# list of mode names that are to be activated by default, overriding the setting in the global configuration.
-# The full set of modes to be activated is base_modes + default_modes.
+# The full set of modes to be activated is base_modes (from global config) + default_modes + added_modes.
-# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
+# If the setting is undefined/empty, the default_modes from the global configuration (serena_config.yml) apply.
 # Otherwise, this overrides the setting from the global configuration (serena_config.yml).
+# Therefore, you can set this to [] if you do not want the default modes defined in the global config to apply
+# for this project.
 # This setting can, in turn, be overridden by CLI parameters (--mode).
+# See https://oraios.github.io/serena/02-usage/050_configuration.html#modes
 default_modes:
 
 # initial prompt for the project. It will always be given to the LLM upon activating the project
@@ -152,3 +97,81 @@ read_only_memory_patterns: []
 # Extends the list from the global configuration, merging the two lists.
 # Example: ["_archive/.*", "_episodes/.*"]
 ignored_memory_patterns: []
+
+# list of language servers to start when using the LSP backend; choose from:
+#   ada                    al                     angular                ansible                bash
+#   bsl                    clojure                cpp                    cpp_ccls               crystal
+#   csharp                 csharp_omnisharp       cue                    dart                   deno
+#   elixir                 elm                    erlang                 fortran                fsharp
+#   gdscript               gleam                  go                     groovy                 haskell
+#   haxe                   hlsl                   html                   java                   json
+#   julia                  kotlin                 latex                  lean4                  lua
+#   luau                   markdown               matlab                 msl                    nextflow
+#   nix                    ocaml                  pascal                 perl                   php
+#   php_phpactor           php_phpantom           powershell             python                 python_basedpyright
+#   python_jedi            python_pyrefly         python_ty              qml                    r
+#   rego                   ruby                   ruby_solargraph        rust                   scala
+#   scss                   solidity               svelte                 swift                  systemverilog
+#   terraform              toml                   typescript             typescript_vts         vue
+#   wolfram                yaml                   zig
+#   (This list may be outdated; generated with scripts/print_language_list.py;
+#   For the current list, see values of the LanguageServerId enum here:
+#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py)
+# For some languages, there are several alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
+# Note:
+#   - For C, use cpp
+#   - For JavaScript, use typescript
+#   - For Angular projects, use angular (subsumes typescript+html; requires `npm install` in the project root)
+#   - For Svelte projects, use svelte (subsumes typescript/javascript for .svelte projects; requires npm)
+#   - For Deno projects, use deno (serves the same .ts/.js files as typescript; requires the deno CLI on PATH)
+#   - For SCSS / Sass / plain CSS, use scss (some-sass-language-server handles all three)
+#   - For Free Pascal/Lazarus, use pascal
+# Special requirements:
+#   Some language servers require additional setup/installations.
+#   See here for details: https://oraios.github.io/serena/01-about/020_programming-languages.html#language-servers
+# When using multiple language servers, the first language server that supports a given file will be used for that file.
+# The first language server is the default language and the respective language server will be used as a fallback.
+# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
+language_servers:
+- java
+
+# list of mode names to be activated additionally for this project, e.g. ["query-projects"]
+# The full set of modes to be activated is base_modes (from global config) + default_modes + added_modes.
+# See https://oraios.github.io/serena/02-usage/050_configuration.html#modes
+added_modes:
+
+# list of workspace folder paths (LSP backend only).
+# These folders will be used to build up Serena's symbol index.
+# Paths must be within the project root and should thus be relative to the project root.
+# Furthermore, the paths should not be filtered by ignore settings.
+# Default setting: The entire project root folder (".") is considered.
+# In (large) monorepos, this can be used to index only subfolders of the project root, e.g.
+#   ls_workspace_folders:
+#     - "./subproject1"
+#     - "./subproject2"
+ls_workspace_folders:
+- .
+
+# list of additional workspace folder paths for cross-package reference support.
+# Paths can be absolute or relative to the project root.
+# Each folder is registered as an LSP workspace folder, enabling language servers to discover
+# symbols and references across package boundaries, but these folders are not indexed by Serena,
+# i.e. the respective symbols will not be found using Serena's symbol search tools.
+# Example:
+#   additional_workspace_folders:
+#     - ../sibling-package
+#     - ../shared-lib
+ls_additional_workspace_folders: []
+
+# optional shell command to run before the language backend (LSP or JetBrains) is initialised.
+# the command runs in the project root directory and is only executed if the project is trusted
+# (see trusted_project_path_patterns in the global configuration).
+# serena waits for the command to exit: a non-zero exit code is logged as an error but does not
+# abort activation. a per-project timeout (activation_command_timeout, default 180s) is the safety
+# backstop for non-terminating commands; on expiry the process is killed and activation continues.
+# example: activation_command: "npx nx run-many -t build"
+activation_command:
+
+# maximum time in seconds to wait for activation_command to complete before killing it (default 180s).
+# must be a positive number.
+activation_command_timeout: 180.0

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.50</version>
+	<version>1.0.58</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>
@@ -190,6 +190,10 @@
 			<artifactId>timi-spring</artifactId>
 			<version>0.0.20</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-freemarker</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.imyeyu.network</groupId>
 			<artifactId>timi-network</artifactId>

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

@@ -184,6 +184,7 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 		try (InputStream inputStream = getInputStreamByMongoId(source.getMongoId())) {
 			target.setInputStream(inputStream);
 			create(target);
+			target.setInputStream(null);
 			return target;
 		} catch (IOException e) {
 			if (target.getMongoId() != null) {

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

@@ -6,11 +6,11 @@ import com.imyeyu.api.modules.gao.entity.GaoPointRedeemSku;
 import com.imyeyu.api.modules.gao.service.GaoPointRedeemSkuService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPage;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPageResult;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuRequest;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
-import com.imyeyu.spring.bean.PageResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,11 +30,15 @@ public class GaoPointRedeemSkuController {
 	private final GaoPointRedeemSkuService service;
 	private final GaoStoreScopeService storeScopeService;
 
+	/// 分页查询兑换 SKU 配置，指定 SKU 时附带基础单位兑换统计
+	/// @param page 分页与筛选条件
+	/// @return 兑换 SKU 分页结果，指定 SKU 时包含基础单位兑换统计
+	/// @throws TimiException 分页条件为空
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.POINT_REDEEM_SKU_MANAGE)
 	@PostMapping("/list")
-	public PageResult<GaoPointRedeemSku> list(@RequestBody GaoPointRedeemSkuPage page) {
+	public GaoPointRedeemSkuPageResult list(@RequestBody GaoPointRedeemSkuPage page) {
 		TimiException.required(page, "not found redeem sku page");
 		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		return service.pageByQuery(page);

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

@@ -149,6 +149,17 @@ public class GaoProductController {
 		productService.disable(id);
 	}
 
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
+	@PostMapping("/delete")
+	public void delete(@RequestParam String id) {
+		GaoProduct product = productService.get(id);
+		TimiException.required(product, "not found product");
+		storeScopeService.checkStoreId(product.getStoreId());
+		productService.destroy(id);
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.PRODUCT_READ)
@@ -221,6 +232,21 @@ public class GaoProductController {
 		return spec.getId();
 	}
 
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
+	@PostMapping("/spec/update")
+	public void specUpdate(@RequestBody GaoProductSpec request) {
+		TimiException.required(request, "not found product spec");
+		TimiException.required(request.getId(), "not found product spec.id");
+		String productId = specService.getProductIdBySpecId(request.getId());
+		TimiException.required(productId, "产品规格不存在");
+		GaoProduct product = productService.get(productId);
+		TimiException.required(product, "not found product");
+		storeScopeService.checkStoreId(product.getStoreId());
+		specService.updateSpec(request);
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
@@ -236,6 +262,21 @@ public class GaoProductController {
 		return value.getId();
 	}
 
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
+	@PostMapping("/spec/value/update")
+	public void specValueUpdate(@RequestBody GaoProductSpecValue request) {
+		TimiException.required(request, "not found product spec value");
+		TimiException.required(request.getId(), "not found product spec value.id");
+		String productId = specService.getProductIdBySpecValueId(request.getId());
+		TimiException.required(productId, "产品规格值不存在");
+		GaoProduct product = productService.get(productId);
+		TimiException.required(product, "not found product");
+		storeScopeService.checkStoreId(product.getStoreId());
+		specService.updateValue(request);
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.PRODUCT_READ)

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

@@ -9,10 +9,12 @@ import com.imyeyu.api.modules.gao.service.GaoProductStockRecordService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockBatchRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockChangeRequest;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockManualInBatchRequest;
 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.GaoProductStockRecordPage;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordPageResult;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
@@ -93,6 +95,21 @@ public class GaoProductStockController {
 		return stockService.manualIn(normalize(request));
 	}
 
+	/// 批量手工入库
+	///
+	/// @param request 批量手工入库请求
+	/// @return 更新后的库存列表
+	/// @throws TimiException 请求或库存校验失败
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.PRODUCT_STOCK_CREATE)
+	@PostMapping("/manual-in/batch")
+	public List<GaoProductStock> manualInBatch(@RequestBody GaoProductStockManualInBatchRequest request) {
+		TimiException.required(request, "not found stock batch request");
+		request.setStoreId(storeScopeService.resolveStoreId(request.getStoreId()));
+		return stockService.manualInBatch(request);
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.PRODUCT_STOCK_CREATE)
@@ -125,11 +142,15 @@ public class GaoProductStockController {
 		return stockService.stocktakeLoss(normalize(request));
 	}
 
+	/// 按条件分页查询库存流水并汇总 SKU 基础单位变动
+	/// @param page 流水分页与筛选条件
+	/// @return 流水分页及匹配条件下的 SKU 基础单位汇总
+	/// @throws TimiException 分页请求为空或门店范围校验失败
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.PRODUCT_STOCK_READ)
 	@PostMapping("/record/list")
-	public PageResult<GaoProductStockRecord> recordList(@RequestBody GaoProductStockRecordPage page) {
+	public GaoProductStockRecordPageResult recordList(@RequestBody GaoProductStockRecordPage page) {
 		TimiException.required(page, "not found stock record page");
 		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		return recordService.pageByQuery(page);

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

@@ -3,8 +3,13 @@ package com.imyeyu.api.modules.gao.controller;
 import com.imyeyu.api.annotation.RequireCorePermission;
 import com.imyeyu.api.bean.CorePermissionCode;
 import com.imyeyu.api.bean.ModuleCode;
+import com.imyeyu.api.modules.gao.entity.GaoStore;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.user.bean.AuthOwnerType;
 import com.imyeyu.api.modules.user.entity.Role;
 import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
+import com.imyeyu.api.modules.user.service.PermissionService;
+import com.imyeyu.api.modules.user.service.RoleService;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
@@ -26,6 +31,9 @@ public class GaoRoleController {
 
 	private final UserLoginService userLoginService;
 	private final AuthorizationScopeService authorizationScopeService;
+	private final GaoStoreService gaoStoreService;
+	private final PermissionService permissionService;
+	private final RoleService roleService;
 
 	@AOPLog
 	@RequestRateLimit
@@ -34,4 +42,40 @@ public class GaoRoleController {
 	public List<Role> availableList() {
 		return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
 	}
+
+	/// 查询登录用户所属门店内可管理的角色
+	///
+	/// @return 门店角色列表
+	@AOPLog
+	@RequestRateLimit
+	@RequireCorePermission(CorePermissionCode.ROLE_READ)
+	@PostMapping("/management/list")
+	public List<Role> managementList() {
+		String loginUserId = userLoginService.getRequireLoginUserId();
+		GaoStore store = gaoStoreService.getByUserId(loginUserId);
+		if (store == null) {
+			return List.of();
+		}
+
+		List<Role> roleList = authorizationScopeService.listManageableRole(loginUserId, ModuleCode.GAO)
+				.stream()
+				.filter(role -> role.getOwnerType() == AuthOwnerType.STORE)
+				.filter(role -> store.getId().equals(role.getOwnerId()))
+				.toList();
+		roleList.forEach(this::fillRoleDetail);
+		return roleList;
+	}
+
+	/// 填充角色详情
+	///
+	/// @param role 角色
+	private void fillRoleDetail(Role role) {
+		role.setPermissionList(permissionService.listByRoleId(role.getId()));
+		role.setAllPermissionList(roleService.listPermissionByRoleId(role.getId()));
+		role.setChildRoleList(roleService.listChildByParentRoleId(role.getId()));
+		if (role.getParentRoleId() != null) {
+			role.setParentRole(roleService.get(role.getParentRoleId()));
+		}
+		role.setDelegationPermissionList(roleService.listDelegationPermissionByRoleId(role.getId()));
+	}
 }

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

@@ -9,6 +9,8 @@ import com.imyeyu.api.modules.gao.service.GaoOrderPaymentService;
 import com.imyeyu.api.modules.gao.service.GaoSalesOrderService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerView;
 import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentActionRequest;
 import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentNoRefundRequest;
 import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentReceiveRequest;
@@ -16,6 +18,7 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRefundRequest;
 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.GaoSalesOrderReceivableStatView;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.java.TimiJava;
@@ -54,6 +57,26 @@ public class GaoSalesOrderController {
 		return service.pageByQuery(page);
 	}
 
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
+	@PostMapping("/summary")
+	public GaoSalesOrderReceivableStatView summary(@RequestBody GaoSalesOrderPage page) {
+		TimiException.required(page, "not found sales order summary page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
+		return service.summary(page);
+	}
+
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
+	@PostMapping("/customer-product/list")
+	public PageResult<GaoCustomerProductCustomerView> customerProductList(@RequestBody GaoCustomerProductPage page) {
+		TimiException.required(page, "not found customer product page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
+		return service.pageCustomerProduct(page);
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)

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

@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.gao.controller;
 
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
+import com.imyeyu.api.modules.gao.service.GaoPointChartService;
 import com.imyeyu.api.modules.gao.service.GaoStoreChartService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
@@ -10,6 +11,8 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
+import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
 import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -33,6 +36,7 @@ import java.util.List;
 public class GaoStoreChartController {
 
 	private final GaoStoreChartService service;
+	private final GaoPointChartService pointChartService;
 	private final GaoStoreScopeService storeScopeService;
 
 	/// 查询客户增长趋势
@@ -96,4 +100,26 @@ public class GaoStoreChartController {
 		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordCalendar(req);
 	}
+
+	/// 查询每日积分获得、消耗和差值
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
+	@PostMapping("/point/ledger/daily")
+	public List<GaoPointDailyStatView> pointDaily(@RequestBody GaoStoreChartReq req) {
+		TimiException.required(req, "积分图表请求不能为空");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
+		return pointChartService.dailyTrend(req);
+	}
+
+	/// 查询积分兑换产品排行
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
+	@PostMapping("/point/redemption/product/rank")
+	public List<GaoPointRedemptionProductRankView> pointRedemptionProductRank(@RequestBody GaoStoreChartReq req) {
+		TimiException.required(req, "积分兑换排行请求不能为空");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
+		return pointChartService.redemptionProductRank(req);
+	}
 }

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

@@ -1,6 +1,7 @@
 package com.imyeyu.api.modules.gao.entity;
 
 import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.gao.vo.GaoProductSkuBaseUnitMigrationRequest;
 import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
@@ -77,6 +78,10 @@ public class GaoProductSku extends UUIDEntity {
 	@Transient
 	private List<GaoProductSkuUnit> unitList;
 
+	/// 基础单位迁移请求，仅用于 SKU 更新，不映射数据库列
+	@Transient
+	private GaoProductSkuBaseUnitMigrationRequest baseUnitMigrationRequest;
+
 	/// SKU 附件列表
 	@Transient
 	private List<Attachment> attachmentList;

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

@@ -0,0 +1,20 @@
+package com.imyeyu.api.modules.gao.mapper;
+
+import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
+import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
+
+import java.util.List;
+
+/// 门店积分图表统计 Mapper
+///
+/// @author Codex
+/// @since 2026-09-23
+public interface GaoPointChartMapper {
+
+	/// 按天汇总积分获得和消耗
+	List<GaoPointDailyStatView> selectDailyTrend(GaoStoreChartReq req);
+
+	/// 按产品汇总兑换积分并取前 10
+	List<GaoPointRedemptionProductRankView> selectRedemptionProductRank(GaoStoreChartReq req);
+}

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

@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.gao.mapper;
 
 import com.imyeyu.api.modules.gao.entity.GaoPointRedemption;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionPage;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPageResult;
 import com.imyeyu.spring.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,4 +33,12 @@ public interface GaoPointRedemptionMapper extends BaseMapper<GaoPointRedemption,
 	/// 统计客户指定 SKU 的有效兑换数量
 	BigDecimal sumValidQuantity(@Param("storeId") String storeId, @Param("customerId") String customerId,
 		@Param("skuId") String skuId, @Param("beginAt") Long beginAt, @Param("endAt") Long endAt);
+
+	/// 按门店和 SKU 汇总兑换与退货的基础单位数量
+	/// @param storeId 门店 ID，可为空
+	/// @param skuId SKU ID
+	/// @return 兑换、退货及净兑换基础数量
+	GaoPointRedeemSkuPageResult selectSkuSummaryByStoreIdAndSkuId(
+		@Param("storeId") String storeId, @Param("skuId") String skuId
+	);
 }

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

@@ -0,0 +1,74 @@
+package com.imyeyu.api.modules.gao.mapper;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+
+/// 产品编辑、引用检查与单位迁移 Mapper
+public interface GaoProductEditMapper {
+
+	int countProductReferences(@Param("productId") String productId);
+
+	int countSkuReferences(@Param("skuId") String skuId);
+
+	int countUnitReferences(@Param("unitId") String unitId);
+
+	int countMigrationPrecisionLoss(@Param("skuId") String skuId, @Param("targetUnitId") String targetUnitId,
+									@Param("ratio") BigDecimal ratio);
+
+	int updateProductOrderSnapshots(@Param("productId") String productId, @Param("productName") String productName);
+
+	int updateProductFulfillmentSnapshots(@Param("productId") String productId, @Param("productName") String productName);
+
+	int updateProductStockRecordSnapshots(@Param("productId") String productId, @Param("productName") String productName);
+
+	int updateProductPackageSnapshots(@Param("productId") String productId, @Param("productName") String productName);
+
+	int updateProductRedemptionSnapshots(@Param("productId") String productId, @Param("productName") String productName);
+
+	int updateSkuOrderSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
+							@Param("skuName") String skuName, @Param("specSummary") String specSummary,
+							@Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
+
+	int updateSkuFulfillmentSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
+									  @Param("skuName") String skuName, @Param("specSummary") String specSummary,
+									  @Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
+
+	int updateSkuStockRecordSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
+									  @Param("skuName") String skuName, @Param("specSummary") String specSummary,
+									  @Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
+
+	int updateSkuPackageSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
+								  @Param("skuName") String skuName, @Param("specSummary") String specSummary);
+
+	int updateSkuRedemptionSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
+									 @Param("skuName") String skuName, @Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
+
+	int updateUnitOrderSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
+
+	int updateUnitFulfillmentSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
+
+	int updateUnitStockRecordSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
+
+	int updateUnitPackageSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
+
+	int updateUnitRedemptionSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
+
+	int scaleSkuMinimumStock(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scaleProductStock(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scaleSalesOrderItems(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scaleFulfillmentItems(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scaleStockRecords(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scalePackageConfigItems(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scalePointRedemptions(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+	int scalePointRedemptionReturns(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
+
+}

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

@@ -24,4 +24,7 @@ public interface GaoProductSpecMapper extends BaseMapper<GaoProductSpec, String>
 
 	/// 查询规格项所属产品
 	String selectProductIdBySpecId(@Param("specId") String specId);
+
+	/// 更新规格名称和排序
+	int updateSpec(GaoProductSpec spec);
 }

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

@@ -18,4 +18,7 @@ public interface GaoProductSpecValueMapper extends BaseMapper<GaoProductSpecValu
 
 	/// 按规格项查询规格值
 	List<GaoProductSpecValue> selectBySpecIdList(@Param("specIdList") Collection<String> specIdList);
+
+	/// 更新规格值名称和排序
+	int updateValue(GaoProductSpecValue value);
 }

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

@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.gao.mapper;
 
 import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordPage;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordSkuSummaryView;
 import com.imyeyu.spring.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,4 +34,9 @@ public interface GaoProductStockRecordMapper extends BaseMapper<GaoProductStockR
 
 	/// 按条件查询库存流水
 	List<GaoProductStockRecord> selectByQuery(GaoProductStockRecordPage page);
+
+	/// 按条件统计指定 SKU 的出入库基础单位数量，不受分页字段限制
+	/// @param page 包含 SKU 和库存流水筛选条件的请求
+	/// @return 指定 SKU 的出入库基础单位数量
+	GaoProductStockRecordSkuSummaryView selectSkuBaseUnitSummaryByQuery(GaoProductStockRecordPage page);
 }

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

@@ -1,7 +1,11 @@
 package com.imyeyu.api.modules.gao.mapper;
 
 import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerRow;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductView;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
+import com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView;
 import com.imyeyu.spring.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -29,6 +33,18 @@ public interface GaoSalesOrderMapper extends BaseMapper<GaoSalesOrder, String> {
 	/// 按条件查询订单
 	List<GaoSalesOrder> selectByQuery(GaoSalesOrderPage page);
 
+	/// 按条件汇总订单金额
+	GaoSalesOrderReceivableStatView selectSummaryByQuery(GaoSalesOrderPage page);
+
+	/// 按条件统计客户产品客户
+	long countCustomerProductCustomerByQuery(GaoCustomerProductPage page);
+
+	/// 按条件查询客户产品客户
+	List<GaoCustomerProductCustomerRow> selectCustomerProductCustomerByQuery(GaoCustomerProductPage page);
+
+	/// 按条件查询客户产品明细
+	List<GaoCustomerProductView> selectCustomerProductByQuery(GaoCustomerProductPage page);
+
 	/// 更新订单付款汇总
 	int updatePayment(@Param("id") String id, @Param("pendingPaidAmount") Long pendingPaidAmount, @Param("paidAmount") Long paidAmount,
 		@Param("paidAt") Long paidAt, @Param("refundedAmount") Long refundedAmount, @Param("paymentStatus") GaoSalesOrder.PaymentStatus paymentStatus,

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

@@ -0,0 +1,20 @@
+package com.imyeyu.api.modules.gao.service;
+
+import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
+import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
+
+import java.util.List;
+
+/// 门店积分图表统计服务
+///
+/// @author Codex
+/// @since 2026-09-23
+public interface GaoPointChartService {
+
+	/// 查询每日积分获得、消耗和差值
+	List<GaoPointDailyStatView> dailyTrend(GaoStoreChartReq req);
+
+	/// 查询积分兑换产品排行，按实际扣除积分取前 10
+	List<GaoPointRedemptionProductRankView> redemptionProductRank(GaoStoreChartReq req);
+}

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

@@ -2,8 +2,8 @@ package com.imyeyu.api.modules.gao.service;
 
 import com.imyeyu.api.modules.gao.entity.GaoPointRedeemSku;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPage;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPageResult;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuRequest;
-import com.imyeyu.spring.bean.PageResult;
 
 /// GAO 积分兑换 SKU 配置服务
 ///
@@ -11,8 +11,11 @@ import com.imyeyu.spring.bean.PageResult;
 /// @since 2026-09-14
 public interface GaoPointRedeemSkuService {
 
-	/// 分页查询兑换 SKU 配置
+	/// 分页查询兑换 SKU 配置，指定 SKU 时附带基础单位兑换统计
-	PageResult<GaoPointRedeemSku> pageByQuery(GaoPointRedeemSkuPage page);
+	/// @param page 分页与筛选条件
+	/// @return 兑换 SKU 分页结果，指定 SKU 时包含基础单位兑换统计
+	/// @throws TimiException 分页条件为空
+	GaoPointRedeemSkuPageResult pageByQuery(GaoPointRedeemSkuPage page);
 
 	/// 查询兑换 SKU 配置详情
 	GaoPointRedeemSku detail(String storeId, String id);

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

@@ -59,6 +59,9 @@ public interface GaoProductSkuService extends BaseService<GaoProductSku, String>
 	/// @return SKU 规格结构快照；无规格时返回空数组
 	JsonNode getSkuSpecSnapshot(GaoProductSku sku);
 
+	/// 按当前 SKU 规格资料刷新所有历史快照
+	void refreshSpecHistorySnapshots(String productId);
+
 	/// 停用 SKU
 	void disable(String id);
 }

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

@@ -17,9 +17,21 @@ public interface GaoProductSpecService {
 	/// 查询规格项所属产品 ID
 	String getProductIdBySpecId(String specId);
 
+	/// 查询规格值所属产品 ID
+	String getProductIdBySpecValueId(String specValueId);
+
 	/// 创建规格项
 	void createSpec(GaoProductSpec spec);
 
+	/// 修正规格名称和排序
+	void updateSpec(GaoProductSpec spec);
+
 	/// 创建规格值
 	void createValue(GaoProductSpecValue value);
+
+	/// 修正规格值名称和排序
+	void updateValue(GaoProductSpecValue value);
+
+	/// 删除产品下的规格数据，仅用于产品物理删除
+	void destroyByProductId(String productId);
 }

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

@@ -3,7 +3,7 @@ package com.imyeyu.api.modules.gao.service;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordPage;
-import com.imyeyu.spring.bean.PageResult;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordPageResult;
 import com.imyeyu.spring.service.BaseService;
 
 import java.util.List;
@@ -14,8 +14,10 @@ import java.util.List;
 /// @since 2026-09-02
 public interface GaoProductStockRecordService extends BaseService<GaoProductStockRecord, String> {
 
-	/// 按条件查询库存流水
+	/// 按条件查询库存流水；指定 SKU 时统计其出入库基础单位数量
-	PageResult<GaoProductStockRecord> pageByQuery(GaoProductStockRecordPage page);
+	/// @param page 流水分页和统计筛选条件
+	/// @return 流水分页及匹配条件下的 SKU 基础单位汇总
+	GaoProductStockRecordPageResult pageByQuery(GaoProductStockRecordPage page);
 
 	/// 查询库存流水详情
 	GaoProductStockRecord detail(String id);

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

@@ -1,12 +1,15 @@
 package com.imyeyu.api.modules.gao.service;
 
+import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.gao.entity.GaoProductStock;
 import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockChangeRequest;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockManualInBatchRequest;
 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.GaoStockChangeItem;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.bean.PageResult;
 
 import java.util.List;
@@ -35,6 +38,13 @@ public interface GaoProductStockService {
 	/// 手工入库
 	GaoProductStock manualIn(GaoProductStockChangeRequest request);
 
+	/// 批量手工入库
+	///
+	/// @param request 批量手工入库请求
+	/// @return 更新后的库存列表
+	/// @throws TimiException 请求或库存校验失败
+	List<GaoProductStock> manualInBatch(GaoProductStockManualInBatchRequest request);
+
 	/// 手工出库
 	GaoProductStock manualOut(GaoProductStockChangeRequest request);
 
@@ -62,6 +72,10 @@ public interface GaoProductStockService {
 	/// 履约出库
 	List<GaoProductStock> outForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
 
+	/// 履约出库并复制履约附件到出库流水
+	List<GaoProductStock> outForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo,
+		String operatorUserId, List<Attachment> attachmentList);
+
 	/// 履约库存冲正入库
 	List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
 

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

@@ -3,9 +3,12 @@ package com.imyeyu.api.modules.gao.service;
 import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
 import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
 import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerView;
 import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
+import com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
 import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.BaseService;
@@ -24,6 +27,12 @@ public interface GaoSalesOrderService extends BaseService<GaoSalesOrder, String>
 	/// 按条件分页查询订单
 	PageResult<GaoSalesOrder> pageByQuery(GaoSalesOrderPage page);
 
+	/// 按条件汇总订单金额
+	GaoSalesOrderReceivableStatView summary(GaoSalesOrderPage page);
+
+	/// 按条件分页查询客户产品
+	PageResult<GaoCustomerProductCustomerView> pageCustomerProduct(GaoCustomerProductPage page);
+
 	/// 查询订单详情
 	GaoSalesOrder detail(String id);
 

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

@@ -168,18 +168,19 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 
 	private GaoOrderFulfillment createInternal(GaoOrderFulfillmentCreateRequest request) {
 		TimiException.required(request, "not found fulfillment request");
+		List<GaoOrderFulfillmentItemRequest> requestItems = filterZeroQuantityItems(request.getItemList());
 		String requestNo = requiredText(request.getRequestNo(), "not found requestNo");
 		TimiException.required(request.getSalesOrderId(), "not found salesOrderId");
 		GaoSalesOrder order = salesOrderService.getForUpdate(request.getSalesOrderId());
 		GaoOrderFulfillment existing = mapper.selectByRequestNo(order.getStoreId(), requestNo);
 		if (existing != null) {
-			verifyIdempotency(existing, request);
+			verifyIdempotency(existing, request, requestItems);
 			return detail(existing.getId());
 		}
 		TimiException.requiredTrue(hasAttachment(request.getAttachmentList()), "履约必须上传照片");
 		TimiException.requiredTrue(order.getStatus() != GaoSalesOrder.Status.CANCELLED, "已取消订单不能履约");
 		salesOrderService.checkFulfillmentPermission(order);
-		List<SourceEntry> sourceList = loadSources(order, request.getItemList(), true);
+		List<SourceEntry> sourceList = loadSources(order, requestItems, true);
 		List<GaoStockChangeItem> stockItems = buildStockItems(order.getStoreId(), sourceList);
 		boolean stockReady = stockItems.isEmpty() || productStockService.hasSufficientForFulfillment(order.getStoreId(), stockItems);
 		String operatorUserId = userLoginService.getRequireLoginUserId();
@@ -261,8 +262,10 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		applySkuSpecSnapshots(stockItems, fulfillmentItemList);
 		String verifierUserId = userLoginService.getRequireLoginUserId();
 		if (!stockItems.isEmpty()) {
+			List<Attachment> attachmentList = attachmentService.listByBizId(
+				Attachment.BizType.GAO_ORDER_FULFILLMENT, fulfillment.getId());
 			productStockService.outForFulfillment(order.getStoreId(), fulfillment.getId(), stockItems,
-				stockRequestNo(fulfillment, "OUT"), verifierUserId);
+				stockRequestNo(fulfillment, "OUT"), verifierUserId, attachmentList);
 		}
 		TimiException.requiredTrue(1 == mapper.updateStatus(fulfillment.getId(), GaoOrderFulfillment.Status.VERIFIED,
 			verifierUserId, Time.now(), request.getReason()), "履约状态已变化");
@@ -441,6 +444,19 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		}
 	}
 
+	/// 过滤履约请求中数量为 0 的明细
+	///
+	/// @param requestItems 履约请求明细
+	/// @return 过滤后的履约请求明细，null 按原样返回
+	private List<GaoOrderFulfillmentItemRequest> filterZeroQuantityItems(List<GaoOrderFulfillmentItemRequest> requestItems) {
+		if (requestItems == null) {
+			return null;
+		}
+		return requestItems.stream()
+			.filter(item -> item == null || item.getQuantity() == null || 0 != item.getQuantity().signum())
+			.toList();
+	}
+
 	private List<SourceEntry> loadSources(GaoSalesOrder order, List<GaoOrderFulfillmentItemRequest> requestItems, boolean checkAvailable) {
 		TimiException.requiredTrue(requestItems != null && !requestItems.isEmpty(), "履约至少需要一个产品");
 		List<GaoOrderFulfillmentItemRequest> sortedRequestItems = new ArrayList<>(requestItems);
@@ -655,12 +671,12 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		}
 	}
 
-	private void verifyIdempotency(GaoOrderFulfillment existing, GaoOrderFulfillmentCreateRequest request) {
+	private void verifyIdempotency(GaoOrderFulfillment existing, GaoOrderFulfillmentCreateRequest request,
+		List<GaoOrderFulfillmentItemRequest> requestItems) {
 		TimiException.requiredTrue(existing.getSalesOrderId().equals(request.getSalesOrderId())
 			&& (request.getDeliveredAt() == null || request.getDeliveredAt().equals(existing.getDeliveredAt()))
 			&& sameText(existing.getRemark(), request.getRemark()), "requestNo 对应履约请求内容不一致");
 		List<GaoOrderFulfillmentItem> existingItems = itemMapper.selectByFulfillmentId(existing.getId());
-		List<GaoOrderFulfillmentItemRequest> requestItems = request.getItemList();
 		TimiException.requiredTrue(existingItems.size() == (requestItems == null ? 0 : requestItems.size()), "requestNo 对应履约请求内容不一致");
 		Map<String, GaoOrderFulfillmentItemRequest> requestMap = new HashMap<>();
 		for (GaoOrderFulfillmentItemRequest item : TimiJava.safeIterable(requestItems)) {

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

@@ -237,8 +237,12 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		TimiException.required(request, "not found fund revoke request");
 		String requestNo = requiredText(request.getRequestNo(), "not found requestNo");
 		String reason = requiredText(request.getReason(), "资金冲正原因不能为空");
+		GaoFundRecord sourceSnapshot = fundRecordService.detail(request.getFundRecordId());
+		TimiException.requiredTrue(sourceSnapshot.getBizType() == GaoFundRecord.BizType.SALES_ORDER, "资金记录不是销售订单资金");
+		TimiException.required(sourceSnapshot.getBizId(), "not found salesOrderId");
+		GaoSalesOrder order = orderService.getForUpdate(sourceSnapshot.getBizId());
 		GaoFundRecord source = lockOrderRecord(request.getFundRecordId());
-		GaoSalesOrder order = orderService.getForUpdate(source.getBizId());
+		TimiException.requiredTrue(order.getId().equals(source.getBizId()), "资金流水所属订单已变化");
 		GaoFundRecord existing = fundRecordService.getByRequestNo(order.getStoreId(), requestNo);
 		if (existing != null) {
 			TimiException.requiredTrue(existing.getOperationType() == GaoFundRecord.OperationType.REVOKE && source.getId().equals(existing.getSourceRecordId()), "requestNo 已被其他资金操作使用");

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.imyeyu.api.modules.common.entity.Notify;
 import com.imyeyu.api.modules.common.entity.NotifyDetail;
 import com.imyeyu.api.modules.common.service.NotifyService;
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
 import com.imyeyu.api.modules.gao.entity.GaoUser;
 import com.imyeyu.api.modules.gao.mapper.GaoOrderReminderMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoUserMapper;
@@ -12,15 +13,21 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer;
 import com.imyeyu.api.modules.user.entity.User;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.utils.Time;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -38,57 +45,96 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
 	private static final String NOTIFY_BIZ_TYPE = "GAO_ORDER_REMINDER";
 	private static final String SMS_TEMPLATE_ID = "2725097";
 	private static final String ZONE_ID = "Asia/Shanghai";
+	private static final String INTERNAL_TEMPLATE_NAME = "GaoOrderReminder.ftl";
+	private static final int MAX_SMS_CUSTOMER_NAME_COUNT = 6;
+	private static final int MAX_SMS_CUSTOMER_COUNT = 99;
 
 	private final GaoOrderReminderMapper mapper;
 	private final GaoUserMapper gaoUserMapper;
 	private final UserService userService;
 	private final NotifyService notifyService;
 	private final ObjectMapper jackson;
+	private final Configuration freemarkerConfiguration;
 
+	/// 发送订单收款提醒
 	@Override
 	public void sendOrderReceiveReminder() {
 		send(mapper.selectOrderReceiveCustomers(), ReminderType.ORDER_RECEIVE);
 	}
 
+	/// 发送收款和履约核销提醒
 	@Override
 	public void sendVerifyReminder() {
-		Map<String, Map<String, GaoOrderReminderCustomer>> storeCustomerMap = new LinkedHashMap<>();
+		Map<String, Map<String, ReminderEntry>> storeEntryMap = new LinkedHashMap<>();
-		Map<String, Set<String>> storeActionMap = new LinkedHashMap<>();
+		mergeCustomers(storeEntryMap, mapper.selectReceiveVerifyCustomers(), "核销收款");
-		mergeCustomers(storeCustomerMap, storeActionMap, mapper.selectReceiveVerifyCustomers(), "核销收款");
+		mergeCustomers(storeEntryMap, mapper.selectFulfillmentVerifyCustomers(), "核销履约");
-		mergeCustomers(storeCustomerMap, storeActionMap, mapper.selectFulfillmentVerifyCustomers(), "核销履约");
+		sendStoreReminders(storeEntryMap, ReminderType.VERIFY.name());
-		for (Map.Entry<String, Map<String, GaoOrderReminderCustomer>> entry : storeCustomerMap.entrySet()) {
-			String action = String.join("、", storeActionMap.get(entry.getKey()));
-			sendStoreReminder(entry.getKey(), new ArrayList<>(entry.getValue().values()), ReminderType.VERIFY.name(), action);
-		}
-	}
-
-	private void mergeCustomers(Map<String, Map<String, GaoOrderReminderCustomer>> storeCustomerMap,
-		Map<String, Set<String>> storeActionMap, List<GaoOrderReminderCustomer> customerList, String action) {
-		if (customerList == null || customerList.isEmpty()) {
-			return;
-		}
-		for (GaoOrderReminderCustomer customer : customerList) {
-			storeCustomerMap.computeIfAbsent(customer.getStoreId(), key -> new LinkedHashMap<>())
-				.putIfAbsent(customer.getCustomerId(), customer);
-			storeActionMap.computeIfAbsent(customer.getStoreId(), key -> new LinkedHashSet<>()).add(action);
-		}
 	}
 
+	/// 按提醒类型发送订单提醒
+	///
+	/// @param customerList 订单提醒列表
+	/// @param reminderType 提醒类型
 	private void send(List<GaoOrderReminderCustomer> customerList, ReminderType reminderType) {
 		if (customerList == null || customerList.isEmpty()) {
 			return;
 		}
-		Map<String, List<GaoOrderReminderCustomer>> storeCustomerMap = customerList.stream()
+		Map<String, Map<String, ReminderEntry>> storeEntryMap = new LinkedHashMap<>();
-			.collect(Collectors.groupingBy(GaoOrderReminderCustomer::getStoreId, LinkedHashMap::new, Collectors.toList()));
+		mergeCustomers(storeEntryMap, customerList, reminderType.label);
-		for (Map.Entry<String, List<GaoOrderReminderCustomer>> entry : storeCustomerMap.entrySet()) {
+		sendStoreReminders(storeEntryMap, reminderType.name());
-			sendStoreReminder(entry.getKey(), entry.getValue(), reminderType.name(), reminderType.label);
+	}
+
+	/// 合并同一门店下同一订单的多个提醒事项
+	///
+	/// @param storeEntryMap 门店提醒映射
+	/// @param customerList 订单提醒列表
+	/// @param action 待处理事项
+	private void mergeCustomers(Map<String, Map<String, ReminderEntry>> storeEntryMap,
+		List<GaoOrderReminderCustomer> customerList, String action) {
+		if (customerList == null || customerList.isEmpty()) {
+			return;
+		}
+		for (GaoOrderReminderCustomer customer : customerList) {
+			if (customer == null || isBlank(customer.getStoreId()) || isBlank(customer.getOrderId())) {
+				log.warn("GAO 订单提醒跳过无效订单数据: storeId[{}], customerId[{}], orderId[{}]",
+					customer == null ? null : customer.getStoreId(),
+					customer == null ? null : customer.getCustomerId(),
+					customer == null ? null : customer.getOrderId());
+				continue;
+			}
+			String entryKey = "%s:%s".formatted(customer.getCustomerId(), customer.getOrderId());
+			Map<String, ReminderEntry> entryMap = storeEntryMap.computeIfAbsent(customer.getStoreId(),
+				key -> new LinkedHashMap<>());
+			ReminderEntry entry = entryMap.computeIfAbsent(entryKey,
+				key -> new ReminderEntry(customer, new LinkedHashSet<>()));
+			entry.actionSet().add(action);
 		}
 	}
 
-	private void sendStoreReminder(String storeId, List<GaoOrderReminderCustomer> customerList, String reminderType,
+	/// 按门店发送提醒
-		String action) {
+	///
-		String customerNames = formatCustomerNames(customerList);
+	/// @param storeEntryMap 门店提醒映射
-		String content = "您的客户 %s 的订单需要 %s，请留意订单状态。".formatted(customerNames, action);
+	/// @param reminderType 提醒类型
+	private void sendStoreReminders(Map<String, Map<String, ReminderEntry>> storeEntryMap, String reminderType) {
+		for (Map.Entry<String, Map<String, ReminderEntry>> entry : storeEntryMap.entrySet()) {
+			sendStoreReminder(entry.getKey(), new ArrayList<>(entry.getValue().values()), reminderType);
+		}
+	}
+
+	/// 向门店店长发送订单提醒
+	///
+	/// @param storeId 门店 ID
+	/// @param entryList 订单提醒列表
+	/// @param reminderType 提醒类型
+	private void sendStoreReminder(String storeId, List<ReminderEntry> entryList, String reminderType) {
+		String customerNames = formatCustomerNames(entryList);
+		String action = entryList.stream()
+			.flatMap(entry -> entry.actionSet().stream())
+			.distinct()
+			.collect(Collectors.joining("、"));
+		String smsContent = "您的客户 %s 的订单需要 %s，请留意订单状态。".formatted(customerNames, action);
+		String internalContent = buildInternalContent(entryList);
+
 		List<GaoUser> managerList = gaoUserMapper.selectEnabledStoreManagers(storeId);
 		if (managerList == null || managerList.isEmpty()) {
 			log.warn("GAO 订单提醒未找到启用中的店长: storeId[{}], reminderType[{}]", storeId, reminderType);
@@ -103,35 +149,50 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
 					log.warn("GAO 订单提醒跳过不存在的店长用户: storeId[{}], userId[{}]", storeId, manager.getUserId());
 					continue;
 				}
-				String remindedKey = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId, manager.getUserId(), reminderType);
+				String remindedKey = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId,
+					manager.getUserId(), reminderType);
 				long sendAt = Time.now();
 				Notify notify = new Notify();
 				notify.setBizType(NOTIFY_BIZ_TYPE);
 				notify.setBizRemindedType(reminderType);
 				notify.setBizRemindedKey(remindedKey);
 				notify.setDetailList(List.of(
-					createInternalDetail(manager.getUserId(), content, sendAt),
+					createInternalDetail(manager.getUserId(), internalContent, sendAt),
-					createSmsDetail(user.getPhoneNo(), customerNames, action, content, sendAt)
+					createSmsDetail(user.getPhoneNo(), customerNames, action, smsContent, sendAt)
 				));
 				notifyService.createIfAbsent(notify);
 			} catch (Exception e) {
-				log.error("GAO 订单提醒发送失败: storeId[{}], userId[{}], reminderType[{}]", storeId, manager.getUserId(), reminderType, e);
+				log.error("GAO 订单提醒发送失败: storeId[{}], userId[{}], reminderType[{}]", storeId,
+					manager.getUserId(), reminderType, e);
 			}
 		}
 	}
 
+	/// 创建站内通知详情
+	///
+	/// @param userId 接收用户 ID
+	/// @param content Tiptap HTML 正文
+	/// @param sendAt 发送时间
+	/// @return 通知详情
 	private NotifyDetail createInternalDetail(String userId, String content, long sendAt) {
 		NotifyDetail detail = new NotifyDetail();
 		detail.setMsgType(NotifyDetail.MsgType.INTERNAL);
-		detail.setTemplateId(SMS_TEMPLATE_ID);
 		detail.setSubject("订单状态提醒");
 		detail.setContent(content);
-		detail.setContentType(NotifyDetail.ContentType.TEXT);
+		detail.setContentType(NotifyDetail.ContentType.TIP_TAP);
 		detail.setSendTo(userId);
 		detail.setSendAt(sendAt);
 		return detail;
 	}
 
+	/// 创建短信通知详情
+	///
+	/// @param phoneNo 手机号
+	/// @param customerNames 客户名称摘要
+	/// @param action 待处理事项
+	/// @param content 短信正文
+	/// @param sendAt 发送时间
+	/// @return 通知详情
 	private NotifyDetail createSmsDetail(String phoneNo, String customerNames, String action, String content, long sendAt) {
 		NotifyDetail detail = new NotifyDetail();
 		detail.setMsgType(NotifyDetail.MsgType.SMS);
@@ -143,15 +204,159 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
 		return detail;
 	}
 
-	private String formatCustomerNames(List<GaoOrderReminderCustomer> customerList) {
+	/// 使用 FreeMarker HTML 模板构建站内通知正文
-		List<String> nameList = customerList.stream()
+	///
-			.map(GaoOrderReminderCustomer::getCustomerName)
+	/// @param entryList 订单提醒列表
-			.map(name -> name == null || name.isBlank() ? "未知客户" : name.trim())
+	/// @return HTML 正文
-			.toList();
+	private String buildInternalContent(List<ReminderEntry> entryList) {
-		if (customerList.size() <= 2) {
+		Map<String, Object> model = new LinkedHashMap<>();
-			return String.join("、", nameList);
+		List<Map<String, Object>> customerModelList = new ArrayList<>();
+		Map<String, List<ReminderEntry>> customerEntryMap = entryList.stream()
+			.collect(Collectors.groupingBy(entry -> "%s:%s".formatted(entry.order().getCustomerId(), entry.order().getCustomerName()),
+				LinkedHashMap::new, Collectors.toList()));
+		for (List<ReminderEntry> customerEntryList : customerEntryMap.values()) {
+			GaoOrderReminderCustomer firstOrder = customerEntryList.getFirst().order();
+			Map<String, Object> customerModel = new LinkedHashMap<>();
+			customerModel.put("name", displayCustomerName(firstOrder.getCustomerName()));
+			customerModel.put("orderList", customerEntryList.stream()
+				.map(this::buildOrderTemplateModel)
+				.toList());
+			customerModelList.add(customerModel);
 		}
-		return "%s、%s等 %d 位".formatted(nameList.getFirst(), nameList.get(1), customerList.size());
+		model.put("customerList", customerModelList);
+		try {
+			Template template = freemarkerConfiguration.getTemplate(INTERNAL_TEMPLATE_NAME);
+			StringWriter writer = new StringWriter();
+			template.process(model, writer);
+			return writer.toString();
+		} catch (IOException | TemplateException e) {
+			throw new IllegalStateException("渲染 GAO 订单提醒站内信模板失败", e);
+		}
+	}
+
+	/// 构建 FreeMarker 订单模型
+	///
+	/// @param entry 订单提醒
+	/// @return 订单模板模型
+	private Map<String, Object> buildOrderTemplateModel(ReminderEntry entry) {
+		GaoOrderReminderCustomer order = entry.order();
+		Map<String, Object> orderModel = new LinkedHashMap<>();
+		orderModel.put("orderId", order.getOrderId());
+		orderModel.put("orderNo", textOrDefault(order.getOrderNo(), "未知订单"));
+		orderModel.put("orderStatus", orderStatusLabel(order.getOrderStatus()));
+		orderModel.put("paymentStatus", paymentStatusLabel(order.getPaymentStatus()));
+		orderModel.put("amountSummary", "成交 %s，已收 %s，待核销收款 %d 笔共 %s，未收 %s"
+			.formatted(formatMoney(order.getSaleAmount()), formatMoney(order.getPaidAmount()),
+				safeLong(order.getPendingReceiveCount()), formatMoney(receiveAmount(order)), formatMoney(order.getUnpaidAmount())));
+		orderModel.put("fulfillmentSummary", "待核销履约 %d 单，涉及 %d 项明细"
+			.formatted(safeLong(order.getPendingFulfillmentCount()), safeLong(order.getPendingFulfillmentItemCount())));
+		return orderModel;
+	}
+
+	/// 格式化短信中的客户名称
+	///
+	/// @param entryList 订单提醒列表
+	/// @return 客户名称摘要
+	private String formatCustomerNames(List<ReminderEntry> entryList) {
+		Map<String, String> nameMap = new LinkedHashMap<>();
+		for (ReminderEntry entry : entryList) {
+			GaoOrderReminderCustomer order = entry.order();
+			nameMap.putIfAbsent(order.getCustomerId(), displayCustomerName(order.getCustomerName()));
+		}
+		List<String> nameList = new ArrayList<>(nameMap.values());
+		int customerCount = nameList.size();
+		int displayCount = Math.min(customerCount, MAX_SMS_CUSTOMER_NAME_COUNT);
+		String customerNames = String.join("、", nameList.subList(0, displayCount));
+		if (MAX_SMS_CUSTOMER_NAME_COUNT < customerCount) {
+			String customerCountText = MAX_SMS_CUSTOMER_COUNT < customerCount
+				? "%d+".formatted(MAX_SMS_CUSTOMER_COUNT) : String.valueOf(customerCount);
+			return "%s等 %s 位客户".formatted(customerNames, customerCountText);
+		}
+		return customerNames;
+	}
+
+	/// 获取待核销收款金额
+	///
+	/// @param order 订单提醒
+	/// @return 待核销收款金额，单位分
+	private long receiveAmount(GaoOrderReminderCustomer order) {
+		return order.getPendingReceiveAmount() == null
+			? safeLong(order.getPendingPaidAmount()) : order.getPendingReceiveAmount();
+	}
+
+	/// 格式化金额
+	///
+	/// @param cents 金额，单位分
+	/// @return 金额文本
+	private String formatMoney(Long cents) {
+		return "¥" + BigDecimal.valueOf(safeLong(cents), 2).setScale(2).toPlainString();
+	}
+
+	/// 获取订单状态显示文本
+	///
+	/// @param status 订单状态
+	/// @return 显示文本
+	private String orderStatusLabel(GaoSalesOrder.Status status) {
+		if (status == null) {
+			return "未知";
+		}
+		return switch (status) {
+			case ACTIVE -> "进行中";
+			case FULFILLED -> "已全部履约";
+			case CANCELLED -> "已取消";
+		};
+	}
+
+	/// 获取付款状态显示文本
+	///
+	/// @param status 付款状态
+	/// @return 显示文本
+	private String paymentStatusLabel(GaoSalesOrder.PaymentStatus status) {
+		if (status == null) {
+			return "未知";
+		}
+		return switch (status) {
+			case UNPAID -> "未付款";
+			case PARTIALLY_PAID -> "部分付款";
+			case PAID -> "已付清";
+		};
+	}
+
+	/// 获取客户显示名称
+	///
+	/// @param name 客户名称
+	/// @return 客户显示名称
+	private String displayCustomerName(String name) {
+		return textOrDefault(name == null ? null : name.trim(), "未知客户");
+	}
+
+	/// 获取非空文本
+	///
+	/// @param value 原文本
+	/// @param defaultValue 默认文本
+	/// @return 非空文本
+	private String textOrDefault(String value, String defaultValue) {
+		return isBlank(value) ? defaultValue : value;
+	}
+
+	/// 判断文本为空
+	///
+	/// @param value 文本
+	/// @return true 为文本为空
+	private boolean isBlank(String value) {
+		return value == null || value.isBlank();
+	}
+
+	/// 获取安全长整数
+	///
+	/// @param value 原值
+	/// @return 非空数值
+	private long safeLong(Long value) {
+		return value == null ? 0L : value;
+	}
+
+	/// 订单提醒条目
+	private record ReminderEntry(GaoOrderReminderCustomer order, Set<String> actionSet) {
 	}
 
 	private enum ReminderType {

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

@@ -0,0 +1,43 @@
+package com.imyeyu.api.modules.gao.service.implement;
+
+import com.imyeyu.api.modules.gao.mapper.GaoPointChartMapper;
+import com.imyeyu.api.modules.gao.service.GaoPointChartService;
+import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
+import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
+import com.imyeyu.java.bean.timi.TimiException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/// 门店积分图表统计服务实现
+///
+/// @author Codex
+/// @since 2026-09-23
+@Service
+@RequiredArgsConstructor
+public class GaoPointChartServiceImplement implements GaoPointChartService {
+
+	private final GaoPointChartMapper mapper;
+
+	@Override
+	public List<GaoPointDailyStatView> dailyTrend(GaoStoreChartReq req) {
+		checkRangeReq(req);
+		return mapper.selectDailyTrend(req);
+	}
+
+	@Override
+	public List<GaoPointRedemptionProductRankView> redemptionProductRank(GaoStoreChartReq req) {
+		checkRangeReq(req);
+		return mapper.selectRedemptionProductRank(req);
+	}
+
+	private void checkRangeReq(GaoStoreChartReq req) {
+		TimiException.required(req, "积分图表请求不能为空");
+		TimiException.required(req.getStoreId(), "积分图表门店不能为空");
+		TimiException.required(req.getBeginAt(), "积分图表开始时间不能为空");
+		TimiException.required(req.getEndAt(), "积分图表结束时间不能为空");
+		TimiException.requiredTrue(req.getBeginAt() <= req.getEndAt(), "积分图表结束时间早于开始时间");
+	}
+}

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

@@ -5,16 +5,17 @@ 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.gao.entity.GaoPointRedeemSku;
+import com.imyeyu.api.modules.gao.mapper.GaoPointRedemptionMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoPointRedeemSkuMapper;
 import com.imyeyu.api.modules.gao.service.GaoPointRedeemSkuService;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
 import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
 import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPage;
+import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPageResult;
 import com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuRequest;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
-import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.utils.Time;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -35,15 +36,24 @@ import java.util.UUID;
 public class GaoPointRedeemSkuServiceImplement implements GaoPointRedeemSkuService {
 
 	private final GaoPointRedeemSkuMapper mapper;
+	private final GaoPointRedemptionMapper redemptionMapper;
 	private final GaoProductService productService;
 	private final GaoProductSkuService skuService;
 	private final GaoStoreScopeService storeScopeService;
 
 	@Override
-	public PageResult<GaoPointRedeemSku> pageByQuery(GaoPointRedeemSkuPage page) {
+	public GaoPointRedeemSkuPageResult pageByQuery(GaoPointRedeemSkuPage page) {
 		TimiException.required(page, "not found redeem sku page");
-		PageResult<GaoPointRedeemSku> result = new PageResult<>();
+		GaoPointRedeemSkuPageResult result = new GaoPointRedeemSkuPageResult();
 		result.setTotal(mapper.countByQuery(page));
+		if (page.getSkuId() != null && !page.getSkuId().isBlank()) {
+			GaoPointRedeemSkuPageResult summary = redemptionMapper.selectSkuSummaryByStoreIdAndSkuId(
+				page.getStoreId(), page.getSkuId()
+			);
+			result.setRedeemedBaseQuantityTotal(summary.getRedeemedBaseQuantityTotal());
+			result.setReturnedBaseQuantityTotal(summary.getReturnedBaseQuantityTotal());
+			result.setNetRedeemedBaseQuantityTotal(summary.getNetRedeemedBaseQuantityTotal());
+		}
 		List<GaoPointRedeemSku> list = mapper.selectByQuery(page);
 		fillTransient(list);
 		result.setList(list);

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

@@ -9,7 +9,9 @@ import com.imyeyu.api.modules.gao.entity.GaoProductSpec;
 import com.imyeyu.api.modules.gao.entity.GaoProductSpecValue;
 import com.imyeyu.api.modules.gao.entity.GaoProductSku;
 import com.imyeyu.api.modules.gao.entity.GaoProductStock;
+import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
 import com.imyeyu.api.modules.gao.mapper.GaoProductMapper;
+import com.imyeyu.api.modules.gao.mapper.GaoProductEditMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoProductStockMapper;
 import com.imyeyu.api.modules.gao.service.GaoProductCategoryService;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
@@ -17,6 +19,7 @@ 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.audit.AuditOperation;
+import com.imyeyu.api.modules.system.audit.OperationAuditContext;
 import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.util.PinyinUtil;
@@ -38,6 +41,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -50,6 +54,7 @@ import java.util.stream.Collectors;
 public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct, String> implements GaoProductService {
 
 	private final GaoProductMapper mapper;
+	private final GaoProductEditMapper editMapper;
 	private final GaoProductStockMapper stockMapper;
 	private final AttachmentService attachmentService;
 	private final ObjectProvider<GaoProductCategoryService> categoryServiceProvider;
@@ -111,7 +116,7 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		super.create(product);
 		Map<String, String> specValueIdMap = saveSpecs(product, product.getSpecList());
 		normalizeSkuSpecValueIds(product.getSkuList(), specValueIdMap);
-		saveSkus(product, product.getSkuList());
+		saveSkus(product, product.getSkuList(), true);
 		attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), product.getAttachmentList());
 	}
 
@@ -123,6 +128,23 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		TimiException.required(request.getId(), "not found product.id");
 		GaoProduct product = get(request.getId());
 		TimiException.required(product, "not found product");
+		product = mapper.selectForUpdate(product.getId());
+		TimiException.required(product, "not found product");
+		String oldName = product.getName();
+		String storeId = product.getStoreId();
+		List<GaoProductSku> existingSkuList = skuServiceProvider.getObject().listByProductId(product.getId());
+		boolean hasHistory = editMapper.countProductReferences(product.getId()) > 0
+			|| existingSkuList.stream()
+				.anyMatch(item -> editMapper.countSkuReferences(item.getId()) > 0
+					|| stockMapper.selectByStoreIdAndSkuIdList(storeId, List.of(item.getId())).stream()
+						.anyMatch(stock -> isNonZero(stock.getOnHandQuantity()) || isNonZero(stock.getReservedQuantity())));
+		if (hasHistory && isHistoricalCorrectionOnly(product, request, existingSkuList)) {
+			OperationAuditContext.skipSuccessAudit();
+		}
+		if (hasHistory && (request.getProductType() != null && request.getProductType() != product.getProductType()
+			|| request.getStockEnabled() != null && !request.getStockEnabled().equals(product.getStockEnabled()))) {
+			throw new TimiException(TimiCode.ERROR, "产品已有历史业务记录，不能修改产品类型或库存管理属性");
+		}
 		if (request.getProductType() == GaoProduct.ProductType.SERVICE && product.getProductType() != GaoProduct.ProductType.SERVICE) {
 			verifyNoReservedStock(product);
 		}
@@ -138,13 +160,128 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		prepare(product, product.getId());
 		super.update(product);
 		if (request.getSkuList() != null) {
-			saveSkus(product, request.getSkuList());
+			saveSkus(product, request.getSkuList(), false);
+		}
+		if (!oldName.equals(product.getName())) {
+			editMapper.updateProductOrderSnapshots(product.getId(), product.getName());
+			editMapper.updateProductFulfillmentSnapshots(product.getId(), product.getName());
+			editMapper.updateProductStockRecordSnapshots(product.getId(), product.getName());
+			editMapper.updateProductPackageSnapshots(product.getId(), product.getName());
+			editMapper.updateProductRedemptionSnapshots(product.getId(), product.getName());
 		}
 		if (request.getAttachmentList() != null) {
 			attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), request.getAttachmentList());
 		}
 	}
 
+	private boolean isHistoricalCorrectionOnly(GaoProduct current, GaoProduct request, List<GaoProductSku> currentSkuList) {
+		if (!Objects.equals(current.getCategoryId(), request.getCategoryId())
+			|| TimiJava.defaultIfNull(request.getProductType(), current.getProductType()) != current.getProductType()
+			|| !Objects.equals(TimiJava.defaultIfNull(request.getStockEnabled(), current.getStockEnabled()), current.getStockEnabled())
+			|| TimiJava.defaultIfNull(request.getStatus(), current.getStatus()) != current.getStatus()
+			|| !Objects.equals(TimiJava.defaultIfNull(request.getSort(), current.getSort()), current.getSort())
+			|| !sameText(current.getRemark(), request.getRemark())) {
+			return false;
+		}
+		if (request.getAttachmentList() != null && !sameAttachmentList(
+			attachmentService.listByBizId(Attachment.BizType.GAO_PRODUCT, current.getId()), request.getAttachmentList())) {
+			return false;
+		}
+		if (request.getSkuList() == null) {
+			return true;
+		}
+		if (request.getSkuList().size() != currentSkuList.size()) {
+			return false;
+		}
+		Map<String, GaoProductSku> currentById = currentSkuList.stream()
+			.collect(Collectors.toMap(GaoProductSku::getId, item -> item));
+		Set<String> requestedIdSet = new HashSet<>();
+		for (GaoProductSku requested : request.getSkuList()) {
+			GaoProductSku existing = requested.getId() == null ? null : currentById.get(requested.getId());
+			if (existing == null || !requestedIdSet.add(requested.getId())
+				|| !isHistoricalSkuCorrectionOnly(existing, requested)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private boolean isHistoricalSkuCorrectionOnly(GaoProductSku current, GaoProductSku request) {
+		if (!Objects.equals(normalizeText(current.getBarcode()), normalizeText(request.getBarcode()))
+			|| !Objects.equals(TimiJava.defaultIfNull(request.getStockEnabled(), current.getStockEnabled()), current.getStockEnabled())
+			|| !Objects.equals(TimiJava.defaultIfNull(request.getAllowDecimalQuantity(), current.getAllowDecimalQuantity()), current.getAllowDecimalQuantity())
+			|| !Objects.equals(current.getMinStockQuantity(), request.getMinStockQuantity())
+			|| TimiJava.defaultIfNull(request.getStatus(), current.getStatus()) != current.getStatus()
+			|| !Objects.equals(TimiJava.defaultIfNull(request.getSort(), current.getSort()), current.getSort())
+			|| !sameText(current.getRemark(), request.getRemark())
+			|| request.getBaseUnitMigrationRequest() != null
+			|| request.getAttachmentList() != null && !sameAttachmentList(current.getAttachmentList(), request.getAttachmentList())) {
+			return false;
+		}
+		List<String> currentSpecValueIdList = current.getSpecValueIdList();
+		List<String> requestSpecValueIdList = request.getSpecValueIdList();
+		if (requestSpecValueIdList != null && !new HashSet<>(currentSpecValueIdList).equals(new HashSet<>(requestSpecValueIdList))) {
+			return false;
+		}
+		return request.getUnitList() == null || isHistoricalUnitNameCorrectionOnly(current.getUnitList(), request.getUnitList());
+	}
+
+	private boolean isHistoricalUnitNameCorrectionOnly(List<GaoProductSkuUnit> currentList, List<GaoProductSkuUnit> requestList) {
+		if (requestList.size() != currentList.size()) {
+			return false;
+		}
+		Map<String, GaoProductSkuUnit> currentById = currentList.stream()
+			.collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
+		Set<String> requestedIdSet = new HashSet<>();
+		for (GaoProductSkuUnit requested : requestList) {
+			GaoProductSkuUnit existing = requested.getId() == null ? null : currentById.get(requested.getId());
+			if (existing == null || !requestedIdSet.add(requested.getId())
+				|| !Objects.equals(existing.getBaseQuantityPerUnit(), requested.getBaseQuantityPerUnit())
+				|| !Objects.equals(existing.getSalePrice(), requested.getSalePrice())
+				|| !Objects.equals(existing.getIsBase(), requested.getIsBase())
+				|| !Objects.equals(existing.getAllowPurchase(), requested.getAllowPurchase())
+				|| !Objects.equals(existing.getAllowSale(), requested.getAllowSale())
+				|| !Objects.equals(existing.getSort(), requested.getSort())) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private boolean sameAttachmentList(List<Attachment> currentList, List<Attachment> requestList) {
+		if (currentList == null || requestList == null || currentList.size() != requestList.size()) {
+			return false;
+		}
+		for (int index = 0; index < currentList.size(); index++) {
+			Attachment current = currentList.get(index);
+			Attachment requested = requestList.get(index);
+			if (!Objects.equals(current.getId(), requested.getId())
+				|| !Objects.equals(current.getBizType(), requested.getBizType())
+				|| !Objects.equals(current.getBizId(), requested.getBizId())
+				|| !Objects.equals(current.getAttachType(), requested.getAttachType())
+				|| !Objects.equals(current.getMongoId(), requested.getMongoId())
+				|| !Objects.equals(current.getTitle(), requested.getTitle())
+				|| !Objects.equals(current.getName(), requested.getName())
+				|| !Objects.equals(current.getMimeType(), requested.getMimeType())
+				|| !Objects.equals(current.getMetadata(), requested.getMetadata())
+				|| !Objects.equals(current.getSize(), requested.getSize())
+				|| !Objects.equals(current.getMd5(), requested.getMd5())
+				|| !Objects.equals(current.getIsDestroyed(), requested.getIsDestroyed())
+				|| !Objects.equals(current.getDestroyAt(), requested.getDestroyAt())) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private boolean sameText(String current, String request) {
+		return Objects.equals(normalizeText(current), normalizeText(request));
+	}
+
+	private String normalizeText(String value) {
+		return value == null ? null : value.trim();
+	}
+
 	private void verifyNoReservedStock(GaoProduct product) {
 		List<String> skuIdList = skuServiceProvider.getObject().listByProductId(product.getId()).stream()
 			.map(GaoProductSku::getId)
@@ -158,6 +295,10 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		TimiException.requiredTrue(!hasReservedStock, "当前产品存在预占库存，不能切换为服务产品，请先完成或取消相关订单");
 	}
 
+	private boolean isNonZero(BigDecimal value) {
+		return value != null && BigDecimal.ZERO.compareTo(value) != 0;
+	}
+
 	@OperationAudit(AuditOperation.GAO_PRODUCT_DISABLE)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
@@ -177,8 +318,17 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 	}
 
 	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	public void destroy(String id) {
-		throw new TimiException(TimiCode.ERROR, "已建立产品库的产品不允许物理删除");
+		GaoProduct product = mapper.selectForUpdate(id);
+		TimiException.required(product, "not found product");
+		TimiException.requiredTrue(editMapper.countProductReferences(id) == 0, "产品存在历史业务记录，不能物理移除");
+		for (GaoProductSku sku : skuServiceProvider.getObject().listByProductId(id)) {
+			skuServiceProvider.getObject().destroy(sku.getId());
+		}
+		specServiceProvider.getObject().destroyByProductId(id);
+		attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, id, List.of());
+		super.destroy(id);
 	}
 
 	private void prepare(GaoProduct product, String excludeId) {
@@ -201,18 +351,35 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		product.setUpdatedBy(userLoginService.getRequireLoginUserId());
 	}
 
-	private void saveSkus(GaoProduct product, List<com.imyeyu.api.modules.gao.entity.GaoProductSku> skuList) {
+	private void saveSkus(GaoProduct product, List<com.imyeyu.api.modules.gao.entity.GaoProductSku> skuList, boolean createDefault) {
 		List<com.imyeyu.api.modules.gao.entity.GaoProductSku> sourceList = skuList;
-		if (sourceList == null || sourceList.isEmpty()) {
+		if ((sourceList == null || sourceList.isEmpty()) && createDefault) {
 			com.imyeyu.api.modules.gao.entity.GaoProductSku sku = new com.imyeyu.api.modules.gao.entity.GaoProductSku();
 			sku.setProductId(product.getId()); sku.setCode(product.getCode()); sku.setName(product.getName());
 			com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit unit = new com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit();
 			unit.setName("件"); unit.setIsBase(true); unit.setBaseQuantityPerUnit(BigDecimal.ONE);
 			sku.setUnitList(List.of(unit)); sourceList = List.of(sku);
+		} else if (sourceList == null) {
+			sourceList = List.of();
 		}
+		List<com.imyeyu.api.modules.gao.entity.GaoProductSku> existingList = skuServiceProvider.getObject().listByProductId(product.getId());
+		Map<String, com.imyeyu.api.modules.gao.entity.GaoProductSku> existingById = existingList.stream()
+			.collect(Collectors.toMap(com.imyeyu.api.modules.gao.entity.GaoProductSku::getId, item -> item));
+		Set<String> retainedIdSet = new HashSet<>();
 		for (com.imyeyu.api.modules.gao.entity.GaoProductSku source : sourceList) {
 			source.setProductId(product.getId());
-			if (source.getId() == null) skuServiceProvider.getObject().create(source); else skuServiceProvider.getObject().update(source);
+			if (source.getId() == null) {
+				skuServiceProvider.getObject().create(source);
+			} else {
+				TimiException.required(existingById.get(source.getId()), "SKU 不存在或不属于当前产品");
+				retainedIdSet.add(source.getId());
+				skuServiceProvider.getObject().update(source);
+			}
+		}
+		for (com.imyeyu.api.modules.gao.entity.GaoProductSku existing : existingList) {
+			if (!retainedIdSet.contains(existing.getId())) {
+				skuServiceProvider.getObject().destroy(existing.getId());
+			}
 		}
 	}
 

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

@@ -11,16 +11,22 @@ import com.imyeyu.api.modules.gao.entity.GaoProduct;
 import com.imyeyu.api.modules.gao.entity.GaoProductSku;
 import com.imyeyu.api.modules.gao.entity.GaoProductSkuSpecValue;
 import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
+import com.imyeyu.api.modules.gao.entity.GaoProductStock;
 import com.imyeyu.api.modules.gao.entity.GaoProductSpec;
 import com.imyeyu.api.modules.gao.entity.GaoProductSpecValue;
 import com.imyeyu.api.modules.gao.mapper.GaoProductSkuMapper;
+import com.imyeyu.api.modules.gao.mapper.GaoProductEditMapper;
+import com.imyeyu.api.modules.gao.mapper.GaoProductStockMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoProductSkuSpecValueMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoProductSkuUnitMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoProductSpecMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoProductSpecValueMapper;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
 import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
+import com.imyeyu.api.modules.gao.vo.GaoProductSkuBaseUnitMigrationRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
+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.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
@@ -55,11 +61,14 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 	private static final BigDecimal ONE = BigDecimal.ONE;
 
 	private final GaoProductSkuMapper mapper;
+	private final GaoProductEditMapper editMapper;
+	private final GaoProductStockMapper stockMapper;
 	private final GaoProductSkuUnitMapper unitMapper;
 	private final GaoProductSkuSpecValueMapper skuSpecValueMapper;
 	private final GaoProductSpecMapper specMapper;
 	private final GaoProductSpecValueMapper valueMapper;
 	private final AttachmentService attachmentService;
+	private final LoggerService loggerService;
 	private final ObjectProvider<GaoProductService> productServiceProvider;
 	private final UserLoginService userLoginService;
 
@@ -190,6 +199,19 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 		return result;
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void refreshSpecHistorySnapshots(String productId) {
+		TimiException.required(productId, "not found productId");
+		for (GaoProductSku sku : mapper.selectByProductId(productId)) {
+			JsonNode snapshot = getSkuSpecSnapshot(sku);
+			editMapper.updateSkuOrderSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), snapshot);
+			editMapper.updateSkuFulfillmentSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), snapshot);
+			editMapper.updateSkuStockRecordSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), snapshot);
+			editMapper.updateSkuRedemptionSnapshots(sku.getId(), sku.getCode(), sku.getName(), snapshot);
+		}
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(GaoProductSku sku) {
@@ -205,8 +227,32 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 	public void update(GaoProductSku request) {
 		TimiException.required(request, "not found product sku");
 		TimiException.required(request.getId(), "not found product sku.id");
-		GaoProductSku sku = get(request.getId());
+		GaoProductSku sku = mapper.selectForUpdate(request.getId());
 		TimiException.required(sku, "not found product sku");
+		List<GaoProductSkuUnit> existingUnitList = unitMapper.selectBySkuId(sku.getId());
+		int referenceCount = editMapper.countSkuReferences(sku.getId());
+		List<String> existingSpecValueIds = currentSpecValueIds(sku.getId());
+		if (referenceCount > 0 && request.getSpecValueIdList() != null
+			&& !new HashSet<>(existingSpecValueIds).equals(new HashSet<>(request.getSpecValueIdList()))) {
+			throw new TimiException(TimiCode.ERROR, "SKU 已有历史业务记录，不能更换规格组合；请新建 SKU");
+		}
+		if (referenceCount > 0 && request.getStockEnabled() != null && !request.getStockEnabled().equals(sku.getStockEnabled())) {
+			throw new TimiException(TimiCode.ERROR, "SKU 已有历史业务记录，不能修改库存管理属性");
+		}
+		GaoProductSkuUnit oldBaseUnit = existingUnitList.stream().filter(unit -> Boolean.TRUE.equals(unit.getIsBase())).findFirst().orElseThrow();
+		List<GaoProductSkuUnit> requestedUnitList = request.getUnitList() == null ? existingUnitList : request.getUnitList();
+		GaoProductSkuUnit requestedBaseUnit = requestedUnitList.stream().filter(unit -> Boolean.TRUE.equals(unit.getIsBase())).findFirst().orElse(null);
+		boolean baseUnitChanged = requestedBaseUnit == null || !oldBaseUnit.getId().equals(requestedBaseUnit.getId());
+		GaoProductSkuBaseUnitMigrationRequest migrationRequest = request.getBaseUnitMigrationRequest();
+		BigDecimal migrationRatio = null;
+		if (baseUnitChanged) {
+			migrationRatio = validateBaseUnitMigration(oldBaseUnit, requestedBaseUnit, migrationRequest, sku.getId());
+		} else if (migrationRequest != null) {
+			throw new TimiException(TimiCode.ERROR, "新旧基础单位相同，不需要提交基础单位迁移比例");
+		}
+		if (request.getUnitList() != null && !baseUnitChanged) {
+			validateUnitConversionUnchanged(request.getUnitList(), existingUnitList);
+		}
 		sku.setCode(TimiJava.defaultIfNull(request.getCode(), sku.getCode()));
 		sku.setBarcode(request.getBarcode());
 		sku.setName(TimiJava.defaultIfNull(request.getName(), sku.getName()));
@@ -218,18 +264,49 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 		sku.setSort(TimiJava.defaultIfNull(request.getSort(), sku.getSort()));
 		sku.setRemark(request.getRemark());
 		sku.setSpecValueIdList(request.getSpecValueIdList() == null ? currentSpecValueIds(sku.getId()) : request.getSpecValueIdList());
-		sku.setUnitList(request.getUnitList() == null ? unitMapper.selectBySkuId(sku.getId()) : request.getUnitList());
+		sku.setUnitList(requestedUnitList);
+		if (migrationRatio != null) {
+			applyBaseUnitMigration(sku, oldBaseUnit, requestedBaseUnit, existingUnitList, migrationRequest, migrationRatio);
+			stockMapper.selectForUpdate(sku.getStoreId(), sku.getId());
+			if (editMapper.countMigrationPrecisionLoss(sku.getId(), requestedBaseUnit.getId(), migrationRatio) > 0) {
+				throw new TimiException(TimiCode.ERROR, "基础单位迁移会产生超出字段精度的数量，未执行任何变更");
+			}
+			editMapper.scaleSkuMinimumStock(sku.getId(), migrationRatio);
+			editMapper.scaleProductStock(sku.getId(), migrationRatio);
+			editMapper.scaleSalesOrderItems(sku.getId(), migrationRatio);
+			editMapper.scaleFulfillmentItems(sku.getId(), migrationRatio);
+			editMapper.scaleStockRecords(sku.getId(), migrationRatio);
+			editMapper.scalePackageConfigItems(sku.getId(), migrationRatio);
+			editMapper.scalePointRedemptions(sku.getId(), migrationRatio);
+			editMapper.scalePointRedemptionReturns(sku.getId(), migrationRatio);
+		}
 		prepare(sku, sku.getId());
 		super.update(sku);
 		if (request.getSpecValueIdList() != null) {
 			saveSpecValues(sku.getId(), sku.getSpecValueIdList());
 		}
 		if (request.getUnitList() != null) {
-			saveUnits(sku.getId(), sku.getUnitList(), unitMapper.selectBySkuId(sku.getId()));
+			saveUnits(sku.getId(), sku.getUnitList(), existingUnitList);
 		}
 		if (request.getAttachmentList() != null) {
 			attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT_SKU, sku.getId(), request.getAttachmentList());
 		}
+		JsonNode skuSpecSnapshot = getSkuSpecSnapshot(sku);
+		editMapper.updateSkuOrderSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), skuSpecSnapshot);
+		editMapper.updateSkuFulfillmentSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), skuSpecSnapshot);
+		editMapper.updateSkuStockRecordSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), skuSpecSnapshot);
+		editMapper.updateSkuPackageSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary());
+		editMapper.updateSkuRedemptionSnapshots(sku.getId(), sku.getCode(), sku.getName(), skuSpecSnapshot);
+		if (migrationRatio != null) {
+			GaoProductSkuUnit migratedTarget = unitMapper.selectBySkuId(sku.getId()).stream()
+				.filter(unit -> unit.getIsBase() && unit.getName().equals(requestedBaseUnit.getName().trim()))
+				.findFirst().orElseThrow();
+			Logger migrationLog = new Logger(Logger.Module.GAO, Logger.Level.INFO, "GAO_PRODUCT_SKU_BASE_UNIT_MIGRATION");
+			migrationLog.setContent("skuId=%s;oldBaseUnitId=%s;oldBaseUnitName=%s;newBaseUnitId=%s;newBaseUnitName=%s;oldToNewBaseRatio=%s".formatted(
+				sku.getId(), oldBaseUnit.getId(), oldBaseUnit.getName(), migratedTarget.getId(), migratedTarget.getName(), migrationRatio.toPlainString()));
+			migrationLog.setResult(sku.getId());
+			loggerService.createSync(migrationLog);
+		}
 	}
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
@@ -249,8 +326,24 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 	}
 
 	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	public void destroy(String id) {
-		throw new TimiException(TimiCode.ERROR, "已建立 SKU 的产品不允许物理删除");
+		GaoProductSku sku = mapper.selectForUpdate(id);
+		TimiException.required(sku, "not found product sku");
+		TimiException.requiredTrue(editMapper.countSkuReferences(id) == 0, "SKU 存在历史业务记录，不能物理移除");
+		List<GaoProductStock> stockList = stockMapper.selectByStoreIdAndSkuIdList(sku.getStoreId(), List.of(id));
+		TimiException.requiredTrue(stockList.stream().allMatch(stock -> isZero(stock.getOnHandQuantity()) && isZero(stock.getReservedQuantity())),
+			"SKU 存在库存或预占库存，不能物理移除");
+		for (GaoProductSkuUnit unit : unitMapper.selectBySkuId(id)) {
+			TimiException.requiredTrue(editMapper.countUnitReferences(unit.getId()) == 0, "SKU 单位存在历史业务引用，不能物理移除 SKU");
+			unitMapper.destroy(unit.getId());
+		}
+		skuSpecValueMapper.deleteBySkuId(id);
+		for (GaoProductStock stock : stockList) {
+			stockMapper.destroy(stock.getId());
+		}
+		attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT_SKU, id, List.of());
+		super.destroy(id);
 	}
 
 	private void prepare(GaoProductSku sku, String excludeId) {
@@ -326,6 +419,7 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 			unit.setBaseQuantityPerUnit(TimiJava.defaultIfNull(source.getBaseQuantityPerUnit(), ONE));
 			TimiException.requiredTrue(0 < unit.getBaseQuantityPerUnit().signum(), "基础单位数量系数必须大于 0");
 			TimiException.requiredTrue(6 >= unit.getBaseQuantityPerUnit().scale(), "基础单位数量系数最多保留六位小数");
+			TimiException.requiredTrue(12 >= unit.getBaseQuantityPerUnit().precision() - unit.getBaseQuantityPerUnit().scale(), "基础单位数量系数超出最大值");
 			if (source.getSalePrice() != null) {
 				TimiException.requiredTrue(0 <= source.getSalePrice(), "单位建议售价不能为负数");
 			}
@@ -345,6 +439,69 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 		return result;
 	}
 
+	private BigDecimal validateBaseUnitMigration(GaoProductSkuUnit oldBaseUnit, GaoProductSkuUnit newBaseUnit,
+												 GaoProductSkuBaseUnitMigrationRequest request, String skuId) {
+		TimiException.required(request, "切换基础单位时必须提交新旧基础单位换算比例");
+		TimiException.required(newBaseUnit, "SKU 必须指定新的基础单位");
+		TimiException.requiredTrue(newBaseUnit.getIsBase(), "迁移目标必须是新的基础单位");
+		TimiException.required(newBaseUnit.getName(), "新基础单位名称不能为空");
+		boolean targetMatches = request.getTargetUnitId() != null && !request.getTargetUnitId().isBlank()
+			? request.getTargetUnitId().equals(newBaseUnit.getId())
+			: request.getTargetUnitName() != null && request.getTargetUnitName().trim().equals(newBaseUnit.getName().trim());
+		TimiException.requiredTrue(targetMatches, "基础单位迁移目标与 SKU 单位列表不一致");
+		BigDecimal ratio = request.getOldToNewBaseRatio();
+		TimiException.required(ratio, "基础单位迁移比例不能为空");
+		TimiException.requiredTrue(0 < ratio.signum(), "基础单位迁移比例必须大于 0");
+		TimiException.requiredTrue(6 >= ratio.scale(), "基础单位迁移比例最多保留六位小数");
+		TimiException.requiredTrue(12 >= ratio.precision() - ratio.scale(), "基础单位迁移比例超出最大值");
+		return ratio;
+	}
+
+	private void applyBaseUnitMigration(GaoProductSku sku, GaoProductSkuUnit oldBaseUnit,
+										 GaoProductSkuUnit newBaseUnit, List<GaoProductSkuUnit> existingUnitList,
+										 GaoProductSkuBaseUnitMigrationRequest request, BigDecimal ratio) {
+		Map<String, GaoProductSkuUnit> existingById = existingUnitList.stream()
+			.collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
+		for (GaoProductSkuUnit unit : sku.getUnitList()) {
+			boolean target = newBaseUnit.getId() != null
+				? newBaseUnit.getId().equals(unit.getId())
+				: newBaseUnit.getName().trim().equals(unit.getName().trim());
+			if (target) {
+				unit.setBaseQuantityPerUnit(ONE);
+				continue;
+			}
+			GaoProductSkuUnit existing = unit.getId() == null ? null : existingById.get(unit.getId());
+			BigDecimal oldFactor = existing == null
+				? TimiJava.defaultIfNull(unit.getBaseQuantityPerUnit(), ONE)
+				: existing.getBaseQuantityPerUnit();
+			BigDecimal newFactor = oldFactor.multiply(ratio).stripTrailingZeros();
+			TimiException.requiredTrue(6 >= Math.max(newFactor.scale(), 0), "单位换算系数迁移后超过六位小数，请调整换算比例");
+			unit.setBaseQuantityPerUnit(newFactor);
+		}
+		if (sku.getMinStockQuantity() != null) {
+			BigDecimal migratedMinimumStock = sku.getMinStockQuantity().multiply(ratio).stripTrailingZeros();
+			TimiException.requiredTrue(3 >= Math.max(migratedMinimumStock.scale(), 0), "最低库存迁移后超过三位小数，请调整换算比例");
+			sku.setMinStockQuantity(migratedMinimumStock);
+		}
+	}
+
+	private void validateUnitConversionUnchanged(List<GaoProductSkuUnit> requestedUnitList,
+												 List<GaoProductSkuUnit> existingUnitList) {
+		Map<String, GaoProductSkuUnit> existingById = existingUnitList.stream()
+			.collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
+		for (GaoProductSkuUnit requested : requestedUnitList) {
+			GaoProductSkuUnit existing = requested.getId() == null ? null : existingById.get(requested.getId());
+			BigDecimal requestedFactor = TimiJava.defaultIfNull(requested.getBaseQuantityPerUnit(), ONE);
+			if (existing != null && existing.getBaseQuantityPerUnit().compareTo(requestedFactor) != 0) {
+				throw new TimiException(TimiCode.ERROR, "已保存单位的换算系数不能直接修改；切换基础单位时请提交迁移比例");
+			}
+		}
+	}
+
+	private boolean isZero(BigDecimal value) {
+		return value == null || BigDecimal.ZERO.compareTo(value) == 0;
+	}
+
 	private void saveUnits(String skuId, List<GaoProductSkuUnit> unitList, List<GaoProductSkuUnit> existingUnitList) {
 		Map<String, GaoProductSkuUnit> existingById = existingUnitList.stream().collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
 		Set<String> retainedIdSet = new HashSet<>();
@@ -368,10 +525,21 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 			} else {
 				retainedIdSet.add(existing.getId());
 				TimiException.requiredTrue(1 == unitMapper.updateUnit(unit), "SKU 单位更新失败");
+				if (!existing.getName().equals(unit.getName())) {
+					editMapper.updateUnitOrderSnapshots(existing.getId(), unit.getName());
+					editMapper.updateUnitFulfillmentSnapshots(existing.getId(), unit.getName());
+					editMapper.updateUnitStockRecordSnapshots(existing.getId(), unit.getName());
+					editMapper.updateUnitPackageSnapshots(existing.getId(), unit.getName());
+					editMapper.updateUnitRedemptionSnapshots(existing.getId(), unit.getName());
+				}
+			}
+		}
+		for (GaoProductSkuUnit existing : existingUnitList) {
+			if (!retainedIdSet.contains(existing.getId())) {
+				TimiException.requiredTrue(editMapper.countUnitReferences(existing.getId()) == 0, "SKU 单位存在历史业务引用，不能物理移除");
+				unitMapper.destroy(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/GaoProductSpecServiceImplement.java

@@ -1,5 +1,6 @@
 package com.imyeyu.api.modules.gao.service.implement;
 
+import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.gao.entity.GaoProduct;
 import com.imyeyu.api.modules.gao.entity.GaoProductSpec;
 import com.imyeyu.api.modules.gao.entity.GaoProductSpecValue;
@@ -7,10 +8,13 @@ import com.imyeyu.api.modules.gao.mapper.GaoProductSpecMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoProductSpecValueMapper;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
 import com.imyeyu.api.modules.gao.service.GaoProductSpecService;
+import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -27,6 +31,7 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
 	private final GaoProductSpecMapper specMapper;
 	private final GaoProductSpecValueMapper valueMapper;
 	private final GaoProductService productService;
+	private final ObjectProvider<GaoProductSkuService> skuServiceProvider;
 
 	@Override
 	public List<GaoProductSpec> listByProductId(String productId) {
@@ -41,6 +46,12 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
 		return specMapper.selectProductIdBySpecId(specId);
 	}
 
+	@Override
+	public String getProductIdBySpecValueId(String specValueId) {
+		GaoProductSpecValue value = valueMapper.selectById(specValueId);
+		return value == null ? null : specMapper.selectProductIdBySpecId(value.getSpecId());
+	}
+
 	@Override
 	public void createSpec(GaoProductSpec spec) {
 		TimiException.required(spec, "not found product spec");
@@ -51,6 +62,28 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
 		specMapper.insert(spec);
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void updateSpec(GaoProductSpec request) {
+		TimiException.required(request, "not found product spec");
+		TimiException.required(request.getId(), "not found product spec.id");
+		String productId = specMapper.selectProductIdBySpecId(request.getId());
+		TimiException.required(productId, "产品规格不存在");
+		GaoProductSpec existing = specMapper.selectByProductId(productId).stream()
+			.filter(item -> item.getId().equals(request.getId())).findFirst().orElseThrow();
+		String name = requiredText(request.getName(), "规格名称不能为空");
+		Integer sort = TimiJava.defaultIfNull(request.getSort(), existing.getSort());
+		if (existing.getName().equals(name) && existing.getSort().equals(sort)) {
+			return;
+		}
+		GaoProductSpec spec = new GaoProductSpec();
+		spec.setId(request.getId());
+		spec.setName(name);
+		spec.setSort(sort);
+		TimiException.requiredTrue(1 == specMapper.updateSpec(spec), "产品规格更新失败");
+		skuServiceProvider.getObject().refreshSpecHistorySnapshots(productId);
+	}
+
 	@Override
 	public void createValue(GaoProductSpecValue value) {
 		TimiException.required(value, "not found product spec value");
@@ -61,5 +94,40 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
 		valueMapper.insert(value);
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void updateValue(GaoProductSpecValue request) {
+		TimiException.required(request, "not found product spec value");
+		TimiException.required(request.getId(), "not found product spec value.id");
+		GaoProductSpecValue existing = valueMapper.selectById(request.getId());
+		TimiException.required(existing, "产品规格值不存在");
+		String productId = specMapper.selectProductIdBySpecId(existing.getSpecId());
+		TimiException.required(productId, "产品规格不存在");
+		String name = requiredText(request.getName(), "规格值名称不能为空");
+		Integer sort = TimiJava.defaultIfNull(request.getSort(), existing.getSort());
+		if (existing.getName().equals(name) && existing.getSort().equals(sort)) {
+			return;
+		}
+		GaoProductSpecValue value = new GaoProductSpecValue();
+		value.setId(existing.getId());
+		value.setSpecId(existing.getSpecId());
+		value.setName(name);
+		value.setSort(sort);
+		TimiException.requiredTrue(1 == valueMapper.updateValue(value), "产品规格值更新失败");
+		skuServiceProvider.getObject().refreshSpecHistorySnapshots(productId);
+	}
+
+	@Override
+	public void destroyByProductId(String productId) {
+		List<GaoProductSpec> specList = specMapper.selectByProductId(productId);
+		List<String> specIdList = specList.stream().map(GaoProductSpec::getId).toList();
+		for (GaoProductSpecValue value : valueMapper.selectBySpecIdList(specIdList)) {
+			valueMapper.destroy(value.getId());
+		}
+		for (GaoProductSpec spec : specList) {
+			specMapper.destroy(spec.getId());
+		}
+	}
+
 	private String requiredText(String value, String message) { TimiException.required(value, message); String result = value.trim(); TimiException.requiredTrue(!result.isEmpty(), message); return result; }
 }

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

@@ -10,12 +10,13 @@ import com.imyeyu.api.modules.gao.mapper.GaoProductStockRecordMapper;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoProductStockRecordService;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordPage;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordPageResult;
+import com.imyeyu.api.modules.gao.vo.GaoProductStockRecordSkuSummaryView;
 import com.imyeyu.api.modules.user.entity.User;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
-import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
@@ -45,12 +46,17 @@ public class GaoProductStockRecordServiceImplement extends AbstractEntityService
 	}
 
 	@Override
-	public PageResult<GaoProductStockRecord> pageByQuery(GaoProductStockRecordPage page) {
+	public GaoProductStockRecordPageResult pageByQuery(GaoProductStockRecordPage page) {
 		TimiException.required(page, "not found stock record page");
-		PageResult<GaoProductStockRecord> result = new PageResult<>();
+		GaoProductStockRecordPageResult result = new GaoProductStockRecordPageResult();
 		result.setTotal(mapper.countByQuery(page));
 		result.setList(mapper.selectByQuery(page));
 		fillTransient(result.getList());
+		if (page.getSkuId() != null && !page.getSkuId().isBlank()) {
+			GaoProductStockRecordSkuSummaryView summary = mapper.selectSkuBaseUnitSummaryByQuery(page);
+			result.setInBaseQuantityTotal(summary.getInBaseQuantityTotal());
+			result.setOutBaseQuantityTotal(summary.getOutBaseQuantityTotal());
+		}
 		return result;
 	}
 

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

@@ -16,6 +16,7 @@ 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.GaoProductStockManualInBatchRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockManualRevokeRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockPage;
 import com.imyeyu.api.modules.gao.vo.GaoProductStockProductView;
@@ -150,6 +151,11 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		return change(request, GaoProductStockRecord.OperationType.INITIAL_IN);
 	}
 
+	/// 批量手工入库
+	///
+	/// @param request 批量手工入库请求
+	/// @return 更新后的库存列表
+	/// @throws TimiException 请求或库存校验失败
 	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_MANUAL_IN)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
@@ -157,6 +163,56 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		return change(request, GaoProductStockRecord.OperationType.MANUAL_IN);
 	}
 
+	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_MANUAL_IN)
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public List<GaoProductStock> manualInBatch(GaoProductStockManualInBatchRequest request) {
+		TimiException.required(request, "not found stock batch request");
+		String requestNo = requiredText(request.getRequestNo(), "not found requestNo");
+		String storeId = storeScopeService.resolveStoreId(request.getStoreId());
+		TimiException.required(storeId, "not found storeId");
+		String remark = request.getRemark();
+		TimiException.requiredTrue(hasText(remark), "库存操作必须填写备注");
+		TimiException.requiredTrue(request.getItemList() != null && !request.getItemList().isEmpty(), "批量入库至少需要一个 SKU");
+		List<GaoProductStockManualInBatchRequest.Item> requestItemList = new ArrayList<>(request.getItemList());
+		requestItemList.removeIf(item -> item != null && item.getQuantity() != null && item.getQuantity().signum() == 0);
+		TimiException.requiredTrue(!requestItemList.isEmpty(), "批量入库至少需要一个正数量 SKU");
+		for (GaoProductStockManualInBatchRequest.Item item : requestItemList) {
+			TimiException.required(item, "库存变更项不能为空");
+			item.setSkuId(requiredText(item.getSkuId(), "not found skuId"));
+			item.setSkuUnitId(requiredText(item.getSkuUnitId(), "not found skuUnitId"));
+		}
+		requestItemList.sort(Comparator.comparing(GaoProductStockManualInBatchRequest.Item::getSkuId));
+		Set<String> skuIdSet = new HashSet<>();
+		List<GaoStockChangeItem> changeItemList = new ArrayList<>();
+		for (GaoProductStockManualInBatchRequest.Item item : requestItemList) {
+			TimiException.requiredTrue(skuIdSet.add(item.getSkuId()), "同一库存操作不能重复 SKU");
+			GaoProductSkuUnitSelection selection = skuService.getSkuUnit(storeId, item.getSkuId(), item.getSkuUnitId(), true);
+			GaoProductSku sku = selection.getSku();
+			GaoProduct product = selection.getProduct();
+			GaoProductSkuUnit unit = selection.getUnit();
+			TimiException.requiredTrue(Boolean.TRUE.equals(sku.getStockEnabled()), "该 SKU 未启用库存管理");
+			BigDecimal quantity = validateQuantity(sku, item.getQuantity());
+			BigDecimal baseQuantity = quantity.multiply(unit.getBaseQuantityPerUnit());
+			GaoStockChangeItem changeItem = GaoStockChangeItem.of(product, sku, unit, quantity, baseQuantity);
+			changeItem.setSkuSpecSnapshot(skuService.getSkuSpecSnapshot(sku));
+			changeItemList.add(changeItem);
+		}
+		List<GaoProductStockRecord> existingList = recordService.listByRequestNo(storeId, requestNo);
+		if (!existingList.isEmpty()) {
+			verifyExistingManualInBatch(existingList, changeItemList, remark);
+			List<GaoProductStock> result = new ArrayList<>();
+			for (GaoStockChangeItem item : changeItemList) {
+				result.add(detail(storeId, item.getSkuId()));
+			}
+			return result;
+		}
+		Map<String, List<Attachment>> itemAttachmentMap = prepareManualInBatchAttachments(requestItemList, request.getAttachmentList());
+		return executeInternal(storeId, changeItemList.getFirst().getSkuId(), changeItemList, requestNo,
+			userLoginService.getRequireLoginUserId(), GaoProductStockRecord.OperationType.MANUAL_IN, Time.now(), remark, null,
+			GaoProductStockRecord.BizType.PRODUCT_STOCK, itemAttachmentMap, true);
+	}
+
 	@OperationAudit(AuditOperation.GAO_PRODUCT_STOCK_MANUAL_OUT)
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
@@ -232,6 +288,14 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		return executeInternal(storeId, bizId, items, requestNo, operatorUserId, GaoProductStockRecord.OperationType.ORDER_OUT, null);
 	}
 
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public List<GaoProductStock> outForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo,
+		String operatorUserId, List<Attachment> attachmentList) {
+		return executeInternal(storeId, bizId, items, requestNo, operatorUserId,
+			GaoProductStockRecord.OperationType.ORDER_OUT, null, null, attachmentList);
+	}
+
 	@Override
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	public List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId) {
@@ -383,6 +447,13 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 	private List<GaoProductStock> executeInternal(String storeId, String bizId, List<GaoStockChangeItem> sourceList, String requestNo,
 		String operatorUserId, GaoProductStockRecord.OperationType operationType, Long occurredAt, String remark, List<Attachment> attachmentList,
 		GaoProductStockRecord.BizType bizType) {
+		return executeInternal(storeId, bizId, sourceList, requestNo, operatorUserId, operationType, occurredAt, remark, attachmentList,
+			bizType, null, false);
+	}
+
+	private List<GaoProductStock> executeInternal(String storeId, String bizId, List<GaoStockChangeItem> sourceList, String requestNo,
+		String operatorUserId, GaoProductStockRecord.OperationType operationType, Long occurredAt, String remark, List<Attachment> attachmentList,
+		GaoProductStockRecord.BizType bizType, Map<String, List<Attachment>> itemAttachmentMap, boolean skuAsBizId) {
 		TimiException.required(storeId, "not found storeId");
 		TimiException.required(bizId, "not found stock bizId");
 		TimiException.requiredTrue(sourceList != null && !sourceList.isEmpty(), "库存变更至少需要一个产品");
@@ -399,7 +470,11 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		}
 		List<GaoProductStockRecord> existingList = recordService.listByRequestNo(storeId, normalizedRequestNo);
 		if (!existingList.isEmpty()) {
+			if (skuAsBizId) {
+				verifyExistingManualInBatch(existingList, itemList, remark);
+			} else {
 				verifyExistingList(existingList, itemList, operationType, bizId);
+			}
 			List<GaoProductStock> result = new ArrayList<>();
 			for (GaoStockChangeItem item : itemList) {
 				result.add(detail(storeId, item.getSkuId()));
@@ -439,13 +514,19 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 			record.setReservedBefore(reservedBefore);
 			record.setReservedAfter(reservedAfter);
 			record.setBizType(bizType);
-			record.setBizId(bizId);
+			record.setBizId(skuAsBizId ? item.getSkuId() : bizId);
 			record.setSourceRecordId(item.getSourceRecordId());
 			record.setRequestNo(normalizedRequestNo);
 			record.setOperatorUserId(operatorUserId);
-			record.setOccurredAt(TimiJava.defaultIfNull(occurredAt, Time.now()));
+			record.setOccurredAt(occurredAt == null ? Time.now() : occurredAt);
 			record.setRemark(remark);
-			recordService.createOperationRecord(record, attachmentList);
+			List<Attachment> recordAttachmentList = itemAttachmentMap == null
+				? attachmentList : itemAttachmentMap.get(item.getSkuId());
+			recordService.createOperationRecord(record,
+				operationType == GaoProductStockRecord.OperationType.ORDER_OUT ? null : recordAttachmentList);
+			if (operationType == GaoProductStockRecord.OperationType.ORDER_OUT) {
+				copyAttachments(record.getId(), attachmentList);
+			}
 			stock.setOnHandQuantity(onHandAfter);
 			stock.setReservedQuantity(reservedAfter);
 			stock.setUpdatedBy(operatorUserId);
@@ -455,6 +536,23 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		return result;
 	}
 
+	/// 复制履约附件到出库流水
+	///
+	/// @param recordId 出库流水 ID
+	/// @param sourceAttachmentList 履约附件
+	private void copyAttachments(String recordId, List<Attachment> sourceAttachmentList) {
+		for (Attachment source : TimiJava.safeIterable(sourceAttachmentList)) {
+			if (source == null) {
+				continue;
+			}
+			TimiException.required(source.getId(), "履约附件 ID 不能为空");
+			Attachment copy = attachmentService.clone(source.getId());
+			copy.setBizType(Attachment.BizType.GAO_STOCK_RECORD);
+			copy.setBizId(recordId);
+			attachmentService.update(copy);
+		}
+	}
+
 	private GaoProductStock lockOrCreateStock(String storeId, String skuId) {
 		GaoProductStock stock = stockMapper.selectForUpdate(storeId, skuId);
 		if (stock != null) {
@@ -533,6 +631,74 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 		}
 	}
 
+	/// 校验批量手工入库幂等请求
+	///
+	/// @param existingList 已存在的库存流水
+	/// @param itemList 请求中的入库项
+	/// @param remark 批次备注
+	/// @throws TimiException 请求内容与已存在流水不一致
+	private void verifyExistingManualInBatch(List<GaoProductStockRecord> existingList, List<GaoStockChangeItem> itemList, String remark) {
+		TimiException.requiredTrue(existingList.size() == itemList.size(), "requestNo 对应库存操作内容不一致");
+		Map<String, GaoProductStockRecord> recordMap = new HashMap<>();
+		for (GaoProductStockRecord record : existingList) {
+			TimiException.requiredTrue(record.getOperationType() == GaoProductStockRecord.OperationType.MANUAL_IN
+				&& GaoProductStockRecord.BizType.PRODUCT_STOCK == record.getBizType()
+				&& record.getSkuId() != null && record.getSkuId().equals(record.getBizId()), "requestNo 已被其他库存操作使用");
+			TimiException.requiredTrue(recordMap.put(record.getSkuId(), record) == null, "requestNo 对应库存操作内容不一致");
+		}
+		TimiException.requiredTrue(recordMap.size() == itemList.size(), "requestNo 对应库存操作内容不一致");
+		for (GaoStockChangeItem item : itemList) {
+			GaoProductStockRecord record = recordMap.get(item.getSkuId());
+			TimiException.required(record, "requestNo 对应库存操作内容不一致");
+			TimiException.requiredTrue(item.getSkuUnitId().equals(record.getSkuUnitId())
+				&& record.getQuantity() != null && item.getQuantity().compareTo(record.getQuantity()) == 0
+				&& record.getBaseQuantity() != null && item.getBaseQuantity().compareTo(record.getBaseQuantity()) == 0
+				&& sameText(record.getRemark(), remark), "requestNo 对应库存操作内容不一致");
+		}
+	}
+
+	/// 准备批量入库附件并复制复用的全局临时附件
+	///
+	/// @param itemList 排序后的入库项
+	/// @param globalAttachmentList 全局附件列表
+	/// @return 按 SKU 分组的临时附件列表
+	/// @throws TimiException 附件无效或缺失
+	private Map<String, List<Attachment>> prepareManualInBatchAttachments(List<GaoProductStockManualInBatchRequest.Item> itemList,
+		List<Attachment> globalAttachmentList) {
+		Map<String, List<Attachment>> result = new HashMap<>();
+		Set<String> usedTempFileIdSet = new HashSet<>();
+		for (GaoProductStockManualInBatchRequest.Item item : itemList) {
+			boolean useGlobalAttachments = item.getAttachmentList() == null || item.getAttachmentList().isEmpty();
+			List<Attachment> sourceAttachmentList = useGlobalAttachments ? globalAttachmentList : item.getAttachmentList();
+			TimiException.requiredTrue(sourceAttachmentList != null && !sourceAttachmentList.isEmpty(), "每个 SKU 至少需要一个附件");
+			List<Attachment> attachmentList = new ArrayList<>();
+			for (Attachment source : sourceAttachmentList) {
+				TimiException.required(source, "入库附件不能为空");
+				String tempFileId = requiredText(source.getTempFileId(), "入库附件 tempFileId 不能为空");
+				Attachment tempFile = attachmentService.get(tempFileId);
+				TimiException.required(tempFile, "not found temp file");
+				TimiException.requiredTrue(tempFile.getBizType() == Attachment.BizType.TEMP_FILE, "入库附件必须是临时文件");
+				if (!usedTempFileIdSet.add(tempFileId)) {
+					TimiException.requiredTrue(useGlobalAttachments, "同一临时附件不能用于多个入库项");
+					Attachment clone = attachmentService.clone(tempFileId);
+					TimiException.required(clone, "not found cloned temp file");
+					TimiException.requiredTrue(clone.getBizType() == Attachment.BizType.TEMP_FILE, "克隆附件必须是临时文件");
+					tempFileId = requiredText(clone.getId(), "克隆附件 ID 不能为空");
+					TimiException.requiredTrue(usedTempFileIdSet.add(tempFileId), "克隆附件 ID 已被使用");
+				}
+				Attachment attachment = new Attachment();
+				attachment.setTempFileId(tempFileId);
+				attachment.setAttachType(source.getAttachType());
+				attachment.setName(source.getName());
+				attachment.setMetadata(source.getMetadata());
+				attachmentList.add(attachment);
+			}
+			TimiException.requiredTrue(!attachmentList.isEmpty(), "每个 SKU 至少需要一个附件");
+			result.put(item.getSkuId(), attachmentList);
+		}
+		return result;
+	}
+
 	private void fillBalance(GaoProductStock stock) {
 		stock.setOnHandQuantity(decimal(stock.getOnHandQuantity()));
 		stock.setReservedQuantity(decimal(stock.getReservedQuantity()));

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

@@ -9,6 +9,7 @@ import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
 import com.imyeyu.api.modules.gao.entity.GaoFundRecord;
+import com.imyeyu.api.modules.gao.entity.GaoOrderFulfillment;
 import com.imyeyu.api.modules.gao.entity.GaoProduct;
 import com.imyeyu.api.modules.gao.entity.GaoProductSku;
 import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
@@ -21,6 +22,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.GaoOrderPaymentService;
 import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
 import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
@@ -30,10 +32,18 @@ import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.service.GaoStoreService;
 import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
 import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerRow;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductSummaryView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerProductView;
+import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentRevokeRequest;
+import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRevokeRequest;
 import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
 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.GaoSalesOrderReceivableStatView;
 import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
 import com.imyeyu.api.modules.system.audit.AuditOperation;
 import com.imyeyu.api.modules.system.audit.OperationAudit;
@@ -59,6 +69,7 @@ import java.util.Collection;
 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;
@@ -81,6 +92,7 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 	private final GaoSalesOrderItemMapper itemMapper;
 	private final GaoFundRecordService fundRecordService;
 	private final ObjectProvider<GaoOrderFulfillmentService> fulfillmentServiceProvider;
+	private final ObjectProvider<GaoOrderPaymentService> paymentServiceProvider;
 	private final ObjectProvider<GaoOrderStraightThroughService> straightThroughServiceProvider;
 	private final GaoCustomerService customerService;
 	private final GaoProductService productService;
@@ -111,6 +123,80 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		return result;
 	}
 
+	@Override
+	public GaoSalesOrderReceivableStatView summary(GaoSalesOrderPage page) {
+		TimiException.required(page, "not found sales order summary page");
+		return mapper.selectSummaryByQuery(page);
+	}
+
+	@Override
+	public PageResult<GaoCustomerProductCustomerView> pageCustomerProduct(GaoCustomerProductPage page) {
+		TimiException.required(page, "not found customer product page");
+		PageResult<GaoCustomerProductCustomerView> result = new PageResult<>();
+		result.setTotal(mapper.countCustomerProductCustomerByQuery(page));
+		List<GaoCustomerProductCustomerRow> customerRows = mapper.selectCustomerProductCustomerByQuery(page);
+		if (customerRows.isEmpty()) {
+			result.setList(List.of());
+			return result;
+		}
+
+		List<String> customerIdList = customerRows.stream().map(GaoCustomerProductCustomerRow::getCustomerId).toList();
+		page.setCustomerIdList(customerIdList);
+		List<GaoCustomerProductView> itemList = mapper.selectCustomerProductByQuery(page);
+		Map<String, GaoCustomerProductCustomerView> customerMap = new LinkedHashMap<>();
+		Map<String, Map<String, GaoCustomerProductSummaryView>> purchasedProductMap = new HashMap<>();
+		Map<String, Map<String, GaoCustomerProductSummaryView>> availableProductMap = new HashMap<>();
+		for (GaoCustomerProductCustomerRow row : customerRows) {
+			GaoCustomerProductCustomerView customerView = new GaoCustomerProductCustomerView();
+			GaoCustomer customer = new GaoCustomer();
+			customer.setId(row.getCustomerId());
+			customer.setCode(row.getCustomerCode());
+			customer.setName(row.getCustomerName());
+			customerView.setCustomer(customer);
+			customerView.setOrderCount(row.getOrderCount());
+			customerView.setPurchasedProducts(new ArrayList<>());
+			customerView.setAvailableProducts(new ArrayList<>());
+			customerMap.put(row.getCustomerId(), customerView);
+		}
+		for (GaoCustomerProductView item : itemList) {
+			if (!customerMap.containsKey(item.getCustomerId())) {
+				continue;
+			}
+			mergeCustomerProduct(purchasedProductMap, item, item.getBaseQuantity());
+			if (decimal(item.getAvailableBaseQuantity()).compareTo(ZERO) > 0) {
+				mergeCustomerProduct(availableProductMap, item, item.getAvailableBaseQuantity());
+			}
+		}
+		for (GaoCustomerProductCustomerRow row : customerRows) {
+			GaoCustomerProductCustomerView customerView = customerMap.get(row.getCustomerId());
+			customerView.setPurchasedProducts(new ArrayList<>(purchasedProductMap.getOrDefault(row.getCustomerId(), Map.of()).values()));
+			customerView.setAvailableProducts(new ArrayList<>(availableProductMap.getOrDefault(row.getCustomerId(), Map.of()).values()));
+		}
+		result.setList(new ArrayList<>(customerMap.values()));
+		return result;
+	}
+
+	private void mergeCustomerProduct(Map<String, Map<String, GaoCustomerProductSummaryView>> productMap,
+		GaoCustomerProductView item, BigDecimal quantity) {
+		String customerId = item.getCustomerId();
+		String productName = item.getProductNameSnapshot() == null ? "未命名产品" : item.getProductNameSnapshot();
+		String unit = item.getBaseUnitName() == null ? item.getUnitSnapshot() : item.getBaseUnitName();
+		unit = unit == null ? "基础单位" : unit;
+		String productKey = (item.getProductIdSnapshot() == null ? productName : item.getProductIdSnapshot()) + "::" + unit;
+		Map<String, GaoCustomerProductSummaryView> customerProducts = productMap.computeIfAbsent(customerId, key -> new LinkedHashMap<>());
+		GaoCustomerProductSummaryView product = customerProducts.get(productKey);
+		if (product == null) {
+			product = new GaoCustomerProductSummaryView();
+			product.setProductIdSnapshot(item.getProductIdSnapshot());
+			product.setProductName(productName);
+			product.setQuantity(decimal(quantity));
+			product.setUnit(unit);
+			customerProducts.put(productKey, product);
+			return;
+		}
+		product.setQuantity(decimal(product.getQuantity()).add(decimal(quantity)));
+	}
+
 	@Override
 	public GaoSalesOrder detail(String id) {
 		GaoSalesOrder order = get(id);
@@ -245,7 +331,54 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 		}
 		TimiException.requiredTrue(order.getStatus() == GaoSalesOrder.Status.ACTIVE, "当前订单不可取消");
 		TimiException.requiredTrue(fundRecordService.countPendingReceiveByBizId(order.getId()) == 0, "订单存在待核销收款，不能取消");
-		TimiException.requiredTrue(fulfillmentServiceProvider.getObject().countPendingBySalesOrderId(order.getId()) == 0, "订单存在待履约操作，不能取消");
+		GaoOrderFulfillmentService fulfillmentService = fulfillmentServiceProvider.getObject();
+		TimiException.requiredTrue(fulfillmentService.countPendingBySalesOrderId(order.getId()) == 0, "订单存在待履约操作，不能取消");
+
+		List<GaoOrderFulfillmentRevokeRequest> fulfillmentRevokeList = request.getFulfillmentRevokeList();
+		Set<String> fulfillmentIdSet = new HashSet<>();
+		Set<String> selectedFulfillmentIdSet = new HashSet<>();
+		if (fulfillmentRevokeList != null && !fulfillmentRevokeList.isEmpty()) {
+			TimiException.requiredTrue(permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.ORDER_FULFILLMENT_REVOKE.getValue()), "缺少履约冲正权限");
+			for (GaoOrderFulfillment fulfillment : fulfillmentService.listBySalesOrderId(order.getId())) {
+				fulfillmentIdSet.add(fulfillment.getId());
+			}
+			for (GaoOrderFulfillmentRevokeRequest revokeRequest : fulfillmentRevokeList) {
+				TimiException.required(revokeRequest, "履约冲正请求不能为空");
+				TimiException.required(revokeRequest.getFulfillmentId(), "not found fulfillmentId");
+				TimiException.requiredTrue(fulfillmentIdSet.contains(revokeRequest.getFulfillmentId()), "履约单不属于当前订单");
+				TimiException.requiredTrue(selectedFulfillmentIdSet.add(revokeRequest.getFulfillmentId()), "履约单不能重复冲正");
+			}
+		}
+
+		List<GaoOrderPaymentRevokeRequest> fundRevokeList = request.getFundRevokeList();
+		Set<String> fundRecordIdSet = new HashSet<>();
+		Set<String> selectedFundRecordIdSet = new HashSet<>();
+		if (fundRevokeList != null && !fundRevokeList.isEmpty()) {
+			TimiException.requiredTrue(permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.FUND_REVOKE.getValue()), "缺少资金流水冲正权限");
+			for (GaoFundRecord fundRecord : fundRecordService.listByBizId(order.getId())) {
+				fundRecordIdSet.add(fundRecord.getId());
+			}
+			for (GaoOrderPaymentRevokeRequest revokeRequest : fundRevokeList) {
+				TimiException.required(revokeRequest, "资金冲正请求不能为空");
+				TimiException.required(revokeRequest.getFundRecordId(), "not found fundRecordId");
+				TimiException.requiredTrue(fundRecordIdSet.contains(revokeRequest.getFundRecordId()), "资金流水不属于当前订单");
+				TimiException.requiredTrue(selectedFundRecordIdSet.add(revokeRequest.getFundRecordId()), "资金流水不能重复冲正");
+			}
+		}
+
+		if (fulfillmentRevokeList != null) {
+			for (GaoOrderFulfillmentRevokeRequest revokeRequest : fulfillmentRevokeList) {
+				fulfillmentService.revoke(revokeRequest);
+			}
+		}
+		if (fundRevokeList != null && !fundRevokeList.isEmpty()) {
+			GaoOrderPaymentService paymentService = paymentServiceProvider.getObject();
+			for (GaoOrderPaymentRevokeRequest revokeRequest : fundRevokeList) {
+				paymentService.revoke(revokeRequest);
+			}
+		}
+
+		order = getForUpdate(order.getId());
 		String userId = userLoginService.getRequireLoginUserId();
 		GaoSalesOrder.RefundStatus refundStatus = safe(order.getPaidAmount()) == 0 ? GaoSalesOrder.RefundStatus.REFUNDED : GaoSalesOrder.RefundStatus.PENDING;
 		Long cancelledAt = Time.now();

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

@@ -0,0 +1,23 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+/// GAO 客户产品客户分页行
+///
+/// @author Codex
+/// @since 2026-09-18
+@Data
+public class GaoCustomerProductCustomerRow {
+
+	/// 客户 ID
+	private String customerId;
+
+	/// 客户编码
+	private String customerCode;
+
+	/// 客户姓名
+	private String customerName;
+
+	/// 相关订单数
+	private Long orderCount;
+}

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

@@ -0,0 +1,26 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.api.modules.gao.entity.GaoCustomer;
+import lombok.Data;
+
+import java.util.List;
+
+/// GAO 客户产品客户视图
+///
+/// @author Codex
+/// @since 2026-09-18
+@Data
+public class GaoCustomerProductCustomerView {
+
+	/// 客户
+	private GaoCustomer customer;
+
+	/// 相关订单数
+	private Long orderCount;
+
+	/// 已购买产品
+	private List<GaoCustomerProductSummaryView> purchasedProducts;
+
+	/// 当前可履约产品
+	private List<GaoCustomerProductSummaryView> availableProducts;
+}

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

@@ -0,0 +1,32 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
+import com.imyeyu.java.bean.BasePage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/// GAO 客户产品分页请求
+///
+/// @author Codex
+/// @since 2026-09-18
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GaoCustomerProductPage extends BasePage {
+
+	/// 门店 ID
+	private String storeId;
+
+	/// 客户 ID
+	private String customerId;
+
+	/// 客户、订单或产品关键词
+	private String keyword;
+
+	/// 产品来源
+	private GaoSalesOrderItem.ItemType itemType;
+
+	/// 内部批量查询客户 ID
+	private List<String> customerIdList;
+}

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

@@ -0,0 +1,25 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/// GAO 客户产品汇总视图
+///
+/// @author Codex
+/// @since 2026-09-18
+@Data
+public class GaoCustomerProductSummaryView {
+
+	/// 产品 ID 快照
+	private String productIdSnapshot;
+
+	/// 产品名称
+	private String productName;
+
+	/// 产品数量，使用基础单位
+	private BigDecimal quantity;
+
+	/// 基础单位名称
+	private String unit;
+}

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

@@ -0,0 +1,98 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/// GAO 客户产品明细视图
+///
+/// 每一行对应一个订单明细，数量使用基础单位，便于汇总客户产品。
+///
+/// @author Codex
+/// @since 2026-09-18
+@Data
+public class GaoCustomerProductView {
+
+	/// 订单明细 ID
+	private String id;
+
+	/// 销售订单 ID
+	private String salesOrderId;
+
+	/// 客户 ID
+	private String customerId;
+
+	/// 客户编码
+	private String customerCode;
+
+	/// 客户姓名
+	private String customerName;
+
+	/// 订单号
+	private String orderNo;
+
+	/// 订单类型
+	private GaoSalesOrder.OrderType orderType;
+
+	/// 订单状态
+	private GaoSalesOrder.Status orderStatus;
+
+	/// 下单时间
+	private Long purchasedAt;
+
+	/// 订单项类型
+	private GaoSalesOrderItem.ItemType itemType;
+
+	/// 是否赠送权益
+	private Boolean gifted;
+
+	/// SKU ID
+	private String skuId;
+
+	/// SKU 单位 ID
+	private String skuUnitId;
+
+	/// 产品名称快照
+	private String productNameSnapshot;
+
+	/// 产品 ID 快照
+	private String productIdSnapshot;
+
+	/// SKU 编码快照
+	private String skuCodeSnapshot;
+
+	/// SKU 名称快照
+	private String skuNameSnapshot;
+
+	/// 规格摘要快照
+	private String specSummarySnapshot;
+
+	/// 单位快照
+	private String unitSnapshot;
+
+	/// 当前基础单位名称
+	private String baseUnitName;
+
+	/// 基础单位数量系数快照
+	private BigDecimal baseQuantityPerUnitSnapshot;
+
+	/// 购买数量
+	private BigDecimal quantity;
+
+	/// 购买基础单位数量
+	private BigDecimal baseQuantity;
+
+	/// 待履约基础单位数量
+	private BigDecimal reservedBaseQuantity;
+
+	/// 已履约基础单位数量
+	private BigDecimal fulfilledBaseQuantity;
+
+	/// 剩余权益基础单位数量
+	private BigDecimal remainingBaseQuantity;
+
+	/// 当前可立即履约基础单位数量
+	private BigDecimal availableBaseQuantity;
+}

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

@@ -5,6 +5,8 @@ import com.imyeyu.java.bean.BasePage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /// GAO 统一履约分页查询请求
 ///
 /// @author Codex
@@ -22,6 +24,9 @@ public class GaoOrderFulfillmentPage extends BasePage {
 	/// 客户 ID
 	private String customerId;
 
+	/// SKU ID 列表，任一 SKU 命中即匹配
+	private List<String> skuIdList;
+
 	/// 履约状态
 	private GaoOrderFulfillment.Status status;
 

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

@@ -1,5 +1,6 @@
 package com.imyeyu.api.modules.gao.vo;
 
+import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
 import lombok.Data;
 
 /// GAO 订单提醒客户
@@ -17,4 +18,40 @@ public class GaoOrderReminderCustomer {
 
 	/// 客户名称
 	private String customerName;
+
+	/// 订单 ID
+	private String orderId;
+
+	/// 订单号
+	private String orderNo;
+
+	/// 订单状态
+	private GaoSalesOrder.Status orderStatus;
+
+	/// 付款状态
+	private GaoSalesOrder.PaymentStatus paymentStatus;
+
+	/// 成交金额，单位分
+	private Long saleAmount;
+
+	/// 待核销收款，单位分
+	private Long pendingPaidAmount;
+
+	/// 已收金额，单位分
+	private Long paidAmount;
+
+	/// 未收金额，单位分
+	private Long unpaidAmount;
+
+	/// 待核销收款笔数
+	private Long pendingReceiveCount;
+
+	/// 待核销收款金额，单位分
+	private Long pendingReceiveAmount;
+
+	/// 待核销履约单数量
+	private Long pendingFulfillmentCount;
+
+	/// 待核销履约明细数量
+	private Long pendingFulfillmentItemCount;
 }

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

@@ -0,0 +1,23 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+/// 每日积分获得与消耗统计
+///
+/// @author Codex
+/// @since 2026-09-23
+@Data
+public class GaoPointDailyStatView {
+
+	/// 日期值，格式为 yyyyMMdd
+	private Integer dateValue;
+
+	/// 每日获得积分
+	private Long earnedPoints;
+
+	/// 每日消耗积分，以正数返回
+	private Long consumedPoints;
+
+	/// 获得积分减消耗积分
+	private Long netChangePoints;
+}

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

@@ -0,0 +1,26 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.api.modules.gao.entity.GaoPointRedeemSku;
+import com.imyeyu.spring.bean.PageResult;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/// GAO 积分兑换 SKU 配置分页查询结果
+///
+/// @author Codex
+/// @since 2026-10-15
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GaoPointRedeemSkuPageResult extends PageResult<GaoPointRedeemSku> {
+
+	/// SKU 筛选条件下的累计兑换基础数量
+	private BigDecimal redeemedBaseQuantityTotal;
+
+	/// SKU 筛选条件下的累计退货基础数量
+	private BigDecimal returnedBaseQuantityTotal;
+
+	/// SKU 筛选条件下的净兑换基础数量
+	private BigDecimal netRedeemedBaseQuantityTotal;
+}

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

@@ -0,0 +1,23 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+/// 积分兑换产品排行统计
+///
+/// @author Codex
+/// @since 2026-09-23
+@Data
+public class GaoPointRedemptionProductRankView {
+
+	/// 产品 ID
+	private String productId;
+
+	/// 产品名称
+	private String productName;
+
+	/// 兑换单数
+	private Long redemptionCount;
+
+	/// 实际扣除积分合计，不扣除退回积分
+	private Long pointCost;
+}

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

@@ -0,0 +1,19 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/// SKU 基础单位迁移请求
+@Data
+public class GaoProductSkuBaseUnitMigrationRequest {
+
+	/// 新基础单位 ID；切换到本次新增单位时允许为空
+	private String targetUnitId;
+
+	/// 新基础单位名称；按 ID 定位失败时用于匹配本次提交的新单位
+	private String targetUnitName;
+
+	/// 1 个旧基础单位等于的新基础单位数量
+	private BigDecimal oldToNewBaseRatio;
+}

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

@@ -0,0 +1,47 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.api.modules.common.entity.Attachment;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/// GAO 产品批量手工入库请求
+///
+/// @author Codex
+/// @since 2026-10-13
+@Data
+public class GaoProductStockManualInBatchRequest {
+
+	/// 客户端幂等请求号
+	private String requestNo;
+
+	/// 门店 ID
+	private String storeId;
+
+	/// 批次备注
+	private String remark;
+
+	/// 全局附件列表
+	private List<Attachment> attachmentList;
+
+	/// 批量入库项
+	private List<Item> itemList;
+
+	/// 批量手工入库项
+	@Data
+	public static class Item {
+
+		/// SKU ID
+		private String skuId;
+
+		/// SKU 单位 ID
+		private String skuUnitId;
+
+		/// 入库数量
+		private BigDecimal quantity;
+
+		/// SKU 自有附件列表
+		private List<Attachment> attachmentList;
+	}
+}

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

@@ -32,6 +32,9 @@ public class GaoProductStockProductView {
 	/// 可库存 SKU 数量
 	private Long skuCount;
 
+	/// 产品仅有一个可库存 SKU 时的 SKU ID
+	private String skuId;
+
 	/// 库存数量，使用基础单位
 	private BigDecimal onHandQuantity;
 

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

@@ -19,6 +19,9 @@ public class GaoProductStockRecordPage extends BasePage {
 	/// 产品 ID
 	private String productId;
 
+	/// SKU ID
+	private String skuId;
+
 	/// 产品名称、拼音或编码关键词
 	private String keyword;
 

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

@@ -0,0 +1,26 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
+import com.imyeyu.spring.bean.PageResult;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/// GAO 库存流水分页查询结果
+///
+/// @author Codex
+/// @since 2026-10-16
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GaoProductStockRecordPageResult extends PageResult<GaoProductStockRecord> {
+
+	/// 指定 SKU 在查询条件下的入库基础单位数量合计
+	@JsonInclude(JsonInclude.Include.NON_NULL)
+	private BigDecimal inBaseQuantityTotal;
+
+	/// 指定 SKU 在查询条件下的出库基础单位数量合计
+	@JsonInclude(JsonInclude.Include.NON_NULL)
+	private BigDecimal outBaseQuantityTotal;
+}

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

@@ -0,0 +1,19 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/// 库存流水 SKU 基础单位统计
+///
+/// @author Codex
+/// @since 2026-10-16
+@Data
+public class GaoProductStockRecordSkuSummaryView {
+
+	/// 入库基础单位数量合计
+	private BigDecimal inBaseQuantityTotal;
+
+	/// 出库基础单位数量合计
+	private BigDecimal outBaseQuantityTotal;
+}

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

@@ -2,6 +2,8 @@ package com.imyeyu.api.modules.gao.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /// GAO 销售订单取消请求
 ///
 /// @author Codex
@@ -17,4 +19,10 @@ public class GaoSalesOrderCancelRequest {
 
 	/// 幂等请求号
 	private String requestNo;
+
+	/// 取消时冲正的已核销履约单，按整张履约单冲正
+	private List<GaoOrderFulfillmentRevokeRequest> fulfillmentRevokeList;
+
+	/// 取消时冲正的资金流水，按整条流水冲正
+	private List<GaoOrderPaymentRevokeRequest> fundRevokeList;
 }

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

@@ -5,6 +5,8 @@ import com.imyeyu.java.bean.BasePage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /// GAO 销售订单分页请求
 ///
 /// @author Codex
@@ -19,18 +21,33 @@ public class GaoSalesOrderPage extends BasePage {
 	/// 客户 ID
 	private String customerId;
 
+	/// 套餐配置 ID
+	private String packageConfigId;
+
 	/// 订单类型
 	private GaoSalesOrder.OrderType orderType;
 
+	/// 订单类型列表
+	private List<GaoSalesOrder.OrderType> orderTypeList;
+
 	/// 订单状态
 	private GaoSalesOrder.Status status;
 
+	/// 订单状态列表
+	private List<GaoSalesOrder.Status> statusList;
+
 	/// 付款状态
 	private GaoSalesOrder.PaymentStatus paymentStatus;
 
+	/// 付款状态列表
+	private List<GaoSalesOrder.PaymentStatus> paymentStatusList;
+
 	/// 退款状态
 	private GaoSalesOrder.RefundStatus refundStatus;
 
+	/// 退款状态列表
+	private List<GaoSalesOrder.RefundStatus> refundStatusList;
+
 	/// true 为筛选可收款且未付清订单
 	private Boolean pendingReceive;
 

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

@@ -42,12 +42,15 @@ public class OperationAuditAspect {
 		Logger logger = new Logger(operation.getModule(), operation.name());
 		logger.setContent(payloadSerializer.serializeArguments(arguments));
 		long startNanos = System.nanoTime();
+		boolean previousAuditState = OperationAuditContext.begin();
 		try {
 			Object result = joinPoint.proceed();
 			logger.setLevel(Logger.Level.INFO);
 			logger.setResult(payloadSerializer.serializeResult(result, arguments));
 			logger.setDuration(duration(startNanos));
+			if (!OperationAuditContext.isSuccessAuditSkipped()) {
 				record(logger);
+			}
 			return result;
 		} catch (TimiException e) {
 			logger.setLevel(Logger.Level.WARN);
@@ -62,6 +65,8 @@ public class OperationAuditAspect {
 			log.error("业务操作失败: {}", operation.name(), e);
 			record(logger);
 			throw e;
+		} finally {
+			OperationAuditContext.end(previousAuditState);
 		}
 	}
 

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

@@ -0,0 +1,45 @@
+package com.imyeyu.api.modules.system.audit;
+
+/// 当前线程中的操作审计上下文
+///
+/// @author Codex
+/// @since 2026-09-30
+public final class OperationAuditContext {
+
+	private static final ThreadLocal<Boolean> SKIP_SUCCESS_AUDIT = ThreadLocal.withInitial(() -> false);
+
+	private OperationAuditContext() {
+	}
+
+	/// 开始一次审计操作并返回外层状态
+	///
+	/// @return 外层是否跳过成功审计
+	public static boolean begin() {
+		boolean previous = SKIP_SUCCESS_AUDIT.get();
+		SKIP_SUCCESS_AUDIT.set(false);
+		return previous;
+	}
+
+	/// 跳过当前操作的成功审计
+	public static void skipSuccessAudit() {
+		SKIP_SUCCESS_AUDIT.set(true);
+	}
+
+	/// 判断当前操作是否跳过成功审计
+	///
+	/// @return 是否跳过
+	public static boolean isSuccessAuditSkipped() {
+		return SKIP_SUCCESS_AUDIT.get();
+	}
+
+	/// 恢复外层审计状态
+	///
+	/// @param previous 外层是否跳过成功审计
+	public static void end(boolean previous) {
+		if (previous) {
+			SKIP_SUCCESS_AUDIT.set(true);
+		} else {
+			SKIP_SUCCESS_AUDIT.remove();
+		}
+	}
+}

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

@@ -39,6 +39,14 @@
 		<if test="storeId != null and storeId != ''">AND `store_id` = #{storeId}</if>
 		<if test="salesOrderId != null and salesOrderId != ''">AND `sales_order_id` = #{salesOrderId}</if>
 		<if test="customerId != null and customerId != ''">AND `customer_id` = #{customerId}</if>
+		<if test="skuIdList != null and skuIdList.size() > 0">
+			AND EXISTS (
+				SELECT 1 FROM `gao_order_fulfillment_item` fulfillment_item
+				WHERE fulfillment_item.`fulfillment_id` = `gao_order_fulfillment`.`id`
+				AND fulfillment_item.`sku_id` IN
+				<foreach collection="skuIdList" item="skuId" open="(" separator="," close=")">#{skuId}</foreach>
+			)
+		</if>
 		<if test="status != null">AND `status` = #{status}</if>
 		<if test="beginAt != null">AND `delivered_at` &gt;= #{beginAt}</if>
 		<if test="endAt != null">AND `delivered_at` &lt;= #{endAt}</if>

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

@@ -1,44 +1,90 @@
 <?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.GaoOrderReminderMapper">
-	<select id="selectOrderReceiveCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
+	<sql id="orderReminderSelect">
 		SELECT
 			o.`store_id` AS `storeId`,
 			o.`customer_id` AS `customerId`,
-			c.`name` AS `customerName`
+			c.`name` AS `customerName`,
-		FROM `gao_sales_order` o
+			o.`id` AS `orderId`,
-		INNER JOIN `gao_customer` c ON c.`id` = o.`customer_id` AND c.`deleted_at` IS NULL
+			o.`order_no` AS `orderNo`,
-		WHERE o.`deleted_at` IS NULL
+			o.`status` AS `orderStatus`,
-			AND o.`status` IN ('ACTIVE', 'FULFILLED')
+			o.`payment_status` AS `paymentStatus`,
-			AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')
+			o.`sale_amount` AS `saleAmount`,
-		GROUP BY o.`store_id`, o.`customer_id`, c.`name`
+			o.`pending_paid_amount` AS `pendingPaidAmount`,
-		ORDER BY o.`store_id`, c.`name`, o.`customer_id`
+			o.`paid_amount` AS `paidAmount`,
-	</select>
+			GREATEST(o.`sale_amount` - o.`paid_amount`, 0) AS `unpaidAmount`,
+			COALESCE(fr.`pending_receive_count`, 0) AS `pendingReceiveCount`,
+			COALESCE(fr.`pending_receive_amount`, 0) AS `pendingReceiveAmount`,
+			COALESCE(ff.`pending_fulfillment_count`, 0) AS `pendingFulfillmentCount`,
+			COALESCE(ff.`pending_fulfillment_item_count`, 0) AS `pendingFulfillmentItemCount`
+	</sql>
 
-	<select id="selectReceiveVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
+	<sql id="orderReminderJoins">
+		INNER JOIN `gao_customer` c ON c.`id` = o.`customer_id` AND c.`deleted_at` IS NULL
+		LEFT JOIN (
 			SELECT
-			f.`store_id` AS `storeId`,
+				f.`store_id`,
-			f.`customer_id` AS `customerId`,
+				f.`biz_id`,
-			c.`name` AS `customerName`
+				COUNT(1) AS `pending_receive_count`,
+				COALESCE(SUM(f.`amount`), 0) AS `pending_receive_amount`
 			FROM `gao_fund_record` f
-		INNER JOIN `gao_customer` c ON c.`id` = f.`customer_id` AND c.`deleted_at` IS NULL
 			WHERE f.`deleted_at` IS NULL
 				AND f.`biz_type` = 'SALES_ORDER'
 				AND f.`operation_type` = 'RECEIVE'
 				AND f.`status` = 'PENDING'
-		GROUP BY f.`store_id`, f.`customer_id`, c.`name`
+			GROUP BY f.`store_id`, f.`biz_id`
-		ORDER BY f.`store_id`, c.`name`, f.`customer_id`
+		) fr ON fr.`store_id` = o.`store_id` AND fr.`biz_id` = o.`id`
+		LEFT JOIN (
+			SELECT
+				f.`store_id`,
+				f.`sales_order_id`,
+				COUNT(DISTINCT f.`id`) AS `pending_fulfillment_count`,
+				COUNT(fi.`id`) AS `pending_fulfillment_item_count`
+			FROM `gao_order_fulfillment` f
+			LEFT JOIN `gao_order_fulfillment_item` fi ON fi.`fulfillment_id` = f.`id`
+			WHERE f.`status` = 'PENDING'
+			GROUP BY f.`store_id`, f.`sales_order_id`
+		) ff ON ff.`store_id` = o.`store_id` AND ff.`sales_order_id` = o.`id`
+	</sql>
+
+	<select id="selectOrderReceiveCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
+		<include refid="orderReminderSelect"/>
+		FROM `gao_sales_order` o
+		<include refid="orderReminderJoins"/>
+		WHERE o.`deleted_at` IS NULL
+			AND o.`status` IN ('ACTIVE', 'FULFILLED')
+			AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')
+		ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
+	</select>
+
+	<select id="selectReceiveVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
+		<include refid="orderReminderSelect"/>
+		FROM `gao_sales_order` o
+		<include refid="orderReminderJoins"/>
+		INNER JOIN (
+			SELECT DISTINCT f.`store_id`, f.`biz_id`
+			FROM `gao_fund_record` f
+			WHERE f.`deleted_at` IS NULL
+				AND f.`biz_type` = 'SALES_ORDER'
+				AND f.`operation_type` = 'RECEIVE'
+				AND f.`status` = 'PENDING'
+		) pendingReceive ON pendingReceive.`store_id` = o.`store_id` AND pendingReceive.`biz_id` = o.`id`
+		WHERE o.`deleted_at` IS NULL
+		ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
 	</select>
 
 	<select id="selectFulfillmentVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
-		SELECT
+		<include refid="orderReminderSelect"/>
-			f.`store_id` AS `storeId`,
+		FROM `gao_sales_order` o
-			f.`customer_id` AS `customerId`,
+		<include refid="orderReminderJoins"/>
-			c.`name` AS `customerName`
+		INNER JOIN (
+			SELECT DISTINCT f.`store_id`, f.`sales_order_id`
 			FROM `gao_order_fulfillment` f
-		INNER JOIN `gao_customer` c ON c.`id` = f.`customer_id` AND c.`deleted_at` IS NULL
 			WHERE f.`status` = 'PENDING'
-		GROUP BY f.`store_id`, f.`customer_id`, c.`name`
+		) pendingFulfillment ON pendingFulfillment.`store_id` = o.`store_id`
-		ORDER BY f.`store_id`, c.`name`, f.`customer_id`
+			AND pendingFulfillment.`sales_order_id` = o.`id`
+		WHERE o.`deleted_at` IS NULL
+		ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
 	</select>
 </mapper>

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

@@ -0,0 +1,36 @@
+<?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.GaoPointChartMapper">
+	<select id="selectDailyTrend" resultType="com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView">
+		SELECT
+			CAST(DATE_FORMAT(FROM_UNIXTIME(l.`occurred_at` / 1000), '%Y%m%d') AS UNSIGNED) AS `dateValue`,
+			COALESCE(SUM(CASE WHEN l.`change_type` = 'EARN' THEN l.`point_delta` ELSE 0 END), 0) AS `earnedPoints`,
+			COALESCE(SUM(CASE WHEN l.`change_type` = 'CONSUME' THEN -l.`point_delta` ELSE 0 END), 0) AS `consumedPoints`,
+			COALESCE(SUM(l.`point_delta`), 0) AS `netChangePoints`
+		FROM `gao_point_ledger` l
+		WHERE l.`deleted_at` IS NULL
+			AND l.`store_id` = #{storeId}
+			AND l.`occurred_at` &gt;= #{beginAt}
+			AND l.`occurred_at` &lt;= #{endAt}
+			AND l.`change_type` IN ('EARN', 'CONSUME')
+		GROUP BY DATE_FORMAT(FROM_UNIXTIME(l.`occurred_at` / 1000), '%Y%m%d')
+		ORDER BY `dateValue` ASC
+	</select>
+
+	<select id="selectRedemptionProductRank" resultType="com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView">
+		SELECT
+			r.`product_id_snapshot` AS `productId`,
+			COALESCE(MAX(NULLIF(r.`product_name_snapshot`, '')), '未命名产品') AS `productName`,
+			COUNT(1) AS `redemptionCount`,
+			COALESCE(SUM(r.`actual_point_cost`), 0) AS `pointCost`
+		FROM `gao_point_redemption` r
+		WHERE r.`deleted_at` IS NULL
+			AND r.`store_id` = #{storeId}
+			AND r.`product_id_snapshot` IS NOT NULL
+			AND r.`redeemed_at` &gt;= #{beginAt}
+			AND r.`redeemed_at` &lt;= #{endAt}
+		GROUP BY r.`product_id_snapshot`
+		ORDER BY `pointCost` DESC, `redemptionCount` DESC, `productName` ASC, `productId` ASC
+		LIMIT 10
+	</select>
+</mapper>

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

@@ -63,4 +63,19 @@
 			<if test="beginAt != null">AND `redeemed_at` &gt;= #{beginAt}</if>
 			<if test="endAt != null">AND `redeemed_at` &lt;= #{endAt}</if>
 	</select>
+	<select id="selectSkuSummaryByStoreIdAndSkuId" resultType="com.imyeyu.api.modules.gao.vo.GaoPointRedeemSkuPageResult">
+		SELECT COALESCE(SUM(`r`.`base_quantity`), 0) AS `redeemed_base_quantity_total`,
+			COALESCE(SUM(`return_summary`.`base_quantity_total`), 0) AS `returned_base_quantity_total`,
+			COALESCE(SUM(`r`.`base_quantity` - COALESCE(`return_summary`.`base_quantity_total`, 0)), 0) AS `net_redeemed_base_quantity_total`
+		FROM `gao_point_redemption` `r`
+		LEFT JOIN (
+			SELECT `redemption_id`, SUM(`base_quantity`) AS `base_quantity_total`
+			FROM `gao_point_redemption_return`
+			WHERE `deleted_at` IS NULL
+			GROUP BY `redemption_id`
+		) `return_summary` ON `return_summary`.`redemption_id` = `r`.`id`
+		WHERE `r`.`deleted_at` IS NULL
+			AND `r`.`sku_id_snapshot` = #{skuId}
+			<if test="storeId != null and storeId != ''">AND `r`.`store_id` = #{storeId}</if>
+	</select>
 </mapper>

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

@@ -0,0 +1,107 @@
+<?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.GaoProductEditMapper">
+	<select id="countProductReferences" resultType="int">
+		SELECT
+			(SELECT COUNT(*) FROM `gao_sales_order_item` WHERE `product_id_snapshot` = #{productId}) +
+			(SELECT COUNT(*) FROM `gao_order_fulfillment_item` WHERE `product_id_snapshot` = #{productId}) +
+			(SELECT COUNT(*) FROM `gao_product_stock_record` WHERE `product_id_snapshot` = #{productId}) +
+			(SELECT COUNT(*) FROM `gao_package_config_item` WHERE `product_id_snapshot` = #{productId}) +
+			(SELECT COUNT(*) FROM `gao_point_redemption` WHERE `product_id_snapshot` = #{productId})
+	</select>
+	<select id="countSkuReferences" resultType="int">
+		SELECT
+			(SELECT COUNT(*) FROM `gao_sales_order_item` WHERE `sku_id` = #{skuId}) +
+			(SELECT COUNT(*) FROM `gao_order_fulfillment_item` WHERE `sku_id` = #{skuId}) +
+			(SELECT COUNT(*) FROM `gao_product_stock_record` WHERE `sku_id` = #{skuId}) +
+			(SELECT COUNT(*) FROM `gao_package_config_item` WHERE `sku_id` = #{skuId}) +
+			(SELECT COUNT(*) FROM `gao_point_redeem_sku` WHERE `sku_id` = #{skuId}) +
+			(SELECT COUNT(*) FROM `gao_point_redemption` WHERE `sku_id_snapshot` = #{skuId})
+	</select>
+	<select id="countUnitReferences" resultType="int">
+		SELECT
+			(SELECT COUNT(*) FROM `gao_sales_order_item` WHERE `sku_unit_id` = #{unitId}) +
+			(SELECT COUNT(*) FROM `gao_order_fulfillment_item` WHERE `sku_unit_id` = #{unitId}) +
+			(SELECT COUNT(*) FROM `gao_product_stock_record` WHERE `sku_unit_id` = #{unitId}) +
+			(SELECT COUNT(*) FROM `gao_package_config_item` WHERE `sku_unit_id` = #{unitId}) +
+			(SELECT COUNT(*) FROM `gao_point_redeem_sku` WHERE `sku_unit_id` = #{unitId}) +
+			(SELECT COUNT(*) FROM `gao_point_redemption` WHERE `sku_unit_id_snapshot` = #{unitId})
+	</select>
+	<select id="countMigrationPrecisionLoss" resultType="int">
+		SELECT COUNT(*) FROM (
+			SELECT 1 FROM `gao_product_sku` WHERE `id` = #{skuId} AND `min_stock_quantity` IS NOT NULL
+				AND (`min_stock_quantity` * #{ratio} &lt;&gt; ROUND(`min_stock_quantity` * #{ratio}, 3) OR ABS(`min_stock_quantity` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_product_stock` WHERE `sku_id` = #{skuId}
+				AND (`on_hand_quantity` * #{ratio} &lt;&gt; ROUND(`on_hand_quantity` * #{ratio}, 3) OR ABS(`on_hand_quantity` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_quantity` * #{ratio} &lt;&gt; ROUND(`reserved_quantity` * #{ratio}, 3) OR ABS(`reserved_quantity` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_sales_order_item` WHERE `sku_id` = #{skuId}
+				AND (`base_quantity` * #{ratio} &lt;&gt; ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_base_quantity` * #{ratio} &lt;&gt; ROUND(`reserved_base_quantity` * #{ratio}, 3) OR ABS(`reserved_base_quantity` * #{ratio}) &gt; 999999999999999.999
+				OR `fulfilled_base_quantity` * #{ratio} &lt;&gt; ROUND(`fulfilled_base_quantity` * #{ratio}, 3) OR ABS(`fulfilled_base_quantity` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_order_fulfillment_item` WHERE `sku_id` = #{skuId}
+				AND (`base_quantity` * #{ratio} &lt;&gt; ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_base_before` * #{ratio} &lt;&gt; ROUND(`reserved_base_before` * #{ratio}, 3) OR ABS(`reserved_base_before` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_base_after` * #{ratio} &lt;&gt; ROUND(`reserved_base_after` * #{ratio}, 3) OR ABS(`reserved_base_after` * #{ratio}) &gt; 999999999999999.999
+				OR `fulfilled_base_before` * #{ratio} &lt;&gt; ROUND(`fulfilled_base_before` * #{ratio}, 3) OR ABS(`fulfilled_base_before` * #{ratio}) &gt; 999999999999999.999
+				OR `fulfilled_base_after` * #{ratio} &lt;&gt; ROUND(`fulfilled_base_after` * #{ratio}, 3) OR ABS(`fulfilled_base_after` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_product_stock_record` WHERE `sku_id` = #{skuId}
+				AND (`base_quantity` * #{ratio} &lt;&gt; ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) &gt; 999999999999999.999
+				OR `on_hand_delta` * #{ratio} &lt;&gt; ROUND(`on_hand_delta` * #{ratio}, 3) OR ABS(`on_hand_delta` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_delta` * #{ratio} &lt;&gt; ROUND(`reserved_delta` * #{ratio}, 3) OR ABS(`reserved_delta` * #{ratio}) &gt; 999999999999999.999
+				OR `on_hand_before` * #{ratio} &lt;&gt; ROUND(`on_hand_before` * #{ratio}, 3) OR ABS(`on_hand_before` * #{ratio}) &gt; 999999999999999.999
+				OR `on_hand_after` * #{ratio} &lt;&gt; ROUND(`on_hand_after` * #{ratio}, 3) OR ABS(`on_hand_after` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_before` * #{ratio} &lt;&gt; ROUND(`reserved_before` * #{ratio}, 3) OR ABS(`reserved_before` * #{ratio}) &gt; 999999999999999.999
+				OR `reserved_after` * #{ratio} &lt;&gt; ROUND(`reserved_after` * #{ratio}, 3) OR ABS(`reserved_after` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_point_redemption` WHERE `sku_id_snapshot` = #{skuId}
+				AND (`base_quantity` * #{ratio} &lt;&gt; ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_point_redemption_return` r
+				JOIN `gao_point_redemption` d ON d.`id` = r.`redemption_id`
+				WHERE d.`sku_id_snapshot` = #{skuId}
+				AND (r.`base_quantity` * #{ratio} &lt;&gt; ROUND(r.`base_quantity` * #{ratio}, 3) OR ABS(r.`base_quantity` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_product_sku_unit` WHERE `sku_id` = #{skuId} AND `deleted_at` IS NULL
+				AND (#{targetUnitId} IS NULL OR `id` &lt;&gt; #{targetUnitId})
+				AND (`base_quantity_per_unit` * #{ratio} &lt;&gt; ROUND(`base_quantity_per_unit` * #{ratio}, 6) OR ABS(`base_quantity_per_unit` * #{ratio}) &gt; 999999999999.999999)
+			UNION ALL SELECT 1 FROM `gao_sales_order_item` WHERE `sku_id` = #{skuId}
+				AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) &gt; 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} &lt;&gt; ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
+			UNION ALL SELECT 1 FROM `gao_order_fulfillment_item` WHERE `sku_id` = #{skuId}
+				AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) &gt; 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} &lt;&gt; ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
+			UNION ALL SELECT 1 FROM `gao_product_stock_record` WHERE `sku_id` = #{skuId}
+				AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) &gt; 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} &lt;&gt; ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
+			UNION ALL SELECT 1 FROM `gao_package_config_item` WHERE `sku_id` = #{skuId}
+				AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) &gt; 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} &lt;&gt; ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
+			UNION ALL SELECT 1 FROM `gao_package_config_item` WHERE `sku_id` = #{skuId}
+				AND (`default_quantity` * `base_quantity_per_unit_snapshot` * #{ratio} &lt;&gt; ROUND(`default_quantity` * `base_quantity_per_unit_snapshot` * #{ratio}, 3)
+				OR ABS(`default_quantity` * `base_quantity_per_unit_snapshot` * #{ratio}) &gt; 999999999999999.999)
+			UNION ALL SELECT 1 FROM `gao_point_redemption` WHERE `sku_id_snapshot` = #{skuId}
+				AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) &gt; 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} &lt;&gt; ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
+		) precision_issue
+	</select>
+	<update id="updateProductOrderSnapshots">UPDATE `gao_sales_order_item` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
+	<update id="updateProductFulfillmentSnapshots">UPDATE `gao_order_fulfillment_item` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
+	<update id="updateProductStockRecordSnapshots">UPDATE `gao_product_stock_record` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
+	<update id="updateProductPackageSnapshots">UPDATE `gao_package_config_item` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
+	<update id="updateProductRedemptionSnapshots">UPDATE `gao_point_redemption` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
+	<update id="updateSkuOrderSnapshots">UPDATE `gao_sales_order_item` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id`=#{skuId}</update>
+	<update id="updateSkuFulfillmentSnapshots">UPDATE `gao_order_fulfillment_item` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id`=#{skuId}</update>
+	<update id="updateSkuStockRecordSnapshots">UPDATE `gao_product_stock_record` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id`=#{skuId}</update>
+	<update id="updateSkuPackageSnapshots">UPDATE `gao_package_config_item` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary} WHERE `sku_id`=#{skuId}</update>
+	<update id="updateSkuRedemptionSnapshots">UPDATE `gao_point_redemption` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id_snapshot`=#{skuId}</update>
+	<update id="updateUnitOrderSnapshots">UPDATE `gao_sales_order_item` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
+	<update id="updateUnitFulfillmentSnapshots">UPDATE `gao_order_fulfillment_item` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
+	<update id="updateUnitStockRecordSnapshots">UPDATE `gao_product_stock_record` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
+	<update id="updateUnitPackageSnapshots">UPDATE `gao_package_config_item` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
+	<update id="updateUnitRedemptionSnapshots">UPDATE `gao_point_redemption` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id_snapshot`=#{unitId}</update>
+	<update id="scaleSkuMinimumStock">UPDATE `gao_product_sku` SET `min_stock_quantity`=`min_stock_quantity`*#{ratio} WHERE `id`=#{skuId} AND `min_stock_quantity` IS NOT NULL</update>
+	<update id="scaleProductStock">UPDATE `gao_product_stock` SET `on_hand_quantity`=`on_hand_quantity`*#{ratio}, `reserved_quantity`=`reserved_quantity`*#{ratio}, `updated_at`=FLOOR(UNIX_TIMESTAMP(NOW(3))*1000) WHERE `sku_id`=#{skuId}</update>
+	<update id="scaleSalesOrderItems">UPDATE `gao_sales_order_item` SET `base_quantity`=`base_quantity`*#{ratio}, `reserved_base_quantity`=`reserved_base_quantity`*#{ratio}, `fulfilled_base_quantity`=`fulfilled_base_quantity`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
+	<update id="scaleFulfillmentItems">UPDATE `gao_order_fulfillment_item` SET `base_quantity`=`base_quantity`*#{ratio}, `reserved_base_before`=`reserved_base_before`*#{ratio}, `reserved_base_after`=`reserved_base_after`*#{ratio}, `fulfilled_base_before`=`fulfilled_base_before`*#{ratio}, `fulfilled_base_after`=`fulfilled_base_after`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
+	<update id="scaleStockRecords">UPDATE `gao_product_stock_record` SET `base_quantity`=`base_quantity`*#{ratio}, `on_hand_delta`=`on_hand_delta`*#{ratio}, `reserved_delta`=`reserved_delta`*#{ratio}, `on_hand_before`=`on_hand_before`*#{ratio}, `on_hand_after`=`on_hand_after`*#{ratio}, `reserved_before`=`reserved_before`*#{ratio}, `reserved_after`=`reserved_after`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
+	<update id="scalePackageConfigItems">UPDATE `gao_package_config_item` SET `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
+	<update id="scalePointRedemptions">UPDATE `gao_point_redemption` SET `base_quantity`=`base_quantity`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id_snapshot`=#{skuId}</update>
+	<update id="scalePointRedemptionReturns">
+		UPDATE `gao_point_redemption_return` r
+		JOIN `gao_point_redemption` d ON d.`id`=r.`redemption_id`
+		SET r.`base_quantity`=r.`base_quantity`*#{ratio}
+		WHERE d.`sku_id_snapshot`=#{skuId}
+	</update>
+</mapper>

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

@@ -5,4 +5,5 @@
 	<select id="selectByProductIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSpec">SELECT * FROM `gao_product_spec` WHERE `deleted_at` IS NULL <choose><when test="productIdList != null and !productIdList.isEmpty()">AND `product_id` IN <foreach collection="productIdList" item="id" open="(" separator="," close=")">#{id}</foreach></when><otherwise>AND FALSE</otherwise></choose> ORDER BY `product_id`, `sort`, `created_at`</select>
 	<select id="selectProductIdBySpecValueId" resultType="string">SELECT `s`.`product_id` FROM `gao_product_spec_value` `v` INNER JOIN `gao_product_spec` `s` ON `s`.`id`=`v`.`spec_id` AND `s`.`deleted_at` IS NULL WHERE `v`.`id`=#{specValueId} AND `v`.`deleted_at` IS NULL</select>
 	<select id="selectProductIdBySpecId" resultType="string">SELECT `product_id` FROM `gao_product_spec` WHERE `id`=#{specId} AND `deleted_at` IS NULL</select>
+	<update id="updateSpec">UPDATE `gao_product_spec` SET `name`=#{name},`sort`=#{sort},`updated_at`=FLOOR(UNIX_TIMESTAMP(NOW(3))*1000) WHERE `id`=#{id} AND `deleted_at` IS NULL</update>
 </mapper>

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

@@ -3,4 +3,5 @@
 <mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoProductSpecValueMapper">
 	<select id="selectById" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSpecValue">SELECT * FROM `gao_product_spec_value` WHERE `id` = #{id} AND `deleted_at` IS NULL</select>
 	<select id="selectBySpecIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSpecValue">SELECT * FROM `gao_product_spec_value` WHERE `deleted_at` IS NULL <choose><when test="specIdList != null and !specIdList.isEmpty()">AND `spec_id` IN <foreach collection="specIdList" item="id" open="(" separator="," close=")">#{id}</foreach></when><otherwise>AND FALSE</otherwise></choose> ORDER BY `spec_id`, `sort`, `created_at`</select>
+	<update id="updateValue">UPDATE `gao_product_spec_value` SET `name`=#{name},`sort`=#{sort},`updated_at`=FLOOR(UNIX_TIMESTAMP(NOW(3))*1000) WHERE `id`=#{id} AND `deleted_at` IS NULL</update>
 </mapper>

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

@@ -84,6 +84,7 @@
 			p.`name` AS `product_name`,
 			p.`product_type`,
 			COUNT(k.`id`) AS `sku_count`,
+			CASE WHEN COUNT(k.`id`) = 1 THEN MAX(k.`id`) END AS `sku_id`,
 			COALESCE(SUM(COALESCE(s.`on_hand_quantity`, 0)), 0) AS `on_hand_quantity`,
 			COALESCE(SUM(COALESCE(s.`reserved_quantity`, 0)), 0) AS `reserved_quantity`,
 			COALESCE(SUM(COALESCE(s.`on_hand_quantity`, 0) - COALESCE(s.`reserved_quantity`, 0)), 0) AS `available_quantity`

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

@@ -31,6 +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="skuId != null and skuId.trim() != ''">AND r.`sku_id` = #{skuId}</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>
@@ -60,4 +61,12 @@
 		ORDER BY r.`occurred_at` DESC, r.`id` DESC
 		LIMIT #{offset}, #{limit}
 	</select>
+	<select id="selectSkuBaseUnitSummaryByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoProductStockRecordSkuSummaryView">
+		SELECT COALESCE(SUM(CASE WHEN 0 &lt; r.`on_hand_delta` THEN COALESCE(r.`base_quantity`, 0) ELSE 0 END), 0) AS `in_base_quantity_total`,
+			COALESCE(SUM(CASE WHEN r.`on_hand_delta` &lt; 0 THEN COALESCE(r.`base_quantity`, 0) ELSE 0 END), 0) AS `out_base_quantity_total`
+		FROM `gao_product_stock_record` r
+		LEFT JOIN `gao_product_sku` k ON k.`id` = r.`sku_id` AND k.`store_id` = r.`store_id`
+		LEFT JOIN `gao_product` p ON p.`id` = k.`product_id`
+		WHERE <include refid="queryWhere"/>
+	</select>
 </mapper>

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

@@ -23,10 +23,50 @@
 		o.`deleted_at` IS NULL
 		<if test="storeId != null and storeId != ''">AND o.`store_id` = #{storeId}</if>
 		<if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if>
-		<if test="orderType != null">AND o.`order_type` = #{orderType}</if>
+		<if test="packageConfigId != null and packageConfigId != ''">
-		<if test="status != null">AND o.`status` = #{status}</if>
+			AND EXISTS (
-		<if test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</if>
+				SELECT 1 FROM `gao_customer_package` cp
-		<if test="refundStatus != null">AND o.`refund_status` = #{refundStatus}</if>
+				WHERE cp.`sales_order_id` = o.`id`
+				AND cp.`package_config_id` = #{packageConfigId}
+				AND cp.`deleted_at` IS NULL
+			)
+		</if>
+		<choose>
+			<when test="orderTypeList != null and 0 &lt; orderTypeList.size()">
+				AND o.`order_type` IN
+				<foreach collection="orderTypeList" item="orderTypeItem" open="(" separator="," close=")">
+					#{orderTypeItem}
+				</foreach>
+			</when>
+			<when test="orderType != null">AND o.`order_type` = #{orderType}</when>
+		</choose>
+		<choose>
+			<when test="statusList != null and 0 &lt; statusList.size()">
+				AND o.`status` IN
+				<foreach collection="statusList" item="statusItem" open="(" separator="," close=")">
+					#{statusItem}
+				</foreach>
+			</when>
+			<when test="status != null">AND o.`status` = #{status}</when>
+		</choose>
+		<choose>
+			<when test="paymentStatusList != null and 0 &lt; paymentStatusList.size()">
+				AND o.`payment_status` IN
+				<foreach collection="paymentStatusList" item="paymentStatusItem" open="(" separator="," close=")">
+					#{paymentStatusItem}
+				</foreach>
+			</when>
+			<when test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</when>
+		</choose>
+		<choose>
+			<when test="refundStatusList != null and 0 &lt; refundStatusList.size()">
+				AND o.`refund_status` IN
+				<foreach collection="refundStatusList" item="refundStatusItem" open="(" separator="," close=")">
+					#{refundStatusItem}
+				</foreach>
+			</when>
+			<when test="refundStatus != null">AND o.`refund_status` = #{refundStatus}</when>
+		</choose>
 		<if test="pendingReceive != null and pendingReceive">AND o.`status` IN ('ACTIVE', 'FULFILLED') AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')</if>
 		<if test="fulfilledButUnpaid != null and fulfilledButUnpaid">AND o.`status` = 'FULFILLED' AND o.`paid_amount` &lt; o.`sale_amount`</if>
 		<if test="keyword != null and keyword.trim() != ''">AND (o.`order_no` LIKE CONCAT('%', #{keyword}, '%') OR c.`name` LIKE CONCAT('%', #{keyword}, '%') OR c.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
@@ -41,6 +81,76 @@
 		ORDER BY o.`purchased_at` DESC, o.`created_at` DESC
 		LIMIT #{offset}, #{limit}
 	</select>
+	<select id="selectSummaryByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView">
+		SELECT
+			COUNT(1) AS `orderCount`,
+			COALESCE(SUM(o.`sale_amount`), 0) AS `saleAmount`,
+			COALESCE(SUM(o.`paid_amount`), 0) AS `paidAmount`,
+			COALESCE(SUM(o.`pending_paid_amount`), 0) AS `pendingPaidAmount`,
+			COALESCE(SUM(o.`sale_amount` - o.`paid_amount`), 0) AS `unpaidAmount`,
+			COALESCE(SUM(o.`refunded_amount`), 0) AS `refundedAmount`,
+			COALESCE(SUM(o.`paid_amount` - o.`refunded_amount`), 0) AS `netPaidAmount`
+		FROM `gao_sales_order` o LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
+		WHERE <include refid="queryWhere"/>
+	</select>
+	<sql id="customerProductWhere">
+		i.`deleted_at` IS NULL
+		AND o.`deleted_at` IS NULL
+		AND o.`store_id` = #{storeId}
+		AND o.`status` &lt;&gt; 'CANCELLED'
+		<if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if>
+		<if test="customerIdList != null and customerIdList.size() &gt; 0">
+			AND o.`customer_id` IN
+			<foreach collection="customerIdList" item="customerIdItem" open="(" separator="," close=")">
+				#{customerIdItem}
+			</foreach>
+		</if>
+		<if test="itemType != null">AND i.`item_type` = #{itemType}</if>
+		<if test="keyword != null and keyword.trim() != ''">
+			AND (
+				c.`name` LIKE CONCAT('%', #{keyword}, '%')
+				OR c.`code` LIKE CONCAT('%', #{keyword}, '%')
+				OR o.`order_no` LIKE CONCAT('%', #{keyword}, '%')
+				OR i.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%')
+				OR i.`sku_name_snapshot` LIKE CONCAT('%', #{keyword}, '%')
+				OR i.`sku_code_snapshot` LIKE CONCAT('%', #{keyword}, '%')
+				OR i.`spec_summary_snapshot` LIKE CONCAT('%', #{keyword}, '%')
+			)
+		</if>
+	</sql>
+	<select id="countCustomerProductCustomerByQuery" resultType="long">
+		SELECT COUNT(DISTINCT o.`customer_id`)
+		FROM `gao_sales_order_item` i
+		JOIN `gao_sales_order` o ON o.`id` = i.`sales_order_id`
+		LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
+		WHERE <include refid="customerProductWhere"/>
+	</select>
+	<select id="selectCustomerProductCustomerByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerRow">
+		SELECT o.`customer_id`, c.`code` AS `customer_code`, c.`name` AS `customer_name`, COUNT(DISTINCT o.`id`) AS `order_count`
+		FROM `gao_sales_order_item` i
+		JOIN `gao_sales_order` o ON o.`id` = i.`sales_order_id`
+		LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
+		WHERE <include refid="customerProductWhere"/>
+		GROUP BY o.`customer_id`, c.`code`, c.`name`
+		ORDER BY c.`name` ASC, c.`code` ASC, o.`customer_id` ASC
+		LIMIT #{offset}, #{limit}
+	</select>
+	<select id="selectCustomerProductByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerProductView">
+		SELECT i.`id`, i.`sales_order_id`, o.`customer_id`, c.`code` AS `customer_code`, c.`name` AS `customer_name`,
+			o.`order_no`, o.`order_type`, o.`status` AS `order_status`, o.`purchased_at`,
+			i.`item_type`, i.`gifted`, i.`sku_id`, i.`sku_unit_id`, i.`product_name_snapshot`, i.`product_id_snapshot`,
+			i.`sku_code_snapshot`, i.`sku_name_snapshot`, i.`spec_summary_snapshot`, i.`unit_snapshot`, base_unit.`name` AS `base_unit_name`,
+			i.`base_quantity_per_unit_snapshot`, i.`quantity`, i.`base_quantity`, i.`reserved_base_quantity`,
+			i.`fulfilled_base_quantity`,
+			COALESCE(i.`base_quantity`, 0) - COALESCE(i.`fulfilled_base_quantity`, 0) AS `remaining_base_quantity`,
+			COALESCE(i.`base_quantity`, 0) - COALESCE(i.`reserved_base_quantity`, 0) - COALESCE(i.`fulfilled_base_quantity`, 0) AS `available_base_quantity`
+		FROM `gao_sales_order_item` i
+		JOIN `gao_sales_order` o ON o.`id` = i.`sales_order_id`
+		LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
+		LEFT JOIN `gao_product_sku_unit` base_unit ON base_unit.`sku_id` = i.`sku_id` AND base_unit.`is_base` = 1 AND base_unit.`deleted_at` IS NULL
+		WHERE <include refid="customerProductWhere"/>
+		ORDER BY o.`purchased_at` DESC, o.`created_at` DESC, i.`sort` ASC, i.`created_at` ASC
+	</select>
 	<update id="updatePayment">
 		UPDATE `gao_sales_order`
 		SET `pending_paid_amount` = #{pendingPaidAmount}, `paid_amount` = #{paidAmount}, `paid_at` = #{paidAt}, `refunded_amount` = #{refundedAmount},

src/main/resources/templates/GaoOrderReminder.ftl

@@ -0,0 +1,21 @@
+<div class="gao-order-reminder">
+	<p>以下订单存在待处理事项，请及时处理。</p>
+	<#list customerList as customer>
+		<h3>客户：${customer.name?html}</h3>
+		<#list customer.orderList as order>
+			<p><strong>订单号：${order.orderNo?html}</strong></p>
+			<ul>
+				<li><strong>订单状态：</strong>${order.orderStatus?html}</li>
+				<li><strong>付款状态：</strong>${order.paymentStatus?html}</li>
+				<li><strong>金额情况：</strong>${order.amountSummary?html}</li>
+				<li><strong>履约情况：</strong>${order.fulfillmentSummary?html}</li>
+			</ul>
+			<p>
+				<a
+					href="/management/sales-orders/${order.orderId?html}"
+					style="display: inline-block; padding: 6px 12px; color: #FFFFFF; background-color: #1677FF; text-decoration: none; border-radius: 4px;"
+				>查看订单详情</a>
+			</p>
+		</#list>
+	</#list>
+</div>