diff --git a/dao/order_daily_statistics_dao.go b/dao/order_daily_statistics_dao.go index 6b8afa0..7093cdd 100644 --- a/dao/order_daily_statistics_dao.go +++ b/dao/order_daily_statistics_dao.go @@ -8,7 +8,7 @@ import ( "order/consts" "order/model/entity" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" "gitee.com/red-future---jilin-g/common/mongo" "go.mongodb.org/mongo-driver/v2/bson" @@ -45,7 +45,7 @@ func (dao *OrderDailyStatisticsDAO) GenerateStatistics(ctx context.Context, tena // 如果没有数据，创建空统计 if len(orders) == 0 { statistics := &entity.OrderDailyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), @@ -110,7 +110,7 @@ func (dao *OrderDailyStatisticsDAO) GenerateStatistics(ctx context.Context, tena topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) statistics := &entity.OrderDailyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), diff --git a/dao/order_monthly_statistics_dao.go b/dao/order_monthly_statistics_dao.go index 68ee3da..2ad5f48 100644 --- a/dao/order_monthly_statistics_dao.go +++ b/dao/order_monthly_statistics_dao.go @@ -8,7 +8,7 @@ import ( "order/consts" "order/model/entity" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" "gitee.com/red-future---jilin-g/common/mongo" "go.mongodb.org/mongo-driver/v2/bson" @@ -128,7 +128,7 @@ func (dao *OrderMonthlyStatisticsDAO) GenerateStatistics(ctx context.Context, te // 如果没有数据，创建空统计 if len(orders) == 0 { statistics := &entity.OrderMonthlyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), @@ -197,7 +197,7 @@ func (dao *OrderMonthlyStatisticsDAO) GenerateStatistics(ctx context.Context, te topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) statistics := &entity.OrderMonthlyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), diff --git a/dao/order_quarterly_statistics_dao.go b/dao/order_quarterly_statistics_dao.go index e18ddae..bd3a2fb 100644 --- a/dao/order_quarterly_statistics_dao.go +++ b/dao/order_quarterly_statistics_dao.go @@ -8,7 +8,7 @@ import ( "order/consts" "order/model/entity" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" "gitee.com/red-future---jilin-g/common/mongo" "go.mongodb.org/mongo-driver/v2/bson" @@ -56,7 +56,7 @@ func (dao *OrderQuarterlyStatisticsDAO) GenerateStatistics(ctx context.Context, // 如果没有数据，创建空统计 if len(orders) == 0 { statistics := &entity.OrderQuarterlyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), @@ -128,7 +128,7 @@ func (dao *OrderQuarterlyStatisticsDAO) GenerateStatistics(ctx context.Context, topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) statistics := &entity.OrderQuarterlyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), diff --git a/dao/order_yearly_statistics_dao.go b/dao/order_yearly_statistics_dao.go index 5805f2d..fca45eb 100644 --- a/dao/order_yearly_statistics_dao.go +++ b/dao/order_yearly_statistics_dao.go @@ -8,7 +8,7 @@ import ( "order/consts" "order/model/entity" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" "gitee.com/red-future---jilin-g/common/mongo" "go.mongodb.org/mongo-driver/v2/bson" @@ -44,7 +44,7 @@ func (dao *OrderYearlyStatisticsDAO) GenerateStatistics(ctx context.Context, ten // 如果没有数据，创建空统计 if len(orders) == 0 { statistics := &entity.OrderYearlyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), @@ -121,7 +121,7 @@ func (dao *OrderYearlyStatisticsDAO) GenerateStatistics(ctx context.Context, ten topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) statistics := &entity.OrderYearlyStatistics{ - MongoBaseDO: do.MongoBaseDO{ + MongoBaseDO: beans.MongoBaseDO{ TenantId: tenantID, CreatedAt: time.Now(), UpdatedAt: time.Now(), diff --git a/model/entity/order_base.go b/model/entity/order_base.go index 6850124..ba9353c 100644 --- a/model/entity/order_base.go +++ b/model/entity/order_base.go @@ -3,7 +3,7 @@ package entity import ( "time" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // OrderBase 订单基础信息 @@ -13,16 +13,16 @@ import ( // 例如：orders_pending, orders_paid, orders_shipped, orders_completed, orders_cancelled type OrderBase struct { - do.MongoBaseDO `bson:",inline"` - OrderNo string `bson:"order_no" json:"order_no"` // 订单号 - UserID int64 `bson:"user_id" json:"user_id"` // 用户ID - TotalAmount int64 `bson:"total_amount" json:"total_amount"` // 订单总金额（分） - PayAmount int64 `bson:"pay_amount" json:"pay_amount"` // 实付金额（分） - OrderType string `bson:"order_type" json:"order_type"` // 订单类型：normal-普通订单 - Subject string `bson:"subject" json:"subject"` // 订单标题 - Description string `bson:"description" json:"description"` // 订单描述 - OrderItems []OrderItem `bson:"order_items" json:"order_items"` // 订单商品项 - ExpiredAt *time.Time `bson:"expired_at,omitempty" json:"expired_at"` // 过期时间 + beans.MongoBaseDO `bson:",inline"` + OrderNo string `bson:"order_no" json:"order_no"` // 订单号 + UserID int64 `bson:"user_id" json:"user_id"` // 用户ID + TotalAmount int64 `bson:"total_amount" json:"total_amount"` // 订单总金额（分） + PayAmount int64 `bson:"pay_amount" json:"pay_amount"` // 实付金额（分） + OrderType string `bson:"order_type" json:"order_type"` // 订单类型：normal-普通订单 + Subject string `bson:"subject" json:"subject"` // 订单标题 + Description string `bson:"description" json:"description"` // 订单描述 + OrderItems []OrderItem `bson:"order_items" json:"order_items"` // 订单商品项 + ExpiredAt *time.Time `bson:"expired_at,omitempty" json:"expired_at"` // 过期时间 } // OrderItem 订单商品项 diff --git a/model/entity/order_daily_statistics.go b/model/entity/order_daily_statistics.go index e381948..3ec7072 100644 --- a/model/entity/order_daily_statistics.go +++ b/model/entity/order_daily_statistics.go @@ -3,14 +3,14 @@ package entity import ( "time" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // OrderDailyStatistics 订单日统计数据实体 type OrderDailyStatistics struct { - do.MongoBaseDO `bson:",inline"` - ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期 - Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01 + beans.MongoBaseDO `bson:",inline"` + ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期 + Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01 // 订单基础统计 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 diff --git a/model/entity/order_monthly_statistics.go b/model/entity/order_monthly_statistics.go index adc8d5f..3eae5cd 100644 --- a/model/entity/order_monthly_statistics.go +++ b/model/entity/order_monthly_statistics.go @@ -3,14 +3,14 @@ package entity import ( "time" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // OrderMonthlyStatistics 订单月统计数据实体 type OrderMonthlyStatistics struct { - do.MongoBaseDO `bson:",inline"` - ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（月份第一天） - Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01 + beans.MongoBaseDO `bson:",inline"` + ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（月份第一天） + Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01 // 订单基础统计 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 diff --git a/model/entity/order_quarterly_statistics.go b/model/entity/order_quarterly_statistics.go index 3ae10b6..f4bbea7 100644 --- a/model/entity/order_quarterly_statistics.go +++ b/model/entity/order_quarterly_statistics.go @@ -3,15 +3,15 @@ package entity import ( "time" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // OrderQuarterlyStatistics 订单季度统计数据实体 type OrderQuarterlyStatistics struct { - do.MongoBaseDO `bson:",inline"` - ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（季度第一天） - Period string `bson:"period" json:"period"` // 统计周期描述: 2024-Q1 - Quarter int `bson:"quarter" json:"quarter"` // 季度: 1,2,3,4 + beans.MongoBaseDO `bson:",inline"` + ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（季度第一天） + Period string `bson:"period" json:"period"` // 统计周期描述: 2024-Q1 + Quarter int `bson:"quarter" json:"quarter"` // 季度: 1,2,3,4 // 订单基础统计 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 diff --git a/model/entity/order_statistics.go b/model/entity/order_statistics.go index 0bf5d76..94410cc 100644 --- a/model/entity/order_statistics.go +++ b/model/entity/order_statistics.go @@ -3,15 +3,15 @@ package entity import ( "time" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // OrderStatistics 订单统计数据实体 type OrderStatistics struct { - do.MongoBaseDO `bson:",inline"` - ReportType string `bson:"report_type" json:"report_type"` // 报表类型: daily, monthly, quarterly, yearly - ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期 - Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01, 2024-01, 2024-Q1, 2024 + beans.MongoBaseDO `bson:",inline"` + ReportType string `bson:"report_type" json:"report_type"` // 报表类型: daily, monthly, quarterly, yearly + ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期 + Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01, 2024-01, 2024-Q1, 2024 // 订单基础统计 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 diff --git a/model/entity/order_yearly_statistics.go b/model/entity/order_yearly_statistics.go index 198b727..3512c01 100644 --- a/model/entity/order_yearly_statistics.go +++ b/model/entity/order_yearly_statistics.go @@ -3,15 +3,15 @@ package entity import ( "time" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // OrderYearlyStatistics 订单年度统计数据实体 type OrderYearlyStatistics struct { - do.MongoBaseDO `bson:",inline"` - ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（年度第一天） - Period string `bson:"period" json:"period"` // 统计周期描述: 2024 - Year int `bson:"year" json:"year"` // 年份 + beans.MongoBaseDO `bson:",inline"` + ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（年度第一天） + Period string `bson:"period" json:"period"` // 统计周期描述: 2024 + Year int `bson:"year" json:"year"` // 年份 // 订单基础统计 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 diff --git a/model/entity/payment_config.go b/model/entity/payment_config.go index cf7c3c1..0316c4d 100644 --- a/model/entity/payment_config.go +++ b/model/entity/payment_config.go @@ -3,7 +3,7 @@ package entity import ( "go.mongodb.org/mongo-driver/v2/bson" - "gitee.com/red-future---jilin-g/common/do" + "gitee.com/red-future---jilin-g/common/beans" ) // PaymentConfig 支付配置 @@ -11,11 +11,11 @@ import ( // 支持微信支付和支付宝支付 type PaymentConfig struct { - do.MongoBaseDO `bson:",inline"` - PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式：wechat/alipay - ConfigName string `bson:"config_name" json:"config_name"` // 配置名称 - Description string `bson:"description" json:"description"` // 配置描述 - Enabled bool `bson:"enabled" json:"enabled"` // 是否启用 + beans.MongoBaseDO `bson:",inline"` + PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式：wechat/alipay + ConfigName string `bson:"config_name" json:"config_name"` // 配置名称 + Description string `bson:"description" json:"description"` // 配置描述 + Enabled bool `bson:"enabled" json:"enabled"` // 是否启用 // 通用配置 AppID string `bson:"app_id" json:"app_id"` // 应用ID @@ -47,31 +47,31 @@ type PaymentConfig struct { // 记录每次支付操作的结果 type PaymentRecord struct { - do.MongoBaseDO `bson:",inline"` - OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID - OrderNo string `bson:"order_no" json:"order_no"` // 订单号 - PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式 - PayType string `bson:"pay_type" json:"pay_type"` // 支付类型 - Amount int64 `bson:"amount" json:"amount"` // 支付金额（分） - TransactionID string `bson:"transaction_id" json:"transaction_id"` // 支付平台交易号 - OutTradeNo string `bson:"out_trade_no" json:"out_trade_no"` // 商户订单号 - TradeNo string `bson:"trade_no" json:"trade_no"` // 交易号 - PrepayID string `bson:"prepay_id,omitempty" json:"prepay_id"` // 预支付ID - Status string `bson:"status" json:"status"` // 支付状态：success/failed - ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息 + beans.MongoBaseDO `bson:",inline"` + OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID + OrderNo string `bson:"order_no" json:"order_no"` // 订单号 + PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式 + PayType string `bson:"pay_type" json:"pay_type"` // 支付类型 + Amount int64 `bson:"amount" json:"amount"` // 支付金额（分） + TransactionID string `bson:"transaction_id" json:"transaction_id"` // 支付平台交易号 + OutTradeNo string `bson:"out_trade_no" json:"out_trade_no"` // 商户订单号 + TradeNo string `bson:"trade_no" json:"trade_no"` // 交易号 + PrepayID string `bson:"prepay_id,omitempty" json:"prepay_id"` // 预支付ID + Status string `bson:"status" json:"status"` // 支付状态：success/failed + ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息 } // RefundRecord 退款记录 // 记录每次退款操作的结果 type RefundRecord struct { - do.MongoBaseDO `bson:",inline"` - OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID - OrderNo string `bson:"order_no" json:"order_no"` // 订单号 - RefundNo string `bson:"refund_no" json:"refund_no"` // 退款单号 - RefundID string `bson:"refund_id" json:"refund_id"` // 退款ID - RefundAmount int64 `bson:"refund_amount" json:"refund_amount"` // 退款金额（分） - Reason string `bson:"reason" json:"reason"` // 退款原因 - Status string `bson:"status" json:"status"` // 退款状态：success/failed - ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息 + beans.MongoBaseDO `bson:",inline"` + OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID + OrderNo string `bson:"order_no" json:"order_no"` // 订单号 + RefundNo string `bson:"refund_no" json:"refund_no"` // 退款单号 + RefundID string `bson:"refund_id" json:"refund_id"` // 退款ID + RefundAmount int64 `bson:"refund_amount" json:"refund_amount"` // 退款金额（分） + Reason string `bson:"reason" json:"reason"` // 退款原因 + Status string `bson:"status" json:"status"` // 退款状态：success/failed + ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息 }