删除 .idea/.gitignore

Dockerfile

@@ -1,24 +0,0 @@
-# 阶段1: 构建
-FROM golang:alpine AS builder
-
-RUN apk add --no-cache git ca-certificates tzdata
-
-ENV TZ=Asia/Shanghai
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-ENV GO111MODULE=on
-ENV GOPROXY=https://goproxy.cn,direct
-ENV CGO_ENABLED=0
-ENV GOTOOLCHAIN=auto
-WORKDIR /build
-
-COPY . .
-
-RUN go mod download && go mod tidy
-
-RUN go build -ldflags="-s -w" -o main ./main.go
-
-
-EXPOSE 3003
-
-CMD ["./main"]

config.yml

@@ -12,9 +12,7 @@ server:
 rate:
   limit: 200
   burst: 300
-cache:
+
-  localTTL: 60
-  redisTTL: 300
 # Database.
 database:
   default:
@@ -22,18 +20,15 @@ database:
       host: "116.204.74.41"
       port: "15432"
       user: "postgres"
-      pass: "Bjang09@686^*^"
+      pass: "123456"
       name: "assets"
-      prefix: "assets_"           # (可选)表名前缀
+      role: "master"
-      role: "master"              # (可选)数据库主从角色(master/slave)，默认为master。如果不使用应用主从机制请不配置或留空即可。
+      maxIdle: "5"
-      debug: false                # (可选)开启调试模式
+      maxOpen: "20"
-      dryRun: false               # (可选)ORM空跑(只读不写)
+      maxLifetime: "60s"
-      charset: "utf8"             # (可选)数据库编码(如: utf8mb4/utf8/gbk/gb2312)，一般设置为utf8mb4。默认为utf8。
+      charset: "utf8mb4" #数据库编码
-      timezone: "Asia/Shanghai"           # (可选)时区配置，例如:Local
+      debug: true
-      maxIdle: 5                  # (可选)连接池最大闲置的连接数(默认10)
+      dryRun: false #空跑
-      maxOpen: 20                 # (可选)连接池最大打开的连接数(默认无限制)
-      maxLifetime: "30s"          # (可选)连接对象可重复使用的时间长度(默认30秒)
-      maxIdleConnTime: "30s"      # (可选，v2.10新增)连接池中空闲连接的最大生存时间(默认30秒)。可以通过配置文件或SetConnMaxIdleTime方法设置，避免长时间空闲连接占用资源。
       createdAt: "created_at"     # (可选)自动创建时间字段名称
       updatedAt: "updated_at"     # (可选)自动更新时间字段名称
       deletedAt: "deleted_at"     # (可选)软删除时间字段名称
@@ -42,39 +37,33 @@ database:
       host: "116.204.74.41"
       port: "15432"
       user: "postgres"
-      pass: "Bjang09@686^*^"
+      pass: "123456"
       name: "assets"
-      prefix: "assets_"           # (可选)表名前缀
+      role: "slave"
-      role: "slave"               # (可选)数据库主从角色(master/slave)，默认为master。如果不使用应用主从机制请不配置或留空即可。
+      maxIdle: "5"
-      debug: false                # (可选)开启调试模式
+      maxOpen: "20"
-      dryRun: false               # (可选)ORM空跑(只读不写)
+      maxLifetime: "60s"
-      charset: "utf8"             # (可选)数据库编码(如: utf8mb4/utf8/gbk/gb2312)，一般设置为utf8mb4。默认为utf8。
+      charset: "utf8mb4" #数据库编码
-      timezone: "Asia/Shanghai"           # (可选)时区配置，例如:Local
+      debug: true
-      maxIdle: 5                  # (可选)连接池最大闲置的连接数(默认10)
+      dryRun: false #空跑
-      maxOpen: 20                 # (可选)连接池最大打开的连接数(默认无限制)
-      maxLifetime: "30s"          # (可选)连接对象可重复使用的时间长度(默认30秒)
-      maxIdleConnTime: "30s"      # (可选，v2.10新增)连接池中空闲连接的最大生存时间(默认30秒)。可以通过配置文件或SetConnMaxIdleTime方法设置，避免长时间空闲连接占用资源。
       createdAt: "created_at"     # (可选)自动创建时间字段名称
       updatedAt: "updated_at"     # (可选)自动更新时间字段名称
       deletedAt: "deleted_at"     # (可选)软删除时间字段名称
       timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性，为true时CreatedAt/UpdatedAt/DeletedAt都将失效
   tenant-1:
-    - type: "pgsql"
+    - type: "pgsql"  # 使用自定义驱动，自动赋值创建人/修改人/租户ID
       host: "116.204.74.41"
       port: "15432"
       user: "postgres"
-      pass: "Bjang09@686^*^"
+      pass: "123456"
-      name: "tenant-1"
+      name: "tenant"
-      prefix: "assets_"           # (可选)表名前缀
       role: "master"
-      debug: true                # (可选)开启调试模式
+      maxIdle: "5"
-      dryRun: false               # (可选)ORM空跑(只读不写)
+      maxOpen: "20"
-      charset: "utf8"             # (可选)数据库编码(如: utf8mb4/utf8/gbk/gb2312)，一般设置为utf8mb4。默认为utf8。
+      maxLifetime: "60s"
-      timezone: "Asia/Shanghai"           # (可选)时区配置，例如:Local
+      charset: "utf8" #数据库编码
-      maxIdle: 5                  # (可选)连接池最大闲置的连接数(默认10)
+      debug: true
-      maxOpen: 20                 # (可选)连接池最大打开的连接数(默认无限制)
+      dryRun: false #空跑
-      maxLifetime: "30s"          # (可选)连接对象可重复使用的时间长度(默认30秒)
-      maxIdleConnTime: "30s"      # (可选，v2.10新增)连接池中空闲连接的最大生存时间(默认30秒)。可以通过配置文件或SetConnMaxIdleTime方法设置，避免长时间空闲连接占用资源。
       createdAt: "created_at"     # (可选)自动创建时间字段名称
       updatedAt: "updated_at"     # (可选)自动更新时间字段名称
       deletedAt: "deleted_at"     # (可选)软删除时间字段名称
@@ -114,17 +103,8 @@ nats:
     url: "nats://116.204.74.41:4222"
 
 # 文件上传服务地址，与oss模块minio中的endpoint一致
-filePrefix: "http://172.17.0.3:9000"
+filePrefix: "116.204.74.41:9000"
 
-gmq:
+cache:
-  redis:
+  localTTL: 60
-    primary:
+  redisTTL: 300
-      addr: "116.204.74.41"
-      port: "6379"
-      db: 0
-      username: ""
-      password: ""
-      poolSize: 10
-      minIdleConn: 5
-      maxActiveConn: 10
-      maxRetries: 30

consts/asset/asset_sku_status.go

@@ -1,28 +1,9 @@
 package consts
 
-import "github.com/gogf/gf/v2/util/gconv"
-
 // AssetSkuStatus SKU状态枚举
 
-var (
+type AssetSkuStatusType *int
-	AssetSkuStatusDisable = newAssetSkuStatus(gconv.PtrInt8(0), "disable")
-	AssetSkuStatusEnable  = newAssetSkuStatus(gconv.PtrInt8(1), "enable")
-)
 
-type AssetSkuStatus *int8
+type AssetSkuStatus struct {
-
+	Status AssetSkuStatusType
-type assetSkuStatus struct {
-	code AssetSkuStatus
-	desc string
-}
-
-func (s assetSkuStatus) Code() AssetSkuStatus {
-	return s.code
-}
-func (s assetSkuStatus) Desc() string {
-	return s.desc
-}
-
-func newAssetSkuStatus(code AssetSkuStatus, desc string) assetSkuStatus {
-	return assetSkuStatus{code: code, desc: desc}
 }

consts/asset/asset_status.go

@@ -1,28 +1,9 @@
 package consts
 
-import "github.com/gogf/gf/v2/util/gconv"
-
 // AssetStatus 资产状态枚举
 
-var (
+type AssetStatusType *int
-	AssetStatusDisable = newAssetStatus(gconv.PtrInt8(0), "disable")
-	AssetStatusEnable  = newAssetStatus(gconv.PtrInt8(1), "enable")
-)
 
-type AssetStatus *int8
+type AssetStatus struct {
-
+	Status AssetStatusType
-type assetStatus struct {
-	code AssetStatus
-	desc string
-}
-
-func (s assetStatus) Code() AssetStatus {
-	return s.code
-}
-func (s assetStatus) Desc() string {
-	return s.desc
-}
-
-func newAssetStatus(code AssetStatus, desc string) assetStatus {
-	return assetStatus{code: code, desc: desc}
 }

consts/category/category_status.go

@@ -1,28 +1,14 @@
 package consts
 
-import "github.com/gogf/gf/v2/util/gconv"
-
 // CategoryStatus 分类状态枚举
 
-var (
+type CategoryStatusType *int
-	CategoryStatusDisable = newCategoryStatus(gconv.PtrInt8(0), "disable")
-	CategoryStatusEnable  = newCategoryStatus(gconv.PtrInt8(1), "enable")
-)
 
-type CategoryStatus *int8
+type CategoryStatus struct {
-
+	Status CategoryStatusType
-type categoryStatus struct {
-	code CategoryStatus
-	desc string
 }
 
-func (s categoryStatus) Code() CategoryStatus {
+//var CategoryStatusVal = CategoryStatus{
-	return s.code
+//	CategoryStatusActive:   gconv.PtrInt(1),
-}
+//	CategoryStatusInactive: gconv.PtrInt(0),
-func (s categoryStatus) Desc() string {
+//}
-	return s.desc
-}
-
-func newCategoryStatus(code CategoryStatus, desc string) categoryStatus {
-	return categoryStatus{code: code, desc: desc}
-}

consts/public/collections.go

@@ -1,17 +1,17 @@
 package public
 
-// 数据库表名
+// MongoDB集合名称常量
 const (
-	TableNameCategory                     = "category"                       // 分类集合
+	AssetCollection                       = "assets_asset"                   // 资产集合
-	TableNameAsset                        = "asset"                          // 资产集合
+	CategoryCollection                    = "assets_category"                // 分类集合
-	TableNameAssetSku                     = "asset_sku"                      // SKU集合
-	TableNameStockDetails                 = "stock_details"                  // 库存明细集合
-	TableNameStockBatch                   = "stock_batch"                    // 库存批次集合
 	PrivateCategoryCollection             = "private_category"               // 私域分类集合
+	StockDetailsCollection                = "stock_details"                  // 库存明细集合
+	StockBatchCollection                  = "stock_batch"                    // 库存批次集合
 	PrivateStockCollection                = "private_stock"                  // 私域库存批次集合
 	PurchaseOrderCollection               = "purchase_order"                 // 采购订单主表集合（统一模式）
 	PurchaseOrderItemCollection           = "purchase_order_item"            // 采购订单明细集合
 	PurchaseBidCollection                 = "purchase_bid"                   // 采购投标单集合（供应商抢单参与记录）
+	AssetSkuCollection                    = "asset_sku"                      // SKU集合
 	PrivateSkuCollection                  = "private_sku"                    // 私域sku集合
 	SupplierCollection                    = "supplier"                       // 供应商集合
 	ExpiryMessageCollection               = "expiry_message"                 // 临期消息集合（兼容旧数据）

consts/public/redis_key.go

@@ -1,12 +1,11 @@
 package public
 
-const GmqMsgPluginsName = "gmq_msg"
+const StockDetailLockKey = "stock:lock:skuId-%s"
-
-const StockDetailLockKey = "stock:lock:skuId-%v"
 
 // 消费者配置（从 Redis Stream 消费请求）
-const StockDetailQueueName = "assets:stock:stream"      // 请求 Stream 键名（与发消息的key一致）
+const StockDetailQueueName = "assets:stock:detail:request:stream" // 请求 Stream 键名（与发消息的key一致）
-const StockDetailConsumerName = "assets-stock-consumer" // 消费者名称（唯一标识）
+const StockDetailGroupName = "assets:stock:detail:consumer:group" // 消费者组名
+const StockDetailConsumerName = "message-consumer-1"              // 消费者名称（唯一标识）
 const StockDetailPrefetchCount = 1                                // 批处理大小（每次读取1条）
 const StockDetailAutoAck = false                                  // ACK是否自动确认（true自动确认，false不确认）
 

consts/stock/batch_status.go

@@ -1,30 +1,21 @@
 package stock
 
-import "github.com/gogf/gf/v2/util/gconv"
-
 // BatchStatus 批次状态枚举
+type BatchStatus int
 
-var (
+const (
-	BatchStatusActive   = newBatchStatus(gconv.PtrInt8(1), "活跃")
+	BatchStatusActive   BatchStatus = 1 // 活跃
-	BatchStatusExpiring = newBatchStatus(gconv.PtrInt8(2), "临期")
+	BatchStatusExpiring BatchStatus = 2 // 临期
-	BatchStatusExpired  = newBatchStatus(gconv.PtrInt8(3), "过期")
+	BatchStatusExpired  BatchStatus = 3 // 过期
-	BatchStatusSoldOut  = newBatchStatus(gconv.PtrInt8(4), "售罄")
+	BatchStatusSoldOut  BatchStatus = 4 // 售罄
 )
 
-type BatchStatus *int8
+// GetAllBatchStatuses 获取所有批次状态
-
+func GetAllBatchStatuses() []BatchStatus {
-type batchStatus struct {
+	return []BatchStatus{
-	code BatchStatus
+		BatchStatusActive,
-	desc string
+		BatchStatusExpiring,
+		BatchStatusExpired,
+		BatchStatusSoldOut,
 	}
-
-func (s batchStatus) Code() BatchStatus {
-	return s.code
-}
-func (s batchStatus) Desc() string {
-	return s.desc
-}
-
-func newBatchStatus(code BatchStatus, desc string) batchStatus {
-	return batchStatus{code: code, desc: desc}
 }

consts/stock/stock_status.go

@@ -1,30 +1,21 @@
 package stock
 
-import "github.com/gogf/gf/v2/util/gconv"
-
 // StockStatus 库存状态枚举
+type StockStatus int
 
-var (
+const (
-	StockStatusAvailable = newStockStatus(gconv.PtrInt8(1), "可用，未分配渠道")
+	StockStatusAvailable StockStatus = 1 // 可用，未分配渠道
-	StockStatusSold      = newStockStatus(gconv.PtrInt8(2), "已售出")
+	StockStatusSold      StockStatus = 2 // 已售出
-	StockStatusReserved  = newStockStatus(gconv.PtrInt8(3), "预留")
+	StockStatusReserved  StockStatus = 3 // 预留
-	StockStatusLocked    = newStockStatus(gconv.PtrInt8(4), "锁定")
+	StockStatusLocked    StockStatus = 4 // 锁定
 )
 
-type StockStatus *int8
+// GetAllStockStatuses 获取所有库存状态
-
+func GetAllStockStatuses() []StockStatus {
-type stockStatus struct {
+	return []StockStatus{
-	code StockStatus
+		StockStatusAvailable,
-	desc string
+		StockStatusSold,
+		StockStatusReserved,
+		StockStatusLocked,
 	}
-
-func (s stockStatus) Code() StockStatus {
-	return s.code
-}
-func (s stockStatus) Desc() string {
-	return s.desc
-}
-
-func newStockStatus(code StockStatus, desc string) stockStatus {
-	return stockStatus{code: code, desc: desc}
 }

controller/asset/asset_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type asset struct{}

controller/asset/asset_sku_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type assetSku struct{}

controller/asset/category_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type category struct{}

controller/asset/private_category_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type privateCategory struct{}

controller/asset/private_sku_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type privateSku struct{}

controller/procurement/purchase_order_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type purchaseOrder struct{}

controller/procurement/purchase_order_item_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type purchaseOrderItem struct{}

controller/procurement/supplier_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type supplier struct{}

controller/stock/inventory_count_adjust_history_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type inventoryCountAdjustHistory struct{}

controller/stock/inventory_count_controller.go

@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"io"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 )
 

controller/stock/inventory_count_detail_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type inventoryCountDetail struct{}

controller/stock/inventory_warning_history_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type inventoryWarningHistory struct{}

controller/stock/location_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type location struct{}

controller/stock/private_stock_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type privateStockController struct{}

controller/stock/stock_batch_controller.go

@@ -4,6 +4,14 @@
 // 注意：Update/Delete返回*beans.ResponseEmpty，直接return
 package controller
 
+import (
+	dto "assets/model/dto/stock"
+	service "assets/service/stock"
+	"context"
+
+	"gitea.com/red-future/common/beans"
+)
+
 type stockBatchController struct{}
 
 var StockBatch = new(stockBatchController)
@@ -11,24 +19,24 @@ var StockBatch = new(stockBatchController)
 func init() {
 }
 
-//func (c *stockBatchController) CreateBatch(ctx context.Context, req *dto.CreateBatchReq) (res *dto.CreateBatchRes, err error) {
+func (c *stockBatchController) CreateBatch(ctx context.Context, req *dto.CreateBatchReq) (res *dto.CreateBatchRes, err error) {
-//	return service.StockBatch.Create(ctx, req)
+	return service.StockBatch.Create(ctx, req)
-//}
+}
-//
+
-//func (c *stockBatchController) UpdateBatch(ctx context.Context, req *dto.UpdateBatchReq) (res *beans.ResponseEmpty, err error) {
+func (c *stockBatchController) UpdateBatch(ctx context.Context, req *dto.UpdateBatchReq) (res *beans.ResponseEmpty, err error) {
-//	err = service.StockBatch.Update(ctx, req)
+	err = service.StockBatch.Update(ctx, req)
-//	return
+	return
-//}
+}
-//
+
-//func (c *stockBatchController) DeleteBatch(ctx context.Context, req *dto.DeleteBatchReq) (res *beans.ResponseEmpty, err error) {
+func (c *stockBatchController) DeleteBatch(ctx context.Context, req *dto.DeleteBatchReq) (res *beans.ResponseEmpty, err error) {
-//	err = service.StockBatch.Delete(ctx, req)
+	err = service.StockBatch.Delete(ctx, req)
-//	return
+	return
-//}
+}
-//
+
-//func (c *stockBatchController) GetBatch(ctx context.Context, req *dto.GetBatchReq) (res *dto.GetBatchRes, err error) {
+func (c *stockBatchController) GetBatch(ctx context.Context, req *dto.GetBatchReq) (res *dto.GetBatchRes, err error) {
-//	return service.StockBatch.GetOne(ctx, req)
+	return service.StockBatch.GetOne(ctx, req)
-//}
+}
-//
+
-//func (c *stockBatchController) ListBatches(ctx context.Context, req *dto.ListBatchReq) (res *dto.ListBatchRes, err error) {
+func (c *stockBatchController) ListBatches(ctx context.Context, req *dto.ListBatchReq) (res *dto.ListBatchRes, err error) {
-//	return service.StockBatch.List(ctx, req)
+	return service.StockBatch.List(ctx, req)
-//}
+}

controller/stock/stock_details_controller.go

@@ -4,6 +4,12 @@
 // 注意：只读接口，无写操作
 package controller
 
+import (
+	dto "assets/model/dto/stock"
+	service "assets/service/stock"
+	"context"
+)
+
 type stockDetails struct{}
 
 // StockDetails 库存控制器
@@ -12,10 +18,10 @@ var StockDetails = new(stockDetails)
 func init() {
 }
 
-//func (c *stockDetails) GetStockDetails(ctx context.Context, req *dto.GetStockDetailsReq) (res *dto.GetStockDetailsRes, err error) {
+func (c *stockDetails) GetStockDetails(ctx context.Context, req *dto.GetStockDetailsReq) (res *dto.GetStockDetailsRes, err error) {
-//	return service.StockDetails.GetOne(ctx, req)
+	return service.StockDetails.GetOne(ctx, req)
-//}
+}
-//
+
-//func (c *stockDetails) ListStockDetails(ctx context.Context, req *dto.ListStockDetailsReq) (res *dto.ListStockDetailsRes, err error) {
+func (c *stockDetails) ListStockDetails(ctx context.Context, req *dto.ListStockDetailsReq) (res *dto.ListStockDetailsRes, err error) {
-//	return service.StockDetails.List(ctx, req)
+	return service.StockDetails.List(ctx, req)
-//}
+}

controller/stock/stock_manage_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type stockManage struct{}

controller/stock/unit_conversion_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type unitConversionController struct{}

controller/stock/warehouse_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type warehouse struct{}

controller/stock/zone_controller.go

@@ -9,7 +9,7 @@ import (
 	service "assets/service/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type zone struct{}

controller/sync/sync_controller.go

@@ -5,7 +5,7 @@ import (
 	service "assets/service/sync"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type syncController struct{}

dao/asset/asset_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
+	"gitea.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -23,7 +23,7 @@ func (d *assetDao) Insert(ctx context.Context, req *dto.CreateAssetReq) (id int6
 	if err = gconv.Struct(req, &res); err != nil {
 		return
 	}
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAsset).Data(&res).Insert()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetCollection).Ctx(ctx).Data(&res).Insert()
 	if err != nil {
 		return
 	}
@@ -32,7 +32,7 @@ func (d *assetDao) Insert(ctx context.Context, req *dto.CreateAssetReq) (id int6
 
 // Update 更新资产
 func (d *assetDao) Update(ctx context.Context, req *dto.UpdateAssetReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAsset).Data(&req).Where(entity.AssetCol.Id, req.Id).Update()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetCollection).Ctx(ctx).OmitEmpty().Where(entity.AssetCol.Id, req.Id).Update()
 	if err != nil {
 		return
 	}
@@ -41,7 +41,7 @@ func (d *assetDao) Update(ctx context.Context, req *dto.UpdateAssetReq) (rows in
 
 // Delete 删除资产-根据id进行假删
 func (d *assetDao) Delete(ctx context.Context, req *dto.DeleteAssetReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAsset).Where(entity.AssetCol.Id, req.Id).Delete()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetCollection).Where(entity.AssetCol.Id, req.Id).Delete()
 	if err != nil {
 		return
 	}
@@ -50,7 +50,7 @@ func (d *assetDao) Delete(ctx context.Context, req *dto.DeleteAssetReq) (rows in
 
 // GetOne 获取单个资产
 func (d *assetDao) GetOne(ctx context.Context, req *dto.GetAssetReq, fields ...string) (res *entity.Asset, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAsset).Where(entity.AssetCol.Id, req.Id).Fields(fields).One()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetCollection).Ctx(ctx).Where(entity.AssetCol.Id, req.Id).Fields(fields).One()
 	if err != nil {
 		return
 	}
@@ -65,7 +65,9 @@ func (d *assetDao) Count(ctx context.Context, req *dto.ListAssetReq) (count int,
 
 // List 获取资产列表
 func (d *assetDao) List(ctx context.Context, req *dto.ListAssetReq, fields ...string) (res []entity.Asset, total int, err error) {
-	model := d.buildListFilter(ctx, req).Fields(fields).OrderDesc(entity.AssetCol.CreatedAt)
+	model := d.buildListFilter(ctx, req)
+	model.Fields(fields)
+	model.OrderDesc(entity.AssetCol.CreatedAt)
 	if req.Page != nil {
 		model.Page(int(req.Page.PageNum), int(req.Page.PageSize))
 	}
@@ -79,7 +81,7 @@ func (d *assetDao) List(ctx context.Context, req *dto.ListAssetReq, fields ...st
 
 // buildListFilter 构建列表查询的过滤条件
 func (d *assetDao) buildListFilter(ctx context.Context, req *dto.ListAssetReq) *gdb.Model {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameAsset).Cache(ctx).OmitEmpty()
+	model := gfdb.DB(ctx).Model(ctx, public.AssetCollection).Model
 	if !g.IsEmpty(req.Keyword) {
 		model.WhereLike(entity.AssetCol.Name, "%"+req.Keyword+"%")
 	}
@@ -90,5 +92,6 @@ func (d *assetDao) buildListFilter(ctx context.Context, req *dto.ListAssetReq) *
 	model.Where(entity.AssetCol.Type, req.Type)
 	model.Where(entity.AssetCol.CategoryId, req.CategoryId)
 	model.Where(entity.AssetCol.Status, req.Status)
+	model.OmitEmptyWhere()
 	return model
 }

dao/asset/asset_sku_dao.go

@@ -6,7 +6,7 @@ import (
 	"assets/model/entity/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
+	"gitea.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -23,7 +23,7 @@ func (d *assetSku) Insert(ctx context.Context, req *dto.CreateAssetSkuReq) (id i
 	if err = gconv.Struct(req, &res); err != nil {
 		return
 	}
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAssetSku).Data(&res).Insert()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetSkuCollection).Ctx(ctx).Data(&res).Insert()
 	if err != nil {
 		return
 	}
@@ -32,7 +32,7 @@ func (d *assetSku) Insert(ctx context.Context, req *dto.CreateAssetSkuReq) (id i
 
 // Update 更新SKU
 func (d *assetSku) Update(ctx context.Context, req *dto.UpdateAssetSkuReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAssetSku).Data(&req).Where(entity.AssetCol.Id, req.Id).Update()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetSkuCollection).Ctx(ctx).OmitEmpty().Where(entity.AssetCol.Id, req.Id).Update()
 	if err != nil {
 		return
 	}
@@ -41,7 +41,7 @@ func (d *assetSku) Update(ctx context.Context, req *dto.UpdateAssetSkuReq) (rows
 
 // Delete 删除SKU-根据id进行假删
 func (d *assetSku) Delete(ctx context.Context, req *dto.DeleteAssetSkuReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAssetSku).Where(entity.AssetSkuCol.Id, req.Id).Delete()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetSkuCollection).Where(entity.AssetSkuCol.Id, req.Id).Delete()
 	if err != nil {
 		return
 	}
@@ -50,7 +50,7 @@ func (d *assetSku) Delete(ctx context.Context, req *dto.DeleteAssetSkuReq) (rows
 
 // GetOne 获取单个SKU
 func (d *assetSku) GetOne(ctx context.Context, req *dto.GetAssetSkuReq, fields ...string) (res *entity.AssetSku, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameAssetSku).Where(entity.AssetCol.Id, req.Id).Fields(fields).One()
+	r, err := gfdb.DB(ctx).Model(ctx, public.AssetSkuCollection).Ctx(ctx).Where(entity.AssetCol.Id, req.Id).Fields(fields).One()
 	if err != nil {
 		return
 	}
@@ -60,7 +60,8 @@ func (d *assetSku) GetOne(ctx context.Context, req *dto.GetAssetSkuReq, fields .
 
 // GetListByAssetIdExcludeCurrentSku 根据资产ID获取SKU列表并且排除当前SKU
 func (d *assetSku) GetListByAssetIdExcludeCurrentSku(ctx context.Context, assetId int64, req *dto.ListAssetSkuReq, fields ...string) (res []entity.AssetSku, total int, err error) {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameAssetSku).Fields(fields).OmitEmpty()
+	model := gfdb.DB(ctx).Model(ctx, public.AssetSkuCollection)
+	model.Fields(fields)
 	model.Where(entity.AssetSkuCol.AssetId, assetId)
 	model.WhereNot(entity.AssetSkuCol.Id, req.Id)
 	if req.Page != nil {
@@ -76,7 +77,8 @@ func (d *assetSku) GetListByAssetIdExcludeCurrentSku(ctx context.Context, assetI
 
 // List 获取SKU列表
 func (d *assetSku) List(ctx context.Context, req *dto.ListAssetSkuReq, fields ...string) (res []entity.AssetSku, total int, err error) {
-	model := d.buildListFilter(ctx, req).Fields(fields)
+	model := d.buildListFilter(ctx, req)
+	model.Fields(fields)
 	model.OrderAsc(entity.AssetSkuCol.Sort)
 	model.OrderDesc(entity.AssetSkuCol.CreatedAt)
 	if req.Page != nil {
@@ -92,7 +94,7 @@ func (d *assetSku) List(ctx context.Context, req *dto.ListAssetSkuReq, fields ..
 
 // buildListFilter 构建列表查询的过滤条件
 func (d *assetSku) buildListFilter(ctx context.Context, req *dto.ListAssetSkuReq) *gdb.Model {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameAssetSku).Cache(ctx).OmitEmpty()
+	model := gfdb.DB(ctx).Model(ctx, public.AssetSkuCollection).Model
 	if !g.IsEmpty(req.Keyword) {
 		model.WhereLike(entity.AssetCol.Name, "%"+req.Keyword+"%")
 		model.WhereOrLike(entity.AssetSkuCol.SkuName, "%"+req.Keyword+"%")
@@ -102,9 +104,8 @@ func (d *assetSku) buildListFilter(ctx context.Context, req *dto.ListAssetSkuReq
 	}
 	model.Where(entity.AssetSkuCol.Id, req.Id)
 	model.Where(entity.AssetSkuCol.Status, req.Status)
-	if req.MinPrice > 0 && req.MaxPrice > 0 {
 	model.WhereGT(entity.AssetSkuCol.Price, req.MinPrice)
 	model.WhereLT(entity.AssetSkuCol.Price, req.MaxPrice)
-	}
+	model.OmitEmptyWhere()
 	return model
 }

dao/asset/category_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
+	"gitea.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -23,7 +23,7 @@ func (d *category) Insert(ctx context.Context, req *dto.CreateCategoryReq) (id i
 	if err = gconv.Struct(req, &res); err != nil {
 		return
 	}
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameCategory).Insert(&res)
+	r, err := gfdb.DB(ctx).Model(ctx, public.CategoryCollection).Insert(&res)
 	if err != nil {
 		return
 	}
@@ -32,7 +32,7 @@ func (d *category) Insert(ctx context.Context, req *dto.CreateCategoryReq) (id i
 
 // Update 更新分类
 func (d *category) Update(ctx context.Context, req *dto.UpdateCategoryReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameCategory).Data(&req).Where(entity.CategoryCol.Id, req.Id).Update()
+	r, err := gfdb.DB(ctx).Model(ctx, public.CategoryCollection).Data(&req).OmitEmpty().Where(entity.CategoryCol.Id, req.Id).Update()
 	if err != nil {
 		return
 	}
@@ -41,7 +41,7 @@ func (d *category) Update(ctx context.Context, req *dto.UpdateCategoryReq) (rows
 
 // Delete 删除分类-根据id及父id进行假删
 func (d *category) Delete(ctx context.Context, req *dto.DeleteCategoryReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameCategory).Where(entity.CategoryCol.Id, req.Id).Delete()
+	r, err := gfdb.DB(ctx).Model(ctx, public.CategoryCollection).Where(entity.CategoryCol.Id, req.Id).Delete()
 	if err != nil {
 		return
 	}
@@ -50,7 +50,7 @@ func (d *category) Delete(ctx context.Context, req *dto.DeleteCategoryReq) (rows
 
 // GetOne 获取单个分类
 func (d *category) GetOne(ctx context.Context, req *dto.GetCategoryReq, fields ...string) (res *entity.Category, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameCategory).Where(entity.CategoryCol.Id, req.Id).Fields(fields).One()
+	r, err := gfdb.DB(ctx).Model(ctx, public.CategoryCollection).Where(entity.CategoryCol.Id, req.Id).Fields(fields).One()
 	if err != nil {
 		return
 	}
@@ -65,7 +65,8 @@ func (d *category) Count(ctx context.Context, req *dto.ListCategoryReq) (count i
 
 // List 获取分类列表
 func (d *category) List(ctx context.Context, req *dto.ListCategoryReq, fields ...string) (res []entity.Category, total int, err error) {
-	model := d.buildListFilter(ctx, req).Fields(fields)
+	model := d.buildListFilter(ctx, req)
+	model.Fields(fields)
 	model.OrderAsc(entity.CategoryCol.Sort)
 	model.OrderDesc(entity.CategoryCol.CreatedAt)
 	if req.Page != nil {
@@ -81,11 +82,12 @@ func (d *category) List(ctx context.Context, req *dto.ListCategoryReq, fields ..
 
 // buildListFilter 构建列表查询的过滤条件
 func (d *category) buildListFilter(ctx context.Context, req *dto.ListCategoryReq) *gdb.Model {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameCategory).Cache(ctx).OmitEmpty()
+	model := gfdb.DB(ctx).Model(ctx, public.CategoryCollection).Model
 	if !g.IsEmpty(req.Keyword) {
 		model.WhereLike(entity.CategoryCol.Name, "%"+req.Keyword+"%")
 	}
 	model.Where(entity.CategoryCol.ParentId, req.ParentId)
 	model.Where(entity.CategoryCol.Status, req.Status)
+	model.OmitEmptyWhere()
 	return model
 }

dao/asset/private_category_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"go.mongodb.org/mongo-driver/v2/bson"

dao/asset/private_sku_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/asset"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"go.mongodb.org/mongo-driver/v2/bson"

dao/base/catch_sql.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 )

dao/base/hook.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"time"
 
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/database/gredis"
 	"github.com/gogf/gf/v2/frame/g"

dao/base/interceptor.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 )

dao/procurement/purchase_inbound_dao.go

@@ -6,9 +6,9 @@ import (
 	entity "assets/model/entity/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

dao/procurement/purchase_order_dao.go

@@ -6,8 +6,8 @@ import (
 	entity "assets/model/entity/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/procurement/purchase_order_item_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"

dao/procurement/supplier_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/procurement"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"go.mongodb.org/mongo-driver/v2/bson"

dao/stock/inventory_count_adjust_history_dao.go

@@ -6,8 +6,8 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/stock/inventory_count_dao.go

@@ -12,8 +12,8 @@ import (
 	"context"
 	"fmt"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/stock/inventory_count_detail_dao.go

@@ -11,7 +11,7 @@ import (
 	"context"
 	"fmt"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

dao/stock/inventory_warning_dao.go

@@ -10,7 +10,7 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/stock/inventory_warning_history_dao.go

@@ -10,7 +10,7 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/stock/location_dao.go

@@ -11,8 +11,8 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
@@ -154,14 +154,14 @@ func (d *location) DeleteByWarehouseId(ctx context.Context, warehouseId string)
 // CountStockDetailsByLocationId 统计库位上的库存明细数量（用于删除前检查）
 func (d *location) CountStockDetailsByLocationId(ctx context.Context, locationId string) (count int64, err error) {
 	filter := bson.M{"locationId": locationId}
-	count, err = mongo.DB().Count(ctx, filter, public.TableNameStockDetails)
+	count, err = mongo.DB().Count(ctx, filter, public.StockDetailsCollection)
 	return
 }
 
 // CountStockBatchByLocationId 统计库位上的批次库存数量（用于删除前检查）
 func (d *location) CountStockBatchByLocationId(ctx context.Context, locationId string) (count int64, err error) {
 	filter := bson.M{"locationId": locationId}
-	count, err = mongo.DB().Count(ctx, filter, public.TableNameStockBatch)
+	count, err = mongo.DB().Count(ctx, filter, public.StockBatchCollection)
 	return
 }
 

dao/stock/private_stock_dao.go

@@ -11,9 +11,9 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"

dao/stock/stock_batch_dao.go

@@ -10,10 +10,9 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
+	"gitea.com/red-future/common/db/mongo"
-	"github.com/gogf/gf/v2/database/gdb"
+	"gitea.com/red-future/common/utils"
-	"github.com/gogf/gf/v2/frame/g"
+	"go.mongodb.org/mongo-driver/v2/bson"
-	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var StockBatch = new(stockBatch)
@@ -22,48 +21,58 @@ type stockBatch struct {
 }
 
 // Insert 插入
-func (d *stockBatch) Insert(ctx context.Context, req *dto.CreateSockBatchReq) (id int64, err error) {
+func (d *stockBatch) Insert(ctx context.Context, req *dto.CreateBatchReq) (ids []interface{}, err error) {
-	var res *entity.StockBatch
+	var result *entity.StockBatch
-	if err = gconv.Struct(req, &res); err != nil {
+	if err = utils.Struct(req, &result); err != nil {
 		return
 	}
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameStockBatch).Data(&res).Insert()
+	ids, err = mongo.DB().Insert(ctx, []interface{}{&result}, public.StockBatchCollection)
-	if err != nil {
 	return
 }
-	return r.LastInsertId()
-}
 
-func (d *stockBatch) Update(ctx context.Context, req *dto.UpdateSockBatchReq) (rows int64, err error) {
+// Update 更新批次数量（使用$inc原子操作，并发安全）
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameStockBatch).Where(entity.StockBatchCol.Id, req.Id)
+func (d *stockBatch) Update(ctx context.Context, req *dto.UpdateBatchReq) (err error) {
-	model.Data(entity.StockBatchCol.BatchQty, &gdb.Counter{
+	filter := bson.M{"_id": req.Id}
-		Field: entity.StockBatchCol.BatchQty,
+	update := bson.M{
-		Value: gconv.Float64(req.BatchQty),
+		"$inc": bson.M{
-	})
+			"batchQty":     req.BatchQty,
-	model.Data(entity.StockBatchCol.AvailableQty, &gdb.Counter{
+			"availableQty": req.AvailableQty,
-		Field: entity.StockBatchCol.AvailableQty,
+		},
-		Value: gconv.Float64(req.AvailableQty),
-	})
-	r, err := model.Update()
-	if err != nil {
-		return
 	}
-	return r.RowsAffected()
+	_, err = mongo.DB().Update(ctx, filter, update, public.StockBatchCollection)
+	return
 }
 
-// One 根据批次号查询（使用NoCache跳过缓存，确保获取最新数据）
+// GetOne 根据批次号查询（使用NoCache跳过缓存，确保获取最新数据）
-func (d *stockBatch) One(ctx context.Context, req *dto.GetSockBatchReq, fields ...string) (res *entity.StockBatch, err error) {
+func (d *stockBatch) GetOne(ctx context.Context, batchNo string) (res *entity.StockBatch, err error) {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameStockBatch)
+	filter := bson.M{"batchNo": batchNo}
-	if !g.IsEmpty(req.Id) {
+	err = mongo.DB().NoCache().FindOne(ctx, filter, &res, public.StockBatchCollection)
-		model.Where(entity.StockBatchCol.Id, req.Id)
-	}
-	if !g.IsEmpty(req.BatchNo) {
-		model.Where(entity.StockBatchCol.BatchNo, req.BatchNo)
-	}
-	r, err := model.Fields(fields).One()
-	if err != nil {
 	return
 }
-	err = r.Struct(&res)
+
+// GetOneById 根据ID查询批次
+func (d *stockBatch) GetOneById(ctx context.Context, req *dto.GetBatchReq) (res *entity.StockBatch, err error) {
+	filter := bson.M{"_id": req.Id}
+	err = mongo.DB().FindOne(ctx, filter, &res, public.StockBatchCollection)
+	return
+}
+
+// DeleteFake 软删除批次
+func (d *stockBatch) DeleteFake(ctx context.Context, req *dto.DeleteBatchReq) error {
+	filter := bson.M{"_id": req.Id}
+	_, err := mongo.DB().DeleteSoft(ctx, filter, public.StockBatchCollection)
+	return err
+}
+
+// List 查询批次列表
+func (d *stockBatch) List(ctx context.Context, req *dto.ListBatchReq) (res []entity.StockBatch, total int64, err error) {
+	filter := bson.M{}
+	if req.AssetId != nil {
+		filter["assetId"] = req.AssetId
+	}
+	if req.AssetSkuId != nil {
+		filter["assetSkuId"] = req.AssetSkuId
+	}
+	total, err = mongo.DB().Find(ctx, filter, &res, public.StockBatchCollection, req.Page, req.OrderBy)
 	return
 }

dao/stock/stock_details_dao.go

@@ -6,13 +6,15 @@ package dao
 
 import (
 	"assets/consts/public"
+	"assets/consts/stock"
 	dto "assets/model/dto/stock"
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
+	"gitea.com/red-future/common/beans"
-	"github.com/gogf/gf/v2/database/gdb"
+	"gitea.com/red-future/common/db/mongo"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/frame/g"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 var StockDetails = new(stockDetails)
@@ -21,50 +23,58 @@ type stockDetails struct {
 }
 
 // BatchInsert 批量插入库存
-func (d *stockDetails) BatchInsert(ctx context.Context, req []*dto.CreateSockDetailsReq) (rows int64, err error) {
+func (d *stockDetails) BatchInsert(ctx context.Context, stockInterfaces []interface{}) (ids []interface{}, err error) {
-	var res []*entity.StockDetails
+	ids, err = mongo.DB().Insert(ctx, stockInterfaces, public.StockDetailsCollection)
-	if err = gconv.Structs(req, &res); err != nil {
-		return
-	}
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameStockDetails).Data(res).Save()
-	if err != nil {
-		return
-	}
-	return r.RowsAffected()
-}
-
-func (d *stockDetails) Delete(ctx context.Context, req []dto.DeleteSockDetailsReq) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameStockDetails).Where(entity.StockDetailsCol.Id, &req).Delete()
-	if err != nil {
-		return
-	}
-	return r.RowsAffected()
-}
-
-func (d *stockDetails) Count(ctx context.Context, req *dto.GetSockDetailsReq) (count int, err error) {
-	return d.buildListFilter(ctx, req).Count()
-}
-
-func (d *stockDetails) List(ctx context.Context, req *dto.GetSockDetailsReq, fields ...string) (res []entity.StockDetails, total int, err error) {
-	model := d.buildListFilter(ctx, req).Fields(fields)
-	model.OrderDesc(entity.StockDetailsCol.CreatedAt)
-	if req.Page != nil {
-		model.Page(int(req.Page.PageNum), int(req.Page.PageSize))
-	}
-	r, total, err := model.AllAndCount(false)
-	if err != nil {
-		return
-	}
-	err = r.Structs(&res)
 	return
 }
 
-// buildListFilter 构建列表查询的过滤条件
+// DeleteManyByIds 根据ID批量删除库存
-func (d *stockDetails) buildListFilter(ctx context.Context, req *dto.GetSockDetailsReq) *gdb.Model {
+func (d *stockDetails) DeleteManyByIds(ctx context.Context, allStockIds []*bson.ObjectID) (count int64, err error) {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameStockDetails).Model.OmitEmpty()
+	if len(allStockIds) == 0 {
-	model.Where(entity.StockDetailsCol.Id, req.Id)
+		return 0, nil
-	model.Where(entity.StockDetailsCol.AssetId, req.AssetId)
+	}
-	model.Where(entity.StockDetailsCol.AssetSkuId, req.AssetSkuId)
+	filter := bson.M{"_id": bson.M{"$in": allStockIds}}
-	model.Where(entity.StockDetailsCol.Status, req.Status)
+	count, err = mongo.DB().Delete(ctx, filter, public.StockDetailsCollection)
-	return model
+	return
+}
+
+// GetStockCountBySkuId 获取库存数根据SKU ID
+func (d *stockDetails) GetStockCountBySkuId(ctx context.Context, assetSkuId int64) (total int64, err error) {
+	// 构建查询过滤条件
+	filter := bson.M{}
+	filter["assetSkuId"] = assetSkuId
+	filter["status"] = stock.StockStatusAvailable
+	// 检查总数
+	total, err = mongo.DB().NoCache().Count(ctx, filter, public.StockDetailsCollection)
+
+	return total, err
+}
+
+// GetOneById 根据ID查询库存明细
+func (d *stockDetails) GetOneById(ctx context.Context, req *dto.GetStockDetailsReq) (res *entity.StockDetails, err error) {
+	filter := bson.M{"_id": req.Id}
+	err = mongo.DB().FindOne(ctx, filter, &res, public.StockDetailsCollection)
+	return
+}
+
+// List 获取SKU列表
+func (d *stockDetails) List(ctx context.Context, req *dto.ListStockDetailsReq) (res []entity.StockDetails, total int64, err error) {
+	// 构建查询过滤条件
+	filter := bson.M{}
+	if !g.IsEmpty(req.AssetId) {
+		filter["assetId"] = req.AssetId
+	}
+	if !g.IsEmpty(req.AssetSkuId) {
+		filter["assetSkuId"] = req.AssetSkuId
+	}
+	if !g.IsEmpty(req.Status) {
+		filter["status"] = req.Status
+	}
+	// 排序处理
+	req.OrderBy = []beans.OrderBy{
+		{Field: "sort", Order: beans.Asc},
+		{Field: "createdAt", Order: beans.Desc},
+	}
+	total, err = mongo.DB().Find(ctx, filter, &res, public.StockDetailsCollection, req.Page, req.OrderBy)
+	return
 }

dao/stock/unit_conversion_dao.go

@@ -10,7 +10,7 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 

dao/stock/warehouse_dao.go

@@ -12,8 +12,8 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/stock/zone_dao.go

@@ -12,8 +12,8 @@ import (
 	entity "assets/model/entity/stock"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
-	"gitea.redpowerfuture.com/red-future/common/utils"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

dao/sync/sync_dao.go

@@ -6,7 +6,7 @@ import (
 	entity "assets/model/entity/sync"
 	"context"
 
-	"gitea.redpowerfuture.com/red-future/common/db/mongo"
+	"gitea.com/red-future/common/db/mongo"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"

go.mod

@@ -1,18 +1,17 @@
 module assets
 
-go 1.26.0
+go 1.25.7
 
 require (
-	gitea.redpowerfuture.com/red-future/common v0.0.23
+	gitea.com/red-future/common v0.0.4
-	github.com/bjang03/gmq v0.0.0-20251219093200-000000000000
 	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
 	github.com/gogf/gf/v2 v2.10.0
-	github.com/redis/go-redis/v9 v9.18.0
+	github.com/redis/go-redis/v9 v9.12.1
-	github.com/xuri/excelize/v2 v2.10.1
+	github.com/xuri/excelize/v2 v2.10.0
-	go.mongodb.org/mongo-driver/v2 v2.5.0
+	go.mongodb.org/mongo-driver/v2 v2.4.1
 )
 
-replace github.com/bjang03/gmq => ../gmq
+//replace gitea.com/red-future/common v0.0.4 => ../common
 
 require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
@@ -26,15 +25,11 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods/v2 v2.0.0-alpha // indirect
-	github.com/fatih/color v1.19.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
+	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-ego/gse v1.0.2 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.30.1 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gogf/gf/contrib/nosql/redis/v2 v2.9.1 // indirect
 	github.com/gogf/gf/contrib/registry/consul/v2 v2.9.5 // indirect
@@ -47,10 +42,10 @@ require (
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/flatbuffers v25.12.19+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
-	github.com/hashicorp/consul/api v1.33.5 // indirect
+	github.com/hashicorp/consul/api v1.33.4 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -59,60 +54,55 @@ require (
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/klauspost/compress v1.18.4 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.11 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/klauspost/crc32 v1.3.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/miekg/dns v1.1.72 // indirect
+	github.com/minio/crc64nvme v1.1.0 // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/minio-go/v7 v7.0.97 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/nats-io/nats.go v1.49.0 // indirect
-	github.com/nats-io/nkeys v0.4.15 // indirect
-	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/olekukonko/errors v1.1.0 // indirect
 	github.com/olekukonko/ll v0.0.9 // indirect
 	github.com/olekukonko/tablewriter v1.1.0 // indirect
+	github.com/philhofer/fwd v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/r3labs/diff/v2 v2.15.1 // indirect
+	github.com/richardlehane/mscfb v1.0.4 // indirect
-	github.com/rabbitmq/amqp091-go v1.10.0 // indirect
+	github.com/richardlehane/msoleps v1.0.4 // indirect
-	github.com/richardlehane/mscfb v1.0.6 // indirect
-	github.com/richardlehane/msoleps v1.0.6 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/spf13/cast v1.10.0 // indirect
+	github.com/rs/xid v1.6.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/tiendc/go-deepcopy v1.7.2 // indirect
+	github.com/tiendc/go-deepcopy v1.7.1 // indirect
 	github.com/tiger1103/gfast-token v1.0.10 // indirect
-	github.com/vcaesar/cedar v0.30.0 // indirect
+	github.com/tinylib/msgp v1.3.0 // indirect
-	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.2.0 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/xuri/efp v0.0.1 // indirect
 	github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel v1.39.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.39.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/crypto v0.44.0 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
+	golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
-	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
+	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
+	google.golang.org/grpc v1.75.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
-	google.golang.org/grpc v1.79.3 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,6 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-gitea.redpowerfuture.com/red-future/common v0.0.23 h1:xieoA00iKOCDm5SO9iXn+cSyMKBAlZwI0fuEVPWrHLg=
+gitea.com/red-future/common v0.0.4 h1:2QgKc+B2iNfPRncKpmIqIzVwaMGJ3y3dt5v+35YD8SU=
-gitea.redpowerfuture.com/red-future/common v0.0.23/go.mod h1:50U1Xi+Ie56z09S5LQbZvaken0Mxv3OeS9LgR7U/ZRY=
+gitea.com/red-future/common v0.0.4/go.mod h1:UI9N5UUjilbMPF7+/lypZSnqDVHigt14300oSRrAyZg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
@@ -61,16 +61,12 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=
+github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
-github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-ego/gse v1.0.2 h1:+27lYFPhQEhA9igtdOsJPRKYL/k3TwYsxBF5jr6KFv4=
-github.com/go-ego/gse v1.0.2/go.mod h1:Fy35G+q7VV7Et1zIKO8o/sW1kkugV3znXap/lF/11zc=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -80,14 +76,6 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=
-github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
@@ -144,16 +132,16 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4=
 github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=
-github.com/hashicorp/consul/api v1.33.5 h1:Nn6q87zudRU1rLBTJEgaWxz9STCNadilLCD7B8OA5aI=
+github.com/hashicorp/consul/api v1.33.4 h1:AJkZp6qzgAYcMIU0+CjJ0Rb7+byfh0dazFK/gzlOcJk=
-github.com/hashicorp/consul/api v1.33.5/go.mod h1:pa6fJOSHKLOzNHpUVeqLDtxA5+J1D7NNzLasuk8eRXA=
+github.com/hashicorp/consul/api v1.33.4/go.mod h1:BkH3WEUzsnWvJJaHoDqKqoe2Q2EIixx7Gjj6MTwYnOA=
-github.com/hashicorp/consul/sdk v0.17.3 h1:oZMMxzQGSsiT+ToOH50y3Qcs0nc9Ud+7L5lRx+EmMU0=
+github.com/hashicorp/consul/sdk v0.17.2 h1:sC0jgNhJkZX3wo1DCrkG12r+1JlZQpWvk3AoL3yZE4Q=
-github.com/hashicorp/consul/sdk v0.17.3/go.mod h1:jnOmYjiNfVRpBaujQ1DFFVs0N6g3S1y6wygSjLTzYfc=
+github.com/hashicorp/consul/sdk v0.17.2/go.mod h1:VjccKcw6YhMhjH84/ZhTXZ0OG4SUq+K25P6DiCV/Hvg=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -199,10 +187,13 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
+github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU=
+github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/crc32 v1.3.0 h1:sSmTt3gUt81RP655XGZPElI0PelVTZ6YwCRnPSupoFM=
+github.com/klauspost/crc32 v1.3.0/go.mod h1:D7kQaZhnkX/Y0tstFGf8VUzv2UofNGqCjnC3zdHB0Hw=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -212,8 +203,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
@@ -237,8 +226,14 @@ github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=
+github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
-github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
+github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
+github.com/minio/crc64nvme v1.1.0 h1:e/tAguZ+4cw32D+IO/8GSf5UVr9y+3eJcxZI2WOO/7Q=
+github.com/minio/crc64nvme v1.1.0/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.97 h1:lqhREPyfgHTB/ciX8k2r8k0D93WaFqxbJX36UZq5occ=
+github.com/minio/minio-go/v7 v7.0.97/go.mod h1:re5VXuo0pwEtoNLsNuSr0RrLfT/MBtohwdaSmPPSRSk=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -248,12 +243,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nats-io/nats.go v1.49.0 h1:yh/WvY59gXqYpgl33ZI+XoVPKyut/IcEaqtsiuTJpoE=
-github.com/nats-io/nats.go v1.49.0/go.mod h1:fDCn3mN5cY8HooHwE2ukiLb4p4G4ImmzvXyJt+tGwdw=
-github.com/nats-io/nkeys v0.4.15 h1:JACV5jRVO9V856KOapQ7x+EY8Jo3qw1vJt/9Jpwzkk4=
-github.com/nats-io/nkeys v0.4.15/go.mod h1:CpMchTXC9fxA5zrMo4KpySxNjiDVvr8ANOSZdiNfUrs=
-github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
-github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
 github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
 github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
@@ -263,6 +252,8 @@ github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfB
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
+github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -284,28 +275,25 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/r3labs/diff/v2 v2.15.1 h1:EOrVqPUzi+njlumoqJwiS/TgGgmZo83619FNDB9xQUg=
+github.com/redis/go-redis/v9 v9.12.1 h1:k5iquqv27aBtnTm2tIkROUDp8JBXhXZIVu1InSgvovg=
-github.com/r3labs/diff/v2 v2.15.1/go.mod h1:I8noH9Fc2fjSaMxqF3G2lhDdC0b+JXCfyx85tWFM9kc=
+github.com/redis/go-redis/v9 v9.12.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
-github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
+github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
-github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
+github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
-github.com/redis/go-redis/v9 v9.18.0 h1:pMkxYPkEbMPwRdenAzUNyFNrDgHx9U+DrBabWNfSRQs=
+github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
-github.com/redis/go-redis/v9 v9.18.0/go.mod h1:k3ufPphLU5YXwNTUcCRXGxUoF1fqxnhFQmscfkCoDA0=
+github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
-github.com/richardlehane/mscfb v1.0.6 h1:eN3bvvZCp00bs7Zf52bxNwAx5lJDBK1tCuH19qq5aC8=
+github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
-github.com/richardlehane/mscfb v1.0.6/go.mod h1:pe0+IUIc0AHh0+teNzBlJCtSyZdFOGgV4ZK9bsoV+Jo=
-github.com/richardlehane/msoleps v1.0.6 h1:9BvkpjvD+iUBalUY4esMwv6uBkfOip/Lzvd93jvR9gg=
-github.com/richardlehane/msoleps v1.0.6/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
-github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
@@ -313,32 +301,27 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44=
+github.com/tiendc/go-deepcopy v1.7.1 h1:LnubftI6nYaaMOcaz0LphzwraqN8jiWTwm416sitff4=
-github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ=
+github.com/tiendc/go-deepcopy v1.7.1/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ=
 github.com/tiger1103/gfast-token v1.0.10 h1:fNiBE/Dq5iTHvTGlCx3DmXa2o4hr0NtumFpffZ39k6s=
 github.com/tiger1103/gfast-token v1.0.10/go.mod h1:a/21mxmj7zFeNvjhZSC0XpEAFHfb1aT2k6DXnufFU1s=
+github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
+github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/vcaesar/cedar v0.30.0 h1:9fSDpM7FTjjUdPiBUUa0MWYMRGSEcqgFXvppZcZ4d7Y=
-github.com/vcaesar/cedar v0.30.0/go.mod h1:lyuGvALuZZDPNXwpzv/9LyxW+8Y6faN7zauFezNsnik=
-github.com/vcaesar/tt v0.20.1 h1:D/jUeeVCNbq3ad8M7hhtB3J9x5RZ6I1n1eZ0BJp7M+4=
-github.com/vcaesar/tt v0.20.1/go.mod h1:cH2+AwGAJm19Wa6xvEa+0r+sXDJBT0QgNQey6mwqLeU=
-github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
-github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs=
+github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
-github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
 github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.10.1 h1:V62UlqopMqha3kOpnlHy2CcRVw1V8E63jFoWUmMzxN0=
+github.com/xuri/excelize/v2 v2.10.0 h1:8aKsP7JD39iKLc6dH5Tw3dgV3sPRh8uRVXu/fMstfW4=
-github.com/xuri/excelize/v2 v2.10.1/go.mod h1:iG5tARpgaEeIhTqt3/fgXCGoBRt4hNXgCp3tfXKoOIc=
+github.com/xuri/excelize/v2 v2.10.0/go.mod h1:SC5TzhQkaOsTWpANfm+7bJCldzcnU/jrhqkTi/iBHBU=
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE=
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
@@ -346,32 +329,28 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfS
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
+go.mongodb.org/mongo-driver/v2 v2.4.1 h1:hGDMngUao03OVQ6sgV5csk+RWOIkF+CuLsTPobNMGNI=
-github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
+go.mongodb.org/mongo-driver/v2 v2.4.1/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
-go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
-go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
-go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
+go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
+go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
 go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -380,11 +359,11 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
+golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
+golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 h1:jiDhWWeC7jfWqR9c/uplMOqJ0sbNlNWv0UkzE0vX1MA=
+golang.org/x/exp v0.0.0-20250808145144-a408d31f581a h1:Y+7uR/b1Mw2iSXZ3G//1haIiSElDQZ8KWh0h+sZPG90=
-golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90/go.mod h1:xE1HEv6b+1SCZ5/uscMRjUBKtIxworgEcEi+/n9NQDQ=
+golang.org/x/exp v0.0.0-20250808145144-a408d31f581a/go.mod h1:rT6SFzZ7oxADUDx58pcaKFTcZ+inxAa9fTrYx/uVYwg=
 golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
 golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -393,15 +372,14 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
-golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -411,8 +389,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -422,8 +400,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -451,8 +429,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -461,8 +439,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -473,8 +451,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
-golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -483,23 +461,20 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 h1:JLQynH/LBHfCTSbDWl+py8C+Rg/k1OVH3xfcaiANuF0=
+google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY=
-google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57/go.mod h1:kSJwQxqmFXeo79zOmbrALdflXQeAYcUbgS7PbpMknCY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 h1:mWPCjDEyshlQYzBpMNHaEof6UX1PmHcaUODUywQ0uac=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
+google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
-google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
+google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -509,8 +484,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

main.go

@@ -1,26 +1,22 @@
 package main
 
 import (
-	"assets/consts/public"
 	assetController "assets/controller/asset"
 	enumController "assets/controller/enum"
 	procurementController "assets/controller/procurement"
 	stockController "assets/controller/stock"
 	syncController "assets/controller/sync"
-	stockService "assets/service/stock"
 	"context"
 	"os"
 	"os/signal"
-	"strings"
 	"syscall"
 
-	"gitea.redpowerfuture.com/red-future/common/http"
+	"gitea.com/red-future/common/http"
-	"gitea.redpowerfuture.com/red-future/common/jaeger"
+	"gitea.com/red-future/common/jaeger"
-	_ "gitea.redpowerfuture.com/red-future/common/swagger"
+
-	gmq "github.com/bjang03/gmq/core/gmq"
+	_ "gitea.com/red-future/common/swagger"
-	"github.com/bjang03/gmq/mq"
-	"github.com/bjang03/gmq/types"
 	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
+
 	"github.com/gogf/gf/v2/frame/g"
 )
 
@@ -28,7 +24,7 @@ func main() {
 	ctx := context.Background()
 	defer jaeger.ShutDown(ctx)
 	// 注册路由
-	//http.Httpserver.BindMiddleware("/*", http.SkipMiddleware(middleware.ModuleTenantCheck, "/*"))
+	// http.Httpserver.BindMiddleware("/*", middleware.ModuleTenantCheck)
 	http.RouteRegister([]interface{}{
 		assetController.Asset,
 		assetController.AssetSku,
@@ -90,27 +86,6 @@ func main() {
 	//	})
 	//}
 
-	redisAddress := g.Cfg().MustGet(ctx, "redis.default.address").String()
-	redisAddressList := strings.Split(redisAddress, ":")
-	gmq.GmqRegister(public.GmqMsgPluginsName, &mq.RedisConn{
-		RedisConfig: mq.RedisConfig{
-			Addr: redisAddressList[0],
-			Port: redisAddressList[1],
-		},
-	})
-	err := gmq.GetGmq(public.GmqMsgPluginsName).GmqSubscribe(ctx, &mq.RedisSubMessage{
-		SubMessage: types.SubMessage{
-			Topic:        public.StockDetailQueueName,
-			ConsumerName: public.StockDetailConsumerName,
-			AutoAck:      public.StockDetailAutoAck,
-			FetchCount:   public.StockDetailPrefetchCount,
-			HandleFunc:   stockService.StockManage.AddStock,
-		},
-	})
-	if err != nil {
-		return
-	}
-
 	// 监听退出信号
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)

model/dto/asset/asset_dto.go

@@ -5,9 +5,8 @@ import (
 	"assets/consts/stock"
 	"assets/model/config"
 	enumDto "assets/model/dto/enum"
-	entity "assets/model/entity/asset"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 )
@@ -23,7 +22,7 @@ type CreateAssetReq struct {
 	CategoryPath   string                 `json:"categoryPath" dc:"分类路径"`
 	ImageURL       string                 `json:"imageUrl" dc:"主图URL"`
 	Images         []string               `json:"images" dc:"图片列表"`
-	Status         consts.AssetStatus `json:"status" dc:"状态：1/0" d:"1"`
+	Status         consts.AssetStatusType `json:"status" dc:"状态：1/0" d:"1"`
 	UnlimitedStock bool                   `json:"unlimitedStock" dc:"是否无库存限制"`
 	StockMode      stock.StockMode        `json:"stockMode" dc:"库存管理模式：1-明细模式 2-批次模式" d:"2"`
 	OnlineTime     *gtime.Time            `json:"onlineTime,omitempty" dc:"上线时间（格式：2006-01-02 15:04:05）"`
@@ -53,7 +52,7 @@ type ListAssetReq struct {
 	Type             consts.AssetType       `json:"type" dc:"资产类型"`
 	CategoryId       int64                  `json:"categoryId" dc:"分类ID"`
 	CategoryPath     string                 `json:"categoryPath" dc:"分类路径"`
-	Status           consts.AssetStatus     `json:"status" dc:"状态"`
+	Status           consts.AssetStatusType `json:"status" dc:"状态"`
 	TenantModuleType beans.TenantModuleType `json:"tenantModuleType" dc:"租户模块类型"`
 	Keyword          string                 `json:"keyword" dc:"关键词搜索"`
 }
@@ -65,13 +64,13 @@ type ListAssetRes struct {
 }
 
 type AssetItem struct {
-	Id             int64              `json:"id,string"`             // 资产ID
+	Id             int64                  `json:"id"`                    // 资产ID
 	Name           string                 `json:"name"`                  // 资产名称
 	Type           consts.AssetType       `json:"type"`                  // 资产类型：physical实物/virtual虚拟/service服务
 	TypeName       string                 `json:"typeName"`              // 资产类型：physical实物/virtual虚拟/service服务
-	CategoryId     int64              `json:"categoryId,string"`     // 分类ID
+	CategoryId     int64                  `json:"categoryId"`            // 分类ID
 	UnlimitedStock bool                   `json:"unlimitedStock"`        // 是否无库存限制
-	Status         consts.AssetStatus `json:"status"`                // 资产状态：active启用/inactive停用
+	Status         consts.AssetStatusType `json:"status"`                // 资产状态：active启用/inactive停用
 	BasePrice      int                    `json:"basePrice"`             // 基础价格（分为单位）
 	OnlineTime     *gtime.Time            `json:"onlineTime,omitempty"`  // 上线时间
 	OfflineTime    *gtime.Time            `json:"offlineTime,omitempty"` // 下线时间
@@ -87,7 +86,7 @@ type GetAssetReq struct {
 
 // GetAssetRes 获取资产详情响应
 type GetAssetRes struct {
-	*entity.Asset
+	*AssetItem
 	CategoryName     string `json:"categoryName" dc:"分类名称"`
 	ImgAddressPrefix string `json:"imgAddressPrefix"`
 }
@@ -100,7 +99,7 @@ type GetAssetAndSkuReq struct {
 
 // GetAssetAndSkuRes 获取资产详情响应
 type GetAssetAndSkuRes struct {
-	*entity.Asset
+	*AssetItem
 	Skus             []AssetSkuItem     `json:"skus" dc:"SKU列表"`
 	TenantModuleType []enumDto.KeyValue `json:"tenantModuleType" dc:"租户模块类型"`
 	ImgAddressPrefix string             `json:"imgAddressPrefix"`
@@ -116,7 +115,7 @@ type UpdateAssetReq struct {
 	CategoryId  int64                  `json:"categoryId" dc:"分类ID"`
 	ImageURL    string                 `json:"imageUrl" dc:"主图URL"`
 	Images      []string               `json:"images" dc:"图片列表"`
-	Status      consts.AssetStatus `json:"status,omitempty" dc:"状态：1/0"`
+	Status      consts.AssetStatusType `json:"status,omitempty" dc:"状态：1/0"`
 	OnlineTime  *gtime.Time            `json:"onlineTime,omitempty" dc:"上线时间（格式：2006-01-02 15:04:05）"`
 	OfflineTime *gtime.Time            `json:"offlineTime,omitempty" dc:"下线时间（格式：2006-01-02 15:04:05）"`
 	// 类型专用配置 - 实物资产配置
@@ -133,7 +132,7 @@ type UpdateAssetReq struct {
 type UpdateAssetStatusReq struct {
 	g.Meta `path:"/updateAssetStatus" method:"put" tags:"资产管理" summary:"更新资产状态" dc:"更新资产状态"`
 	Id     int64                  `json:"id" v:"required" dc:"资产ID"`
-	Status consts.AssetStatus `json:"status" v:"required|in:1,0" dc:"状态：1启用/0停用"`
+	Status consts.AssetStatusType `json:"status" v:"required|in:1,0" dc:"状态：1启用/0停用"`
 }
 
 // DeleteAssetReq 删除资产请求

model/dto/asset/asset_sku_dto.go

@@ -5,7 +5,7 @@ import (
 	"assets/consts/stock"
 	entity "assets/model/entity/asset"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 )
@@ -23,7 +23,7 @@ type CreateAssetSkuReq struct {
 	ImageURL         string                    `json:"imageUrl" v:"required" dc:"SKU主图"`
 	Price            int                       `json:"price" v:"required|min:0" dc:"价格（分为单位）"`
 	Sort             int                       `json:"sort" v:"required|min:0" dc:"排序"`
-	Status           consts.AssetSkuStatus     `json:"status" v:"required|in:1,0" dc:"状态"`
+	Status           consts.AssetSkuStatusType `json:"status" v:"required|in:1,0" dc:"状态"`
 	UnlimitedStock   bool                      `json:"unlimitedStock" v:"required" dc:"是否无库存限制"`
 	StockMode        stock.StockMode           `json:"stockMode" dc:"库存管理模式:1-明细模式 2-批次模式"`
 	CategoryId       int64                     `json:"categoryId" dc:"分类ID"`
@@ -49,7 +49,7 @@ type UpdateAssetSkuReq struct {
 	Price      int                       `json:"price" dc:"价格（分为单位）"`
 	Sort       int                       `json:"sort" dc:"排序"`
 	Stock      int                       `json:"stock" dc:"库存数量"`
-	Status     consts.AssetSkuStatus     `json:"status" dc:"状态"`
+	Status     consts.AssetSkuStatusType `json:"status" dc:"状态"`
 }
 
 // DeleteAssetSkuReq 删除SKU请求
@@ -88,7 +88,7 @@ type ListAssetSkuReq struct {
 	*beans.Page
 	Id           int64                     `json:"id" dc:"SKU ID"`
 	AssetId      int64                     `json:"assetId" v:"required" dc:"资产ID"`
-	Status       consts.AssetSkuStatus `json:"status" dc:"状态"`
+	Status       consts.AssetSkuStatusType `json:"status" dc:"状态"`
 	Keyword      string                    `json:"keyword" dc:"关键词搜索"`
 	MinPrice     int                       `json:"minPrice" dc:"最低价格"`
 	MaxPrice     int                       `json:"maxPrice" dc:"最高价格"`
@@ -102,8 +102,8 @@ type ListAssetSkuRes struct {
 }
 
 type AssetSkuItem struct {
-	Id             int64                     `json:"id,string"` // SKU ID
+	Id             int64                     `json:"id"` // SKU ID
-	AssetId        int64                     `json:"assetId,string"`
+	AssetId        int64                     `json:"assetId"`
 	AssetName      string                    `json:"assetName"`      // 资产名称
 	SkuName        string                    `json:"skuName"`        // SKU名称
 	SpecsCount     int                       `json:"specsCount"`     // 规格数量
@@ -113,9 +113,8 @@ type AssetSkuItem struct {
 	UnlimitedStock bool                      `json:"unlimitedStock"` // 是否无库存限制
 	Stock          int                       `json:"stock"`          // 库存数量
 	Sort           int                       `json:"sort"`           // 排序
-	Status         consts.AssetSkuStatus     `json:"status"`         // 状态：active/inactive/disabled
+	Status         consts.AssetSkuStatusType `json:"status"`         // 状态：active/inactive/disabled
 	StockMode      stock.StockMode           `json:"stockMode"`      // 库存管理模式：1-明细模式 2-批次模式
-	ImageURL       string                    `json:"imageUrl"`       // SKU主图
 	CreatedAt      *gtime.Time               `json:"createdAt"`      // 创建时间
 	UpdatedAt      *gtime.Time               `json:"updatedAt"`      // 更新时间
 }

model/dto/asset/category_dto.go

@@ -4,7 +4,7 @@ import (
 	consts "assets/consts/category"
 	entity "assets/model/entity/asset"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 )
@@ -19,7 +19,7 @@ type CreateCategoryReq struct {
 	Sort       int                       `json:"sort" dc:"排序"`
 	Path       string                    `json:"path" dc:"分类路径"`
 	Level      int                       `json:"level" dc:"分类层级"`
-	Status     consts.CategoryStatus `json:"status" v:"in:1,0" default:"1" dc:"状态：1启用0禁用"`
+	Status     consts.CategoryStatusType `json:"status" v:"in:1,0" default:"1" dc:"状态：1启用0禁用"`
 	Attrs      []entity.CategoryAttr     `json:"attrs" dc:"分类属性"`
 }
 
@@ -38,14 +38,14 @@ type UpdateCategoryReq struct {
 	Sort       int                       `json:"sort" dc:"排序"`
 	IsLeafNode *bool                     `json:"isLeafNode" dc:"是否叶子节点"`
 	Attrs      []entity.CategoryAttr     `json:"attrs" dc:"分类属性"`
-	Status     consts.CategoryStatus `json:"status" dc:"状态：1启用0禁用"`
+	Status     consts.CategoryStatusType `json:"status" dc:"状态：1启用0禁用"`
 }
 
 // UpdateCategoryStatusReq 更新分类状态请求
 type UpdateCategoryStatusReq struct {
 	g.Meta `path:"/updateCategoryStatus" method:"put" tags:"分类管理" summary:"更新分类状态" dc:"更新分类状态"`
 	Id     int64                     `json:"id" v:"required" dc:"分类ID"`
-	Status consts.CategoryStatus `json:"status" v:"in:1,0" dc:"状态：1启用0禁用"`
+	Status consts.CategoryStatusType `json:"status" v:"in:1,0" dc:"状态：1启用0禁用"`
 }
 
 // DeleteCategoryReq 删除分类请求
@@ -73,7 +73,7 @@ type CategoryTreeNode struct {
 	Type       string                    `json:"type" dc:"分类类型"`
 	Path       string                    `json:"path" dc:"分类路径"`
 	IsLeafNode bool                      `json:"isLeafNode" dc:"是否叶子节点"`
-	Status     consts.CategoryStatus `json:"status" dc:"状态"`
+	Status     consts.CategoryStatusType `json:"status" dc:"状态"`
 	Sort       int                       `json:"sort" dc:"排序"`
 	CreatedAt  *gtime.Time               `json:"createdAt" dc:"创建时间"`
 	UpdatedAt  *gtime.Time               `json:"updatedAt" dc:"更新时间"`
@@ -85,7 +85,7 @@ type ListCategoryReq struct {
 	g.Meta `path:"/listCategories" method:"get" tags:"分类管理" summary:"获取分类列表" dc:"获取分类列表"`
 	*beans.Page
 	ParentId int64                     `json:"parentId" dc:"父分类ID"`
-	Status   consts.CategoryStatus `json:"status" dc:"状态：1启用0禁用"`
+	Status   consts.CategoryStatusType `json:"status" dc:"状态：1启用0禁用"`
 	Keyword  string                    `json:"keyword" dc:"关键词搜索"`
 }
 
@@ -112,7 +112,7 @@ type GetCategoryRes struct {
 	Sort       int                       `json:"sort" dc:"排序"`
 	Image      string                    `json:"image" dc:"分类图片"`
 	Attrs      []entity.CategoryAttr     `json:"attrs" dc:"分类属性"`
-	Status     consts.CategoryStatus `json:"status" dc:"状态：1启用0禁用"`
+	Status     consts.CategoryStatusType `json:"status" dc:"状态：1启用0禁用"`
 	Creator    string                    `json:"creator" dc:"创建人"`
 	CreatedAt  *gtime.Time               `json:"createdAt" dc:"创建时间"`
 	Updater    string                    `json:"updater" dc:"更新人"`

model/dto/procurement/purchase_inbound_dto.go

@@ -1,7 +1,7 @@
 package dto
 
 import (
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/dto/stock/inventory_count_adjust_history_dto.go

@@ -1,7 +1,7 @@
 package dto
 
 import (
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/inventory_count_detail_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/inventory_count_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/inventory_warning_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/inventory_warning_history_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/location_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/private_stock_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/stock_batch_dto.go

@@ -3,11 +3,24 @@ package dto
 import (
 	"assets/consts/stock"
 
+	"gitea.com/red-future/common/beans"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
-// CreateSockBatchReq 创建批次请求
+// CommonResp 通用响应
-type CreateSockBatchReq struct {
+type CommonResp struct {
+	Success bool   `json:"success"` // 是否成功
+	Message string `json:"message"` // 消息
+}
+
+// --- 批次管理API相关结构 ---
+
+// CreateBatchReq 创建批次请求
+type CreateBatchReq struct {
+	g.Meta `path:"/createBatch" method:"post" tags:"库存批次管理" summary:"创建批次" dc:"创建新的库存批次"`
+
 	AssetId           int64                    `json:"assetId" v:"required" dc:"资产ID"`
 	AssetSkuId        int64                    `json:"assetSkuId" v:"required" dc:"SKU ID"`
 	BatchNo           string                   `json:"batchNo" v:"required" dc:"批次号"`
@@ -20,13 +33,58 @@ type CreateSockBatchReq struct {
 	ExpiryWarningDate *gtime.Time              `json:"expiryWarningDate" dc:"临期预警时间(格式:2006-01-02)"`
 }
 
-type UpdateSockBatchReq struct {
+// CreateBatchRes 创建批次响应
+type CreateBatchRes struct {
+	Id *bson.ObjectID `json:"id"` // 批次ID
+}
+
+// UpdateBatchReq 更新批次请求
+type UpdateBatchReq struct {
+	g.Meta `path:"/updateBatch" method:"put" tags:"库存批次管理" summary:"更新批次" dc:"更新批次信息"`
+
 	Id           int64 `json:"id" v:"required" dc:"批次ID"`
 	BatchQty     int   `json:"batchQty" v:"required|min:1" dc:"批次数量"`
 	AvailableQty int   `json:"availableQty" v:"required|min:1" dc:"可用数量"`
 }
 
-type GetSockBatchReq struct {
+// DeleteBatchReq 删除批次请求
-	Id      int64  `json:"id" v:"required" dc:"批次ID"`
+type DeleteBatchReq struct {
-	BatchNo string `json:"batchNo" dc:"批次号"`
+	g.Meta `path:"/deleteBatch" method:"delete" tags:"库存批次管理" summary:"删除批次" dc:"删除批次"`
+	Id     *bson.ObjectID `json:"id" v:"required" dc:"批次ID"`
+}
+
+// GetBatchReq 获取批次详情请求
+type GetBatchReq struct {
+	g.Meta `path:"/getBatch" method:"get" tags:"库存批次管理" summary:"获取批次详情" dc:"获取批次详情"`
+	Id     *bson.ObjectID `json:"id" v:"required" dc:"批次ID"`
+}
+
+// GetBatchRes 获取批次详情响应
+type GetBatchRes struct {
+	Id                *bson.ObjectID           `json:"id"`
+	AssetId           *bson.ObjectID           `json:"assetId"`
+	AssetSkuId        *bson.ObjectID           `json:"assetSkuId"`
+	BatchNo           string                   `json:"batchNo"`
+	BatchQty          int                      `json:"batchQty"`
+	AvailableQty      int                      `json:"availableQty"`
+	Metadata          []map[string]interface{} `json:"metadata"`
+	Status            stock.BatchStatus        `json:"status"`
+	ProductionDate    *gtime.Time              `json:"productionDate"`
+	ExpiryDate        *gtime.Time              `json:"expiryDate"`
+	ExpiryWarningDate *gtime.Time              `json:"expiryWarningDate"`
+}
+
+// ListBatchReq 获取批次列表请求
+type ListBatchReq struct {
+	g.Meta `path:"/listBatches" method:"get" tags:"库存批次管理" summary:"获取批次列表" dc:"分页查询批次列表"`
+	*beans.Page
+	OrderBy    []beans.OrderBy `json:"orderBy" dc:"排序规则"`
+	AssetId    *bson.ObjectID  `json:"assetId" dc:"资产ID"`
+	AssetSkuId *bson.ObjectID  `json:"assetSkuId" dc:"SKU ID"`
+}
+
+// ListBatchRes 获取批次列表响应
+type ListBatchRes struct {
+	List  []GetBatchRes `json:"list"`
+	Total int64         `json:"total"`
 }

model/dto/stock/stock_details_dto.go

@@ -3,26 +3,65 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
+	"github.com/gogf/gf/v2/frame/g"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
-// CreateSockDetailsReq 创建明细请求
+// GetStockDetailsReq 获取库存明细详情请求
-type CreateSockDetailsReq struct {
+type GetStockDetailsReq struct {
-	AssetId    int64                    `json:"assetId" v:"required" dc:"资产ID"`
+	g.Meta `path:"/getStockDetails" method:"get" tags:"库存明细管理" summary:"获取库存明细详情" dc:"获取库存明细详情"`
-	AssetSkuId int64                    `json:"assetSkuId" v:"required" dc:"SKU ID"`
+	Id     *bson.ObjectID `json:"id" v:"required" dc:"库存明细ID"`
-	Status     stock.StockStatus        `json:"status" dc:"状态"`
-	Metadata   []map[string]interface{} `json:"metadata" dc:"元数据"`
 }
 
-type DeleteSockDetailsReq struct {
+// GetStockDetailsRes 获取库存明细详情响应
-	Id int64 `json:"Id" v:"required" dc:"库存明细ID"`
+type GetStockDetailsRes struct {
+	Id              *bson.ObjectID         `json:"id"`
+	AssetId         *bson.ObjectID         `json:"assetId"`
+	AssetSkuId      *bson.ObjectID         `json:"assetSkuId"`
+	Status          stock.StockStatus      `json:"status"`
+	OrderId         *bson.ObjectID         `json:"orderId"`
+	LockExpire      string                 `json:"lockExpire"`
+	Metadata        map[string]interface{} `json:"metadata"`
+	TokenId         string                 `json:"tokenId"`
+	AssignedChannel string                 `json:"assignedChannel"`
+	ChannelSKU      string                 `json:"channelSku"`
+	AllocatedAt     string                 `json:"allocatedAt"`
+	CreatedAt       string                 `json:"createdAt"`
+	UpdatedAt       string                 `json:"updatedAt"`
 }
 
-type GetSockDetailsReq struct {
+// ListStockDetailsReq 获取库存明细列表请求
+type ListStockDetailsReq struct {
+	g.Meta `path:"/listStockDetails" method:"get" tags:"库存明细管理" summary:"获取库存明细列表" dc:"分页查询库存明细列表，支持多条件筛选"`
+
 	*beans.Page
-	Id           int64             `json:"id" dc:"库存明细ID"`
+	OrderBy      []beans.OrderBy   `json:"orderBy" dc:"排序规则"`
 	AssetId      int64             `json:"assetId" dc:"资产ID"`
 	AssetSkuId   int64             `json:"assetSkuId" dc:"SKU ID"`
 	CategoryPath string            `json:"categoryPath" dc:"分类路径"`
 	Status       stock.StockStatus `json:"status" dc:"状态"`
 }
+
+// ListStockDetailsRes 获取库存明细列表响应
+type ListStockDetailsRes struct {
+	List  []*StockDetailsListItem `json:"list" dc:"库存明细列表"`
+	Total int64                   `json:"total" dc:"总数"`
+}
+
+// StockDetailsListItem 库存明细列表项
+type StockDetailsListItem struct {
+	Id              *bson.ObjectID         `json:"id"`
+	AssetId         *bson.ObjectID         `json:"assetId"`
+	AssetSkuId      *bson.ObjectID         `json:"assetSkuId"`
+	Status          stock.StockStatus      `json:"status"`
+	OrderId         *bson.ObjectID         `json:"orderId"`
+	LockExpire      string                 `json:"lockExpire"`
+	Metadata        map[string]interface{} `json:"metadata"`
+	TokenId         *bson.ObjectID         `json:"tokenId"`
+	AssignedChannel string                 `json:"assignedChannel"`
+	ChannelSKU      string                 `json:"channelSku"`
+	AllocatedAt     string                 `json:"allocatedAt"`
+	CreatedAt       string                 `json:"createdAt"`
+	UpdatedAt       string                 `json:"updatedAt"`
+}

model/dto/stock/stock_manage_dto.go

@@ -24,13 +24,13 @@ type StockOperationReq struct {
 type StockPublishMessage struct {
 	AssetId           int64                    `json:"assetId"`
 	AssetSkuId        int64                    `json:"assetSkuId"`
-	TenantId          uint64                   `json:"tenantId"`
+	TenantId          interface{}              `json:"tenantId"`
-	UserName          string                   `json:"userName"`
+	UserName          interface{}              `json:"userName"`
 	StockCount        int                      `json:"stockCount"`
 	OperationType     string                   `json:"operationType"`
 	Metadata          []map[string]interface{} `json:"metadata"`
-	StockId           int64                    `json:"stockId"`
+	StockId           string                   `json:"stockId"`
-	StockMode         stock.StockMode          `json:"stockMode"`
+	StockMode         int                      `json:"stockMode"`
 	BatchNo           string                   `json:"batchNo"`
 	ProductionDate    *gtime.Time              `json:"productionDate"`
 	ExpiryDate        *gtime.Time              `json:"expiryDate"`

model/dto/stock/warehouse_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/stock/zone_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/dto/sync/sync_dto.go

@@ -3,7 +3,7 @@ package dto
 import (
 	consts "assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"

model/entity/asset/asset.go

@@ -3,9 +3,9 @@ package entity
 import (
 	consts "assets/consts/asset"
 	"assets/consts/stock"
-	"assets/model/config"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/os/gtime"
 )
 
@@ -62,11 +62,11 @@ type Asset struct {
 	Name           string                 `orm:"name" json:"name" description:"资产名称"`
 	Description    string                 `orm:"description" json:"description" description:"资产描述"`
 	Type           consts.AssetType       `orm:"type" json:"type" description:"资产类型：physical实物/virtual虚拟/service服务"`
-	CategoryId     int64              `orm:"category_id" json:"categoryId,string" description:"分类ID"`
+	CategoryId     int64                  `orm:"category_id" json:"categoryId" description:"分类ID"`
 	CategoryPath   string                 `orm:"category_path" json:"categoryPath" description:"分类路径"`
 	ImageURL       string                 `orm:"image_url" json:"imageUrl" description:"主图URL"`
 	Images         []string               `orm:"images" json:"images" description:"图片列表(JSONB)"`
-	Status         consts.AssetStatus `orm:"status" json:"status" description:"资产状态：1启用/0停用"`
+	Status         consts.AssetStatusType `orm:"status" json:"status" description:"资产状态：1启用/0停用"`
 	BasePrice      int                    `orm:"base_price" json:"basePrice" description:"基础价格（分为单位）"`
 	Currency       string                 `orm:"currency" json:"currency" description:"货币单位，默认CNY"`
 	UnlimitedStock bool                   `orm:"unlimited_stock" json:"unlimitedStock" description:"是否无库存限制"`
@@ -75,13 +75,13 @@ type Asset struct {
 	OfflineTime    *gtime.Time            `orm:"offline_time" json:"offlineTime,omitempty" description:"下线时间"` // 上线和下线时间配置（由定时任务处理资产状态）
 
 	// 类型专用配置 - 实物资产配置(JSONB)
-	PhysicalAssetConfig *config.PhysicalAssetConfig `orm:"physical_asset_config" json:"physicalAssetConfig" description:"实物资产配置(JSONB)"`
+	PhysicalAssetConfig *gjson.Json `orm:"physical_asset_config" json:"physicalAssetConfig" description:"实物资产配置(JSONB)"`
 	// 类型专用配置 - 服务资产配置(JSONB)
-	ServiceAssetConfig *config.ServiceAssetConfig `orm:"service_asset_config" json:"serviceAssetConfig" description:"服务资产配置(JSONB)"`
+	ServiceAssetConfig *gjson.Json `orm:"service_asset_config" json:"serviceAssetConfig" description:"服务资产配置(JSONB)"`
 	// 类型专用配置 - 虚拟资产配置(JSONB)
-	VirtualAssetConfig *config.VirtualAssetConfig `orm:"virtual_asset_config" json:"virtualAssetConfig" description:"虚拟资产配置(JSONB)"`
+	VirtualAssetConfig *gjson.Json `orm:"virtual_asset_config" json:"virtualAssetConfig" description:"虚拟资产配置(JSONB)"`
 	// 扩展字段(JSONB)
-	Metadata []map[string]interface{} `orm:"metadata" json:"metadata" description:"动态元数据(JSONB)"`
+	Metadata []gjson.Json `orm:"metadata" json:"metadata" description:"动态元数据(JSONB)"`
 
 	TenantModuleType beans.TenantModuleType `orm:"tenant_module_type" json:"tenantModuleType" description:"租户模块类型"`
 }

model/entity/asset/asset_sku.go

@@ -3,8 +3,10 @@ package entity
 import (
 	consts "assets/consts/asset"
 	"assets/consts/stock"
+	"assets/model/config"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
+	"github.com/gogf/gf/v2/encoding/gjson"
 )
 
 type assetSkuCol struct {
@@ -24,8 +26,8 @@ type assetSkuCol struct {
 	StockMode        string
 	CategoryId       string
 	CategoryPath     string
-	//CapacityUnitType string
+	CapacityUnitType string
-	//Capacity         string
+	Capacity         string
 	TenantModuleType string
 }
 
@@ -46,8 +48,8 @@ var AssetSkuCol = assetSkuCol{
 	StockMode:        "stock_mode",
 	CategoryId:       "category_id",
 	CategoryPath:     "category_path",
-	//CapacityUnitType: "capacity_unit_type",
+	CapacityUnitType: "capacity_unit_type",
-	//Capacity:         "capacity",
+	Capacity:         "capacity",
 	TenantModuleType: "tenant_module_type",
 }
 
@@ -58,19 +60,19 @@ type AssetSku struct {
 	AssetName        string                    `orm:"asset_name" json:"assetName"`                // 资产名称
 	SkuName          string                    `orm:"sku_name" json:"skuName"`                    // SKU名称
 	ImageURL         string                    `orm:"image_url,omitempty" json:"imageUrl"`        // SKU主图
-	SpecValues      []map[string]interface{} `orm:"spec_values" json:"specValues"`         // 规格值：{"颜色":"红色","尺寸":"L","时长":"1个月","平台":"抖音"}
+	SpecValues       []gjson.Json              `orm:"spec_values" json:"specValues"`              // 规格值：{"颜色":"红色","尺寸":"L","时长":"1个月","平台":"抖音"}
 	Price            int                       `orm:"price" json:"price"`                         // 价格（分为单位）
 	UnlimitedStock   bool                      `orm:"unlimited_stock" json:"unlimitedStock"`      // 是否无库存限制
 	Stock            int                       `orm:"stock" json:"stock"`                         // 库存数量
 	SpecsCount       int                       `orm:"specs_count" json:"specsCount"`              // 规格数量
-	SpecsUnit       *SpecsUnitKeyValue       `orm:"specs_unit" json:"specsUnit"`           // 规格单位 SpecsUnitKeyValue
+	SpecsUnit        *gjson.Json               `orm:"specs_unit" json:"specsUnit"`                // 规格单位 SpecsUnitKeyValue
 	Sort             int                       `orm:"sort" json:"sort"`                           // 排序
-	Status          consts.AssetSkuStatus    `orm:"status" json:"status"`                  // 状态：active/inactive/disabled
+	Status           consts.AssetSkuStatusType `orm:"status" json:"status"`                       // 状态：active/inactive/disabled
 	StockMode        stock.StockMode           `orm:"stock_mode" json:"stockMode"`                // 库存管理模式：1-明细模式 2-批次模式
 	CategoryId       int64                     `orm:"category_id" json:"categoryId"`              // 分类ID
 	CategoryPath     string                    `orm:"category_path" json:"categoryPath"`          // 分类路径
-	//CapacityUnitType stock.CapacityUnitType    `orm:"capacity_unit_type" json:"capacityUnitType"` // 容量单位类型
+	CapacityUnitType stock.CapacityUnitType    `orm:"capacity_unit_type" json:"capacityUnitType"` // 容量单位类型
-	//Capacity         int                       `orm:"capacity" json:"capacity"`                   // 容量
+	Capacity         config.Capacity           `orm:"capacity" json:"capacity"`                   // 容量
 	TenantModuleType beans.TenantModuleType    `orm:"tenant_module_type" json:"tenantModuleType"` // 租户模块类型
 }
 

model/entity/asset/category.go

@@ -3,7 +3,7 @@ package entity
 import (
 	consts "assets/consts/category"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 type categoryCol struct {
@@ -42,7 +42,7 @@ type Category struct {
 	IsLeafNode      *bool                     `orm:"is_leaf_node" json:"isLeafNode"` // 是叶子节点
 	Sort            int                       `orm:"sort" json:"sort"`               // 排序
 	Image           string                    `orm:"image" json:"image"`             // 分类图片
-	Status          consts.CategoryStatus `orm:"status" json:"status"`           // 状态：1启用/0禁用
+	Status          consts.CategoryStatusType `orm:"status" json:"status"`           // 状态：1启用/0禁用
 	Attrs           []CategoryAttr            `orm:"attrs" json:"attrs,omitempty"`   // 分类属性 CategoryAttr
 	// 使用场景说明：
 	// 1. 商品分类属性：为该分类下的商品定义标准化的属性模板，如服装分类可定义尺寸、颜色、材质等属性

model/entity/asset/private_category.go

@@ -3,7 +3,7 @@ package entity
 import (
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 // PrivateCategory 私域分类实体

model/entity/asset/private_sku.go

@@ -5,7 +5,7 @@ import (
 	consts "assets/consts/stock"
 	"assets/model/config"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 // PrivateSku 私域资产SKU实体

model/entity/procurement/purchase_bid.go

@@ -4,7 +4,7 @@ import (
 	consts "assets/consts/procurement"
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/procurement/purchase_inbound.go

@@ -3,7 +3,7 @@ package entity
 import (
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/procurement/purchase_order.go

@@ -4,7 +4,7 @@ import (
 	consts "assets/consts/procurement"
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/procurement/purchase_order_item.go

@@ -3,7 +3,7 @@ package entity
 import (
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 

model/entity/procurement/purchase_return.go

@@ -4,7 +4,7 @@ import (
 	consts "assets/consts/procurement"
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/procurement/purchase_return_item.go

@@ -4,7 +4,7 @@ import (
 	consts "assets/consts/procurement"
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 

model/entity/procurement/supplier.go

@@ -4,7 +4,7 @@ import (
 	consts "assets/consts/procurement"
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 )
 

model/entity/stock/inventory_count.go

@@ -4,7 +4,7 @@ import (
 	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/stock/inventory_count_adjust_history.go

@@ -3,7 +3,7 @@ package entity
 import (
 	"assets/consts/public"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/stock/inventory_count_detail.go

@@ -4,7 +4,7 @@ import (
 	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/stock/inventory_warning.go

@@ -4,7 +4,7 @@ import (
 	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/stock/inventory_warning_history.go

@@ -4,7 +4,7 @@ import (
 	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/stock/location.go

@@ -5,7 +5,7 @@ import (
 	consts "assets/consts/stock"
 	"assets/model/config"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 

model/entity/stock/private_stock.go

@@ -4,7 +4,7 @@ import (
 	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )

model/entity/stock/stock_batch.go

@@ -1,80 +1,48 @@
 package entity
 
 import (
+	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
-type stockBatchCol struct {
-	beans.SQLBaseCol
-	AssetId           string
-	AssetSkuId        string
-	BatchNo           string
-	BatchQty          string
-	AvailableQty      string
-	Metadata          string
-	Status            string
-	OrderId           string
-	AssignedChannel   string
-	ChannelSKU        string
-	ChannelMetadata   string
-	AllocatedAt       string
-	ProductionDate    string
-	ExpiryDate        string
-	ExpiryWarningDate string
-	CategoryPath      string
-}
-
-var StockBatchCol = stockBatchCol{
-	SQLBaseCol:        beans.DefSQLBaseCol,
-	AssetId:           "asset_id",
-	AssetSkuId:        "asset_sku_id",
-	BatchNo:           "batch_no",
-	BatchQty:          "batch_qty",
-	AvailableQty:      "available_qty",
-	Metadata:          "metadata",
-	Status:            "status",
-	OrderId:           "order_id",
-	AssignedChannel:   "assigned_channel",
-	ChannelSKU:        "channel_sku",
-	ChannelMetadata:   "channel_metadata",
-	AllocatedAt:       "allocated_at",
-	ProductionDate:    "production_date",
-	ExpiryDate:        "expiry_date",
-	ExpiryWarningDate: "expiry_warning_date",
-	CategoryPath:      "category_path",
-}
-
 // StockBatch 库存批次实体(用于批次管理模式)
 type StockBatch struct {
-	beans.SQLBaseDO `orm:",inherit"`
+	beans.MongoBaseDO `bson:",inline"` // 嵌入基础字段：Id, Creator, CreatedAt, Updater, UpdatedAt, TenantId, IsDeleted
-	AssetId         int64  `orm:"asset_id" json:"assetId"`           // 关联资产ID
+
-	AssetSkuId      int64  `orm:"asset_sku_id" json:"assetSkuId"`    // 关联资产SKU ID
+	AssetID      *bson.ObjectID `bson:"assetId" json:"assetId"`           // 关联资产ID
-	BatchNo         string `orm:"batch_no" json:"batchNo"`           // 批次号
+	AssetSkuID   *bson.ObjectID `bson:"assetSkuId" json:"assetSkuId"`     // 关联资产SKU ID
-	BatchQty        int    `orm:"batch_qty" json:"batchQty"`         // 批次总数量（入库后不可变）
+	BatchNo      string         `bson:"batchNo" json:"batchNo"`           // 批次号
-	AvailableQty    int    `orm:"available_qty" json:"availableQty"` // 可用数量（实时变化）
+	BatchQty     int            `bson:"batchQty" json:"batchQty"`         // 批次总数量（入库后不可变）
+	AvailableQty int            `bson:"availableQty" json:"availableQty"` // 可用数量（实时变化）
 
 	// 批次元数据
-	Metadata []map[string]interface{} `orm:"metadata" json:"metadata"` // 其他元数据
+	Metadata []map[string]interface{} `bson:"metadata" json:"metadata"` // 其他元数据
 
 	// 状态
-	Status stock.BatchStatus `orm:"status" json:"status"` // 批次状态
+	Status *stock.BatchStatus `bson:"status" json:"status"` // 批次状态
 	// 锁定数量 = BatchQty - AvailableQty
 
 	// 订单关联
-	OrderID int64 `orm:"order_id" json:"orderId"` // 关联订单ID（如果有）
+	OrderID *bson.ObjectID `bson:"orderId" json:"orderId"` // 关联订单ID（如果有）
 
 	// 渠道分配信息
-	AssignedChannel string                 `orm:"assigned_channel" json:"assignedChannel"` // 分配的销售渠道
+	AssignedChannel string                 `bson:"assignedChannel" json:"assignedChannel"` // 分配的销售渠道
-	ChannelSKU      string                 `orm:"channel_sku" json:"channelSku"`           // 渠道商品SKU
+	ChannelSKU      string                 `bson:"channelSku" json:"channelSku"`           // 渠道商品SKU
-	ChannelMetadata map[string]interface{} `orm:"channel_metadata" json:"channelMetadata"` // 渠道专属数据
+	ChannelMetadata map[string]interface{} `bson:"channelMetadata" json:"channelMetadata"` // 渠道专属数据
-	AllocatedAt     *gtime.Time            `orm:"allocated_at" json:"allocatedAt"`         // 分配时间
+	AllocatedAt     *gtime.Time            `bson:"allocatedAt" json:"allocatedAt"`         // 分配时间
 
 	// 临期管理
-	ProductionDate    *gtime.Time `orm:"production_date" json:"productionDate"`        // 生产日期
+	ProductionDate    *gtime.Time `bson:"productionDate" json:"productionDate"`       // 生产日期
-	ExpiryDate        *gtime.Time `orm:"expiry_date" json:"expiryDate"`                // 过期日期
+	ExpiryDate        *gtime.Time `bson:"expiryDate" json:"expiryDate"`               // 过期日期
-	ExpiryWarningDate *gtime.Time `orm:"expiry_warning_date" json:"expiryWarningDate"` // 临期预警时间（有过期日期时建议填写）
+	ExpiryWarningDate *gtime.Time `bson:"expiryWarningDate" json:"expiryWarningDate"` // 临期预警时间（有过期日期时建议填写）
-	CategoryPath      string      `orm:"category_path" json:"categoryPath"`            // 分类路径
+	CategoryPath      string      `bson:"categoryPath" json:"categoryPath"`           // 分类路径
+}
+
+// CollectionName 获取集合名称
+func (StockBatch) CollectionName() string {
+	return public.StockBatchCollection
 }

model/entity/stock/stock_details.go

@@ -1,59 +1,35 @@
 package entity
 
 import (
+	"assets/consts/public"
 	"assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/os/gtime"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
-type stockDetailsCol struct {
-	beans.SQLBaseCol
-	AssetId         string
-	AssetSkuId      string
-	Status          string
-	OrderId         string
-	LockExpire      string
-	Metadata        string
-	TokenId         string
-	AssignedChannel string
-	ChannelSKU      string
-	ChannelMetadata string
-	AllocatedAt     string
-	CategoryPath    string
-}
-
-var StockDetailsCol = stockDetailsCol{
-	SQLBaseCol:      beans.DefSQLBaseCol,
-	AssetId:         "asset_id",
-	AssetSkuId:      "asset_sku_id",
-	Status:          "status",
-	OrderId:         "order_id",
-	LockExpire:      "lock_expire",
-	Metadata:        "metadata",
-	TokenId:         "token_id",
-	AssignedChannel: "assigned_channel",
-	ChannelSKU:      "channel_sku",
-	ChannelMetadata: "channel_metadata",
-	AllocatedAt:     "allocated_at",
-	CategoryPath:    "category_path",
-}
-
 // StockDetails 库存实体，每一件商品都有独立ID，用于后期做区块链虚拟资产
 type StockDetails struct {
-	beans.SQLBaseDO `orm:",inherit"`
+	beans.MongoBaseDO `bson:",inline"` // 嵌入基础字段：Id, Creator, CreatedAt, Updater, UpdatedAt, TenantId, IsDeleted
-	AssetId         int64                    `orm:"asset_id" json:"assetId"`        // 关联资产ID
+
-	AssetSkuId      int64                    `orm:"asset_sku_id" json:"assetSkuId"` // 关联资产SKU ID
+	AssetId    int64                    `bson:"assetId" json:"assetId"`       // 关联资产ID
-	Status          stock.StockStatus        `orm:"status" json:"status"`           // 库存状态
+	AssetSkuId int64                    `bson:"assetSkuId" json:"assetSkuId"` // 关联资产SKU ID
-	OrderId         int64                    `orm:"order_id" json:"orderId"`        // 关联订单ID（如果有）
+	Status     stock.StockStatus        `bson:"status" json:"status"`         // 库存状态
-	LockExpire      *gtime.Time              `orm:"lock_expire" json:"lockExpire"`  // 锁定过期时间
+	OrderId    *bson.ObjectID           `bson:"orderId" json:"orderId"`       // 关联订单ID（如果有）
-	Metadata        []map[string]interface{} `orm:"metadata" json:"metadata"`       // 其他元数据
+	LockExpire *gtime.Time              `bson:"lockExpire" json:"lockExpire"` // 锁定过期时间
-	TokenId         string                   `orm:"token_id" json:"tokenId"`        // 区块链TokenID（如果有）
+	Metadata   []map[string]interface{} `bson:"metadata" json:"metadata"`     // 其他元数据
+	TokenId    string                   `bson:"tokenId" json:"tokenId"`       // 区块链TokenID（如果有）
 
 	// 渠道分配信息
-	AssignedChannel string                 `orm:"assigned_channel" json:"assignedChannel"` // 分配的销售渠道
+	AssignedChannel string                 `bson:"assignedChannel" json:"assignedChannel"` // 分配的销售渠道
-	ChannelSKU      string                 `orm:"channel_sku" json:"channelSku"`           // 渠道商品SKU
+	ChannelSKU      string                 `bson:"channelSku" json:"channelSku"`           // 渠道商品SKU
-	ChannelMetadata map[string]interface{} `orm:"channel_metadata" json:"channelMetadata"` // 渠道专属数据
+	ChannelMetadata map[string]interface{} `bson:"channelMetadata" json:"channelMetadata"` // 渠道专属数据
-	AllocatedAt     *gtime.Time            `orm:"allocated_at" json:"allocatedAt"`         // 分配时间
+	AllocatedAt     *gtime.Time            `bson:"allocatedAt" json:"allocatedAt"`         // 分配时间
-	CategoryPath    string                 `orm:"category_path" json:"categoryPath"`       // 分类路径
+	CategoryPath    string                 `bson:"categoryPath" json:"categoryPath"`       // 分类路径
+}
+
+// CollectionName 库存集合名称
+func (StockDetails) CollectionName() string {
+	return public.StockDetailsCollection
 }

model/entity/stock/unit_conversion.go

@@ -4,7 +4,7 @@ import (
 	"assets/consts/public"
 	consts "assets/consts/stock"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 // UnitConversion 单位换算

model/entity/stock/warehouse.go

@@ -5,7 +5,7 @@ import (
 	consts "assets/consts/stock"
 	"assets/model/config"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 // Warehouse 仓库

model/entity/stock/zone.go

@@ -5,7 +5,7 @@ import (
 	consts "assets/consts/stock"
 	"assets/model/config"
 
-	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.com/red-future/common/beans"
 )
 
 // Zone 库区

model/entity/sync/channel_config.go

@@ -1,6 +1,6 @@
 package entity
 
-import "gitea.redpowerfuture.com/red-future/common/beans"
+import "gitea.com/red-future/common/beans"
 
 // ChannelConfig 渠道配置 - 租户针对三方渠道的配置信息
 type ChannelConfig struct {