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(),

4
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,7 +13,7 @@ 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"` // 订单总金额（分）

4
model/entity/order_daily_statistics.go
View File

@@ -3,12 +3,12 @@ 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

4
model/entity/order_monthly_statistics.go
View File

@@ -3,12 +3,12 @@ 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

4
model/entity/order_quarterly_statistics.go
View File

@@ -3,12 +3,12 @@ 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

4
model/entity/order_statistics.go
View File

@@ -3,12 +3,12 @@ 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

4
model/entity/order_yearly_statistics.go
View File

@@ -3,12 +3,12 @@ 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"` // 年份

8
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,7 +11,7 @@ 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"` // 配置描述
@@ -47,7 +47,7 @@ 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"` // 支付方式
@@ -65,7 +65,7 @@ type PaymentRecord struct {
// 记录每次退款操作的结果 // 记录每次退款操作的结果
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"` // 退款单号