feat: 后台订单按平台、代理商、在线支付拆分列表与导出
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m34s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m34s
- 新增 GET /orders/platform、/orders/agent、/orders/online,类别由路径固定,参数、响应、权限同原订单列表 - 新增导出场景 order_platform、order_agent、order_online,筛选与表头同 order - 类别按钱从哪来划分:客户端下单为在线支付;后台代理钱包扣款(含平台代扣)为代理商;其余后台订单为平台 - 列表与导出共用 internal/query/ordercategory 的类别条件 - 企业账号访问订单列表、详情、购买预检改为无权限,修复其可看到全部订单的问题 - 原订单列表与 order 导出场景保留不变 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/query/ordercategory"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
)
|
||||
|
||||
@@ -20,19 +21,30 @@ const (
|
||||
orderExportOperatorHeader = "操作人"
|
||||
)
|
||||
|
||||
// OrderDataSource 订单导出数据源。
|
||||
// OrderDataSource 订单导出数据源。category 为空时导出全部订单(场景 order),
|
||||
// 非空时只导出该类别的订单(场景 order_platform / order_agent / order_online),其余逻辑完全相同。
|
||||
type OrderDataSource struct {
|
||||
db *gorm.DB
|
||||
db *gorm.DB
|
||||
category string
|
||||
}
|
||||
|
||||
// NewOrderDataSource 创建订单导出数据源。
|
||||
func NewOrderDataSource(db *gorm.DB) *OrderDataSource {
|
||||
return &OrderDataSource{db: db}
|
||||
// NewOrderDataSource 创建订单导出数据源;category 为空表示不限类别。
|
||||
func NewOrderDataSource(db *gorm.DB, category string) *OrderDataSource {
|
||||
return &OrderDataSource{db: db, category: category}
|
||||
}
|
||||
|
||||
// Scene 返回导出场景编码。
|
||||
func (s *OrderDataSource) Scene() string {
|
||||
return constants.ExportTaskSceneOrder
|
||||
switch s.category {
|
||||
case constants.OrderCategoryPlatform:
|
||||
return constants.ExportTaskSceneOrderPlatform
|
||||
case constants.OrderCategoryAgent:
|
||||
return constants.ExportTaskSceneOrderAgent
|
||||
case constants.OrderCategoryOnline:
|
||||
return constants.ExportTaskSceneOrderOnline
|
||||
default:
|
||||
return constants.ExportTaskSceneOrder
|
||||
}
|
||||
}
|
||||
|
||||
// Count 统计订单导出行数。
|
||||
@@ -129,6 +141,14 @@ func (s *OrderDataSource) baseQuery(ctx context.Context) *gorm.DB {
|
||||
// is_expired 在接口 Service 中未进入 Store 筛选,这里按当前接口行为忽略。
|
||||
func (s *OrderDataSource) applyFilters(ctx context.Context, query *gorm.DB, params ExportParams) (*gorm.DB, error) {
|
||||
query = s.applyOrderScope(query, params)
|
||||
// 订单类别与列表共用同一份条件,导出条数与对应列表一致。
|
||||
if s.category != "" {
|
||||
condition, args, ok := ordercategory.Condition("o", s.category)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("不支持的订单类别: %s", s.category)
|
||||
}
|
||||
query = query.Where(condition, args...)
|
||||
}
|
||||
|
||||
if params.UserType == constants.UserTypeAgent {
|
||||
if params.CreatorShopID != nil {
|
||||
|
||||
@@ -33,7 +33,10 @@ func NewDefaultRegistry(db *gorm.DB) *Registry {
|
||||
return NewRegistry(
|
||||
NewDeviceDataSource(db),
|
||||
NewIotCardDataSource(db),
|
||||
NewOrderDataSource(db),
|
||||
NewOrderDataSource(db, ""),
|
||||
NewOrderDataSource(db, constants.OrderCategoryPlatform),
|
||||
NewOrderDataSource(db, constants.OrderCategoryAgent),
|
||||
NewOrderDataSource(db, constants.OrderCategoryOnline),
|
||||
NewPackageDataSource(db),
|
||||
NewAgentWalletTransactionDataSource(db),
|
||||
NewAgentRechargeDataSource(db),
|
||||
@@ -78,6 +81,9 @@ func IsSupportedScene(scene string) bool {
|
||||
case constants.ExportTaskSceneDevice,
|
||||
constants.ExportTaskSceneIotCard,
|
||||
constants.ExportTaskSceneOrder,
|
||||
constants.ExportTaskSceneOrderPlatform,
|
||||
constants.ExportTaskSceneOrderAgent,
|
||||
constants.ExportTaskSceneOrderOnline,
|
||||
constants.ExportTaskScenePackage,
|
||||
constants.ExportTaskSceneAgentWalletTransaction,
|
||||
constants.ExportTaskSceneAgentRecharge,
|
||||
|
||||
@@ -22,6 +22,9 @@ var timeFilterScenes = map[string]struct{}{
|
||||
constants.ExportTaskSceneExchange: {},
|
||||
constants.ExportTaskSceneAgentRecharge: {},
|
||||
constants.ExportTaskSceneOrder: {},
|
||||
constants.ExportTaskSceneOrderPlatform: {},
|
||||
constants.ExportTaskSceneOrderAgent: {},
|
||||
constants.ExportTaskSceneOrderOnline: {},
|
||||
constants.ExportTaskSceneCommissionRecord: {},
|
||||
constants.ExportTaskSceneExpiringAsset: {},
|
||||
constants.ExportTaskScenePackageTrafficAlert: {},
|
||||
|
||||
Reference in New Issue
Block a user