Merge pull request 'v1.0.58' (#70) from dev into master
Reviewed-on: #70
This commit was merged in pull request #70.
This commit is contained in:
+97
-74
@@ -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.
|
||||
# No documentation on options means no options are available.
|
||||
# The settings are considered only if the project is trusted (see global configuration to define trusted projects).
|
||||
# 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)
|
||||
#
|
||||
# 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.
|
||||
# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
|
||||
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.
|
||||
# The full set of modes to be activated is base_modes + default_modes.
|
||||
# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
|
||||
# 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 (from global config) + default_modes + added_modes.
|
||||
# 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
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<groupId>com.imyeyu.timiserverapi</groupId>
|
||||
<artifactId>TimiServerAPI</artifactId>
|
||||
<version>1.0.57</version>
|
||||
<version>1.0.58</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>TimiServerAPI</name>
|
||||
<description>imyeyu.com API</description>
|
||||
|
||||
+6
-2
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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 配置
|
||||
PageResult<GaoPointRedeemSku> pageByQuery(GaoPointRedeemSkuPage page);
|
||||
/// 分页查询兑换 SKU 配置，指定 SKU 时附带基础单位兑换统计
|
||||
/// @param page 分页与筛选条件
|
||||
/// @return 兑换 SKU 分页结果，指定 SKU 时包含基础单位兑换统计
|
||||
/// @throws TimiException 分页条件为空
|
||||
GaoPointRedeemSkuPageResult pageByQuery(GaoPointRedeemSkuPage page);
|
||||
|
||||
/// 查询兑换 SKU 配置详情
|
||||
GaoPointRedeemSku detail(String storeId, String id);
|
||||
|
||||
@@ -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> {
|
||||
|
||||
/// 按条件查询库存流水
|
||||
PageResult<GaoProductStockRecord> pageByQuery(GaoProductStockRecordPage page);
|
||||
/// 按条件查询库存流水；指定 SKU 时统计其出入库基础单位数量
|
||||
/// @param page 流水分页和统计筛选条件
|
||||
/// @return 流水分页及匹配条件下的 SKU 基础单位汇总
|
||||
GaoProductStockRecordPageResult pageByQuery(GaoProductStockRecordPage page);
|
||||
|
||||
/// 查询库存流水详情
|
||||
GaoProductStockRecord detail(String id);
|
||||
|
||||
@@ -4,10 +4,12 @@ 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;
|
||||
@@ -36,6 +38,13 @@ public interface GaoProductStockService {
|
||||
/// 手工入库
|
||||
GaoProductStock manualIn(GaoProductStockChangeRequest request);
|
||||
|
||||
/// 批量手工入库
|
||||
///
|
||||
/// @param request 批量手工入库请求
|
||||
/// @return 更新后的库存列表
|
||||
/// @throws TimiException 请求或库存校验失败
|
||||
List<GaoProductStock> manualInBatch(GaoProductStockManualInBatchRequest request);
|
||||
|
||||
/// 手工出库
|
||||
GaoProductStock manualOut(GaoProductStockChangeRequest request);
|
||||
|
||||
|
||||
+18
-4
@@ -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();
|
||||
@@ -443,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);
|
||||
@@ -657,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)) {
|
||||
|
||||
+5
-1
@@ -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 已被其他资金操作使用");
|
||||
|
||||
+13
-3
@@ -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);
|
||||
|
||||
+9
-3
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
+141
-4
@@ -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
|
||||
@@ -391,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(), "库存变更至少需要一个产品");
|
||||
@@ -407,7 +470,11 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
||||
}
|
||||
List<GaoProductStockRecord> existingList = recordService.listByRequestNo(storeId, normalizedRequestNo);
|
||||
if (!existingList.isEmpty()) {
|
||||
verifyExistingList(existingList, itemList, operationType, bizId);
|
||||
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()));
|
||||
@@ -447,14 +514,16 @@ 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);
|
||||
List<Attachment> recordAttachmentList = itemAttachmentMap == null
|
||||
? attachmentList : itemAttachmentMap.get(item.getSkuId());
|
||||
recordService.createOperationRecord(record,
|
||||
operationType == GaoProductStockRecord.OperationType.ORDER_OUT ? null : attachmentList);
|
||||
operationType == GaoProductStockRecord.OperationType.ORDER_OUT ? null : recordAttachmentList);
|
||||
if (operationType == GaoProductStockRecord.OperationType.ORDER_OUT) {
|
||||
copyAttachments(record.getId(), attachmentList);
|
||||
}
|
||||
@@ -562,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()));
|
||||
|
||||
+53
-1
@@ -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;
|
||||
@@ -35,6 +37,8 @@ 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;
|
||||
@@ -88,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;
|
||||
@@ -326,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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -63,4 +63,19 @@
|
||||
<if test="beginAt != null">AND `redeemed_at` >= #{beginAt}</if>
|
||||
<if test="endAt != null">AND `redeemed_at` <= #{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>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
1 = 1
|
||||
<if test="storeId != null and storeId != ''">AND r.`store_id` = #{storeId}</if>
|
||||
<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
|
||||
<if test="skuId != null and skuId != ''">AND r.`sku_id` = #{skuId}</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>
|
||||
@@ -61,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 < 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` < 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>
|
||||
|
||||
Reference in New Issue
Block a user