red-future/order
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改修改公共beans包路径

Browse Source
This commit is contained in:
张斌
2025-12-31 11:18:52 +08:00
parent 30158f3fa5
commit 1ce24a84cd
11 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dao/order_daily_statistics_dao.go
View File

@@ -8,7 +8,7 @@ import (
"order/consts" "order/consts"
"order/model/entity" "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" "gitee.com/red-future---jilin-g/common/mongo"
"go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/bson"
@@ -45,7 +45,7 @@ func (dao *OrderDailyStatisticsDAO) GenerateStatistics(ctx context.Context, tena
// 如果没有数据，创建空统计 // 如果没有数据，创建空统计
if len(orders) == 0 { if len(orders) == 0 {
statistics := &entity.OrderDailyStatistics{ statistics := &entity.OrderDailyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),
@@ -110,7 +110,7 @@ func (dao *OrderDailyStatisticsDAO) GenerateStatistics(ctx context.Context, tena
topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders)
statistics := &entity.OrderDailyStatistics{ statistics := &entity.OrderDailyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),

6
dao/order_monthly_statistics_dao.go
View File

@@ -8,7 +8,7 @@ import (
"order/consts" "order/consts"
"order/model/entity" "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" "gitee.com/red-future---jilin-g/common/mongo"
"go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/bson"
@@ -128,7 +128,7 @@ func (dao *OrderMonthlyStatisticsDAO) GenerateStatistics(ctx context.Context, te
// 如果没有数据，创建空统计 // 如果没有数据，创建空统计
if len(orders) == 0 { if len(orders) == 0 {
statistics := &entity.OrderMonthlyStatistics{ statistics := &entity.OrderMonthlyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),
@@ -197,7 +197,7 @@ func (dao *OrderMonthlyStatisticsDAO) GenerateStatistics(ctx context.Context, te
topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders)
statistics := &entity.OrderMonthlyStatistics{ statistics := &entity.OrderMonthlyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),

6
dao/order_quarterly_statistics_dao.go
View File

@@ -8,7 +8,7 @@ import (
"order/consts" "order/consts"
"order/model/entity" "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" "gitee.com/red-future---jilin-g/common/mongo"
"go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/bson"
@@ -56,7 +56,7 @@ func (dao *OrderQuarterlyStatisticsDAO) GenerateStatistics(ctx context.Context,
// 如果没有数据，创建空统计 // 如果没有数据，创建空统计
if len(orders) == 0 { if len(orders) == 0 {
statistics := &entity.OrderQuarterlyStatistics{ statistics := &entity.OrderQuarterlyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),
@@ -128,7 +128,7 @@ func (dao *OrderQuarterlyStatisticsDAO) GenerateStatistics(ctx context.Context,
topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders)
statistics := &entity.OrderQuarterlyStatistics{ statistics := &entity.OrderQuarterlyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),

6
dao/order_yearly_statistics_dao.go
View File

@@ -8,7 +8,7 @@ import (
"order/consts" "order/consts"
"order/model/entity" "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" "gitee.com/red-future---jilin-g/common/mongo"
"go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/bson"
@@ -44,7 +44,7 @@ func (dao *OrderYearlyStatisticsDAO) GenerateStatistics(ctx context.Context, ten
// 如果没有数据，创建空统计 // 如果没有数据，创建空统计
if len(orders) == 0 { if len(orders) == 0 {
statistics := &entity.OrderYearlyStatistics{ statistics := &entity.OrderYearlyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),
@@ -121,7 +121,7 @@ func (dao *OrderYearlyStatisticsDAO) GenerateStatistics(ctx context.Context, ten
topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders) topAssetID, topAssetName, topAssetCount := dao.findTopAsset(assetCounts, orders)
statistics := &entity.OrderYearlyStatistics{ statistics := &entity.OrderYearlyStatistics{
MongoBaseDO: do.MongoBaseDO{ MongoBaseDO: beans.MongoBaseDO{
TenantId: tenantID, TenantId: tenantID,
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),

22
model/entity/order_base.go
View File

@@ -3,7 +3,7 @@ package entity
import ( import (
"time" "time"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// OrderBase 订单基础信息 // OrderBase 订单基础信息
@@ -13,16 +13,16 @@ import (
// 例如：orders_pending, orders_paid, orders_shipped, orders_completed, orders_cancelled // 例如：orders_pending, orders_paid, orders_shipped, orders_completed, orders_cancelled
type OrderBase struct { type OrderBase struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
OrderNo string `bson:"order_no" json:"order_no"` // 订单号 OrderNo string `bson:"order_no" json:"order_no"` // 订单号
UserID int64 `bson:"user_id" json:"user_id"` // 用户ID UserID int64 `bson:"user_id" json:"user_id"` // 用户ID
TotalAmount int64 `bson:"total_amount" json:"total_amount"` // 订单总金额（分） TotalAmount int64 `bson:"total_amount" json:"total_amount"` // 订单总金额（分）
PayAmount int64 `bson:"pay_amount" json:"pay_amount"` // 实付金额（分） PayAmount int64 `bson:"pay_amount" json:"pay_amount"` // 实付金额（分）
OrderType string `bson:"order_type" json:"order_type"` // 订单类型：normal-普通订单 OrderType string `bson:"order_type" json:"order_type"` // 订单类型：normal-普通订单
Subject string `bson:"subject" json:"subject"` // 订单标题 Subject string `bson:"subject" json:"subject"` // 订单标题
Description string `bson:"description" json:"description"` // 订单描述 Description string `bson:"description" json:"description"` // 订单描述
OrderItems []OrderItem `bson:"order_items" json:"order_items"` // 订单商品项 OrderItems []OrderItem `bson:"order_items" json:"order_items"` // 订单商品项
ExpiredAt *time.Time `bson:"expired_at,omitempty" json:"expired_at"` // 过期时间 ExpiredAt *time.Time `bson:"expired_at,omitempty" json:"expired_at"` // 过期时间
} }
// OrderItem 订单商品项 // OrderItem 订单商品项

8
model/entity/order_daily_statistics.go
View File

@@ -3,14 +3,14 @@ package entity
import ( import (
"time" "time"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// OrderDailyStatistics 订单日统计数据实体 // OrderDailyStatistics 订单日统计数据实体
type OrderDailyStatistics struct { type OrderDailyStatistics struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期 ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期
Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01 Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01
// 订单基础统计 // 订单基础统计
TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数

8
model/entity/order_monthly_statistics.go
View File

@@ -3,14 +3,14 @@ package entity
import ( import (
"time" "time"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// OrderMonthlyStatistics 订单月统计数据实体 // OrderMonthlyStatistics 订单月统计数据实体
type OrderMonthlyStatistics struct { type OrderMonthlyStatistics struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（月份第一天） ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（月份第一天）
Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01 Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01
// 订单基础统计 // 订单基础统计
TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数

10
model/entity/order_quarterly_statistics.go
View File

@@ -3,15 +3,15 @@ package entity
import ( import (
"time" "time"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// OrderQuarterlyStatistics 订单季度统计数据实体 // OrderQuarterlyStatistics 订单季度统计数据实体
type OrderQuarterlyStatistics struct { type OrderQuarterlyStatistics struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（季度第一天） ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（季度第一天）
Period string `bson:"period" json:"period"` // 统计周期描述: 2024-Q1 Period string `bson:"period" json:"period"` // 统计周期描述: 2024-Q1
Quarter int `bson:"quarter" json:"quarter"` // 季度: 1,2,3,4 Quarter int `bson:"quarter" json:"quarter"` // 季度: 1,2,3,4
// 订单基础统计 // 订单基础统计
TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数

10
model/entity/order_statistics.go
View File

@@ -3,15 +3,15 @@ package entity
import ( import (
"time" "time"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// OrderStatistics 订单统计数据实体 // OrderStatistics 订单统计数据实体
type OrderStatistics struct { type OrderStatistics struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
ReportType string `bson:"report_type" json:"report_type"` // 报表类型: daily, monthly, quarterly, yearly ReportType string `bson:"report_type" json:"report_type"` // 报表类型: daily, monthly, quarterly, yearly
ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期 ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期
Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01, 2024-01, 2024-Q1, 2024 Period string `bson:"period" json:"period"` // 统计周期描述: 2024-01-01, 2024-01, 2024-Q1, 2024
// 订单基础统计 // 订单基础统计
TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数

10
model/entity/order_yearly_statistics.go
View File

@@ -3,15 +3,15 @@ package entity
import ( import (
"time" "time"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// OrderYearlyStatistics 订单年度统计数据实体 // OrderYearlyStatistics 订单年度统计数据实体
type OrderYearlyStatistics struct { type OrderYearlyStatistics struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（年度第一天） ReportDate time.Time `bson:"report_date" json:"report_date"` // 统计日期（年度第一天）
Period string `bson:"period" json:"period"` // 统计周期描述: 2024 Period string `bson:"period" json:"period"` // 统计周期描述: 2024
Year int `bson:"year" json:"year"` // 年份 Year int `bson:"year" json:"year"` // 年份
// 订单基础统计 // 订单基础统计
TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数 TotalOrders int64 `bson:"total_orders" json:"total_orders"` // 总订单数

54
model/entity/payment_config.go
View File

@@ -3,7 +3,7 @@ package entity
import ( import (
"go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/bson"
"gitee.com/red-future---jilin-g/common/do" "gitee.com/red-future---jilin-g/common/beans"
) )
// PaymentConfig 支付配置 // PaymentConfig 支付配置
@@ -11,11 +11,11 @@ import (
// 支持微信支付和支付宝支付 // 支持微信支付和支付宝支付
type PaymentConfig struct { type PaymentConfig struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式：wechat/alipay PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式：wechat/alipay
ConfigName string `bson:"config_name" json:"config_name"` // 配置名称 ConfigName string `bson:"config_name" json:"config_name"` // 配置名称
Description string `bson:"description" json:"description"` // 配置描述 Description string `bson:"description" json:"description"` // 配置描述
Enabled bool `bson:"enabled" json:"enabled"` // 是否启用 Enabled bool `bson:"enabled" json:"enabled"` // 是否启用
// 通用配置 // 通用配置
AppID string `bson:"app_id" json:"app_id"` // 应用ID AppID string `bson:"app_id" json:"app_id"` // 应用ID
@@ -47,31 +47,31 @@ type PaymentConfig struct {
// 记录每次支付操作的结果 // 记录每次支付操作的结果
type PaymentRecord struct { type PaymentRecord struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID
OrderNo string `bson:"order_no" json:"order_no"` // 订单号 OrderNo string `bson:"order_no" json:"order_no"` // 订单号
PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式 PayMethod string `bson:"pay_method" json:"pay_method"` // 支付方式
PayType string `bson:"pay_type" json:"pay_type"` // 支付类型 PayType string `bson:"pay_type" json:"pay_type"` // 支付类型
Amount int64 `bson:"amount" json:"amount"` // 支付金额（分） Amount int64 `bson:"amount" json:"amount"` // 支付金额（分）
TransactionID string `bson:"transaction_id" json:"transaction_id"` // 支付平台交易号 TransactionID string `bson:"transaction_id" json:"transaction_id"` // 支付平台交易号
OutTradeNo string `bson:"out_trade_no" json:"out_trade_no"` // 商户订单号 OutTradeNo string `bson:"out_trade_no" json:"out_trade_no"` // 商户订单号
TradeNo string `bson:"trade_no" json:"trade_no"` // 交易号 TradeNo string `bson:"trade_no" json:"trade_no"` // 交易号
PrepayID string `bson:"prepay_id,omitempty" json:"prepay_id"` // 预支付ID PrepayID string `bson:"prepay_id,omitempty" json:"prepay_id"` // 预支付ID
Status string `bson:"status" json:"status"` // 支付状态：success/failed Status string `bson:"status" json:"status"` // 支付状态：success/failed
ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息 ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息
} }
// RefundRecord 退款记录 // RefundRecord 退款记录
// 记录每次退款操作的结果 // 记录每次退款操作的结果
type RefundRecord struct { type RefundRecord struct {
do.MongoBaseDO `bson:",inline"` beans.MongoBaseDO `bson:",inline"`
OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID OrderID bson.ObjectID `bson:"order_id" json:"order_id"` // 订单ID
OrderNo string `bson:"order_no" json:"order_no"` // 订单号 OrderNo string `bson:"order_no" json:"order_no"` // 订单号
RefundNo string `bson:"refund_no" json:"refund_no"` // 退款单号 RefundNo string `bson:"refund_no" json:"refund_no"` // 退款单号
RefundID string `bson:"refund_id" json:"refund_id"` // 退款ID RefundID string `bson:"refund_id" json:"refund_id"` // 退款ID
RefundAmount int64 `bson:"refund_amount" json:"refund_amount"` // 退款金额（分） RefundAmount int64 `bson:"refund_amount" json:"refund_amount"` // 退款金额（分）
Reason string `bson:"reason" json:"reason"` // 退款原因 Reason string `bson:"reason" json:"reason"` // 退款原因
Status string `bson:"status" json:"status"` // 退款状态：success/failed Status string `bson:"status" json:"status"` // 退款状态：success/failed
ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息 ErrorMsg string `bson:"error_msg,omitempty" json:"error_msg"` // 错误信息
} }