初始化项目

2025-12-10 13:51:09 +08:00
parent 3c55577df8
commit 0486f468d6
19 changed files with 1078 additions and 1010 deletions
--- a/dao/order_dao.go
+++ b/dao/order_dao.go
@@ -6,59 +6,56 @@ import (
 	"fmt"
 	"time"

-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"gitee.com/red-future---jilin-g/common/mongo"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"order/consts"
 	"order/model/entity"
 )

-// OrderDao 订单数据访问对象
-// 支持按状态拆分的订单表操作
+type order struct{}

-type OrderDao struct {
-	collections map[entity.OrderStatus]*mongo.Collection
-}
-
-// NewOrderDao 创建订单DAO实例
-func NewOrderDao(collections map[entity.OrderStatus]*mongo.Collection) *OrderDao {
-	return &OrderDao{
-		collections: collections,
-	}
-}
+// Order 订单数据访问对象
+var Order = &order{}

 // getCollection 根据订单状态获取对应的集合
-func (d *OrderDao) getCollection(status entity.OrderStatus) (*mongo.Collection, error) {
-	collection, exists := d.collections[status]
-	if !exists {
-		return nil, fmt.Errorf("collection for status %s not found", status)
+func (d *order) getCollection(status consts.OrderStatus) (string, error) {
+	switch status {
+	case consts.OrderStatusPending:
+		return consts.OrderPendingCollection, nil
+	case consts.OrderStatusPaid:
+		return consts.OrderPaidCollection, nil
+	case consts.OrderStatusShipped:
+		return consts.OrderShippedCollection, nil
+	case consts.OrderStatusCompleted:
+		return consts.OrderCompletedCollection, nil
+	default:
+		return "", fmt.Errorf("collection for status %s not found", status)
 	}
-	return collection, nil
 }

 // CreatePendingOrder 创建待支付订单
-func (d *OrderDao) CreatePendingOrder(ctx context.Context, order *entity.OrderPending) error {
-	collection, err := d.getCollection(entity.OrderStatusPending)
+func (d *order) CreatePendingOrder(ctx context.Context, order *entity.OrderPending) error {
+	collection, err := d.getCollection(consts.OrderStatusPending)
 	if err != nil {
 		return err
 	}

-	order.ID = primitive.NewObjectID()
+	order.ID = bson.NewObjectID()
 	order.CreatedAt = time.Now()
 	order.UpdatedAt = time.Now()

-	_, err = collection.InsertOne(ctx, order)
+	_, err = mongo.Insert(ctx, []interface{}{order}, collection)
 	return err
 }

 // GetOrderByNo 根据订单号查询订单（自动识别状态）
-func (d *OrderDao) GetOrderByNo(ctx context.Context, tenantID, orderNo string) (interface{}, entity.OrderStatus, error) {
+func (d *order) GetOrderByNo(ctx context.Context, tenantID, orderNo string) (interface{}, consts.OrderStatus, error) {
 	// 按状态优先级搜索（从最新状态开始）
-	statuses := []entity.OrderStatus{
-		entity.OrderStatusCompleted,
-		entity.OrderStatusShipped,
-		entity.OrderStatusPaid,
-		entity.OrderStatusPending,
+	statuses := []consts.OrderStatus{
+		consts.OrderStatusCompleted,
+		consts.OrderStatusShipped,
+		consts.OrderStatusPaid,
+		consts.OrderStatusPending,
 	}

 	for _, status := range statuses {
@@ -68,22 +65,22 @@ func (d *OrderDao) GetOrderByNo(ctx context.Context, tenantID, orderNo string) (
 		}

 		switch status {
-		case entity.OrderStatusPending:
+		case consts.OrderStatusPending:
 			var order entity.OrderPending
 			if err := d.findOrderByNo(collection, ctx, tenantID, orderNo, &order); err == nil {
 				return &order, status, nil
 			}
-		case entity.OrderStatusPaid:
+		case consts.OrderStatusPaid:
 			var order entity.OrderPaid
 			if err := d.findOrderByNo(collection, ctx, tenantID, orderNo, &order); err == nil {
 				return &order, status, nil
 			}
-		case entity.OrderStatusShipped:
+		case consts.OrderStatusShipped:
 			var order entity.OrderShipped
 			if err := d.findOrderByNo(collection, ctx, tenantID, orderNo, &order); err == nil {
 				return &order, status, nil
 			}
-		case entity.OrderStatusCompleted:
+		case consts.OrderStatusCompleted:
 			var order entity.OrderCompleted
 			if err := d.findOrderByNo(collection, ctx, tenantID, orderNo, &order); err == nil {
 				return &order, status, nil
@@ -95,21 +92,21 @@ func (d *OrderDao) GetOrderByNo(ctx context.Context, tenantID, orderNo string) (
 }

 // findOrderByNo 通用订单查询方法
-func (d *OrderDao) findOrderByNo(collection *mongo.Collection, ctx context.Context, tenantID, orderNo string, result interface{}) error {
+func (d *order) findOrderByNo(collection string, ctx context.Context, tenantID, orderNo string, result interface{}) error {
 	filter := bson.M{
 		"tenant_id": tenantID,
 		"order_no":  orderNo,
 	}

-	err := collection.FindOne(ctx, filter).Decode(result)
-	if err == mongo.ErrNoDocuments {
+	err := mongo.FindOne(ctx, filter, result, collection)
+	if err != nil {
 		return errors.New("order not found")
 	}
-	return err
+	return nil
 }

 // MoveOrderToStatus 将订单从一个状态移动到另一个状态
-func (d *OrderDao) MoveOrderToStatus(ctx context.Context, fromStatus, toStatus entity.OrderStatus, tenantID, orderNo string, updateData bson.M) error {
+func (d *order) MoveOrderToStatus(ctx context.Context, fromStatus, toStatus consts.OrderStatus, tenantID, orderNo string, updateData bson.M) error {
 	// 获取源集合
 	srcCollection, err := d.getCollection(fromStatus)
 	if err != nil {
@@ -129,7 +126,7 @@ func (d *OrderDao) MoveOrderToStatus(ctx context.Context, fromStatus, toStatus e
 		"order_no":  orderNo,
 	}

-	err = srcCollection.FindOne(ctx, filter).Decode(&orderData)
+	err = mongo.FindOne(ctx, filter, &orderData, srcCollection)
 	if err != nil {
 		return err
 	}
@@ -141,35 +138,36 @@ func (d *OrderDao) MoveOrderToStatus(ctx context.Context, fromStatus, toStatus e
 	}

 	// 插入到目标集合
-	_, err = destCollection.InsertOne(ctx, orderData)
+	_, err = mongo.Insert(ctx, []interface{}{orderData}, destCollection)
 	if err != nil {
 		return err
 	}

 	// 从源集合删除
-	_, err = srcCollection.DeleteOne(ctx, filter)
+	_, err = mongo.Delete(ctx, filter, srcCollection)
 	return err
 }

 // UpdatePendingOrder 更新待支付订单
-func (d *OrderDao) UpdatePendingOrder(ctx context.Context, tenantID, orderNo string, update bson.M) error {
-	collection, err := d.getCollection(entity.OrderStatusPending)
+func (d *order) UpdatePendingOrder(ctx context.Context, tenantID, orderNo string, update bson.M) error {
+	collection, err := d.getCollection(consts.OrderStatusPending)
 	if err != nil {
 		return err
 	}

 	update["updated_at"] = time.Now()

-	_, err = collection.UpdateOne(ctx, bson.M{
+	filter := bson.M{
 		"tenant_id": tenantID,
 		"order_no":  orderNo,
-	}, bson.M{"$set": update})
+	}
+	_, err = mongo.Update(ctx, filter, bson.M{"$set": update}, collection)

 	return err
 }

 // ListOrdersByStatus 根据状态查询订单列表
-func (d *OrderDao) ListOrdersByStatus(ctx context.Context, status entity.OrderStatus, tenantID, userID string, page, pageSize int) (interface{}, int64, error) {
+func (d *order) ListOrdersByStatus(ctx context.Context, status consts.OrderStatus, tenantID, userID string, page, pageSize int) (interface{}, int64, error) {
 	collection, err := d.getCollection(status)
 	if err != nil {
 		return nil, 0, err
@@ -182,47 +180,37 @@ func (d *OrderDao) ListOrdersByStatus(ctx context.Context, status entity.OrderSt
 	}

 	// 计算总数
-	total, err := collection.CountDocuments(ctx, filter)
+	total, err := mongo.Count(ctx, filter, collection)
 	if err != nil {
 		return nil, 0, err
 	}

-	// 分页查询
-	skip := int64((page - 1) * pageSize)
-	opt := options.Find().
-		SetSort(bson.D{{Key: "created_at", Value: -1}}).
-		SetSkip(skip).
-		SetLimit(int64(pageSize))
-
-	cursor, err := collection.Find(ctx, filter, opt)
-	if err != nil {
-		return nil, 0, err
-	}
-	defer cursor.Close(ctx)
+	// 分页查询（暂时忽略排序和分页，因为 mongo.Find 不支持这些参数）
+	// TODO: 需要在 common/mongo 中添加支持排序和分页的 Find 方法

 	// 根据状态返回对应的订单类型
 	switch status {
-	case entity.OrderStatusPending:
+	case consts.OrderStatusPending:
 		var orders []entity.OrderPending
-		if err := cursor.All(ctx, &orders); err != nil {
+		if err := mongo.Find(ctx, filter, &orders, collection); err != nil {
 			return nil, 0, err
 		}
 		return orders, total, nil
-	case entity.OrderStatusPaid:
+	case consts.OrderStatusPaid:
 		var orders []entity.OrderPaid
-		if err := cursor.All(ctx, &orders); err != nil {
+		if err := mongo.Find(ctx, filter, &orders, collection); err != nil {
 			return nil, 0, err
 		}
 		return orders, total, nil
-	case entity.OrderStatusShipped:
+	case consts.OrderStatusShipped:
 		var orders []entity.OrderShipped
-		if err := cursor.All(ctx, &orders); err != nil {
+		if err := mongo.Find(ctx, filter, &orders, collection); err != nil {
 			return nil, 0, err
 		}
 		return orders, total, nil
-	case entity.OrderStatusCompleted:
+	case consts.OrderStatusCompleted:
 		var orders []entity.OrderCompleted
-		if err := cursor.All(ctx, &orders); err != nil {
+		if err := mongo.Find(ctx, filter, &orders, collection); err != nil {
 			return nil, 0, err
 		}
 		return orders, total, nil
@@ -232,8 +220,8 @@ func (d *OrderDao) ListOrdersByStatus(ctx context.Context, status entity.OrderSt
 }

 // GetExpiredPendingOrders 获取过期的待支付订单
-func (d *OrderDao) GetExpiredPendingOrders(ctx context.Context, tenantID string) ([]entity.OrderPending, error) {
-	collection, err := d.getCollection(entity.OrderStatusPending)
+func (d *order) GetExpiredPendingOrders(ctx context.Context, tenantID string) ([]entity.OrderPending, error) {
+	collection, err := d.getCollection(consts.OrderStatusPending)
 	if err != nil {
 		return nil, err
 	}
@@ -243,14 +231,8 @@ func (d *OrderDao) GetExpiredPendingOrders(ctx context.Context, tenantID string)
 		"expired_at": bson.M{"$lte": time.Now()},
 	}

-	cursor, err := collection.Find(ctx, filter)
-	if err != nil {
-		return nil, err
-	}
-	defer cursor.Close(ctx)
-
 	var orders []entity.OrderPending
-	if err := cursor.All(ctx, &orders); err != nil {
+	if err := mongo.Find(ctx, filter, &orders, collection); err != nil {
 		return nil, err
 	}

@@ -258,19 +240,21 @@ func (d *OrderDao) GetExpiredPendingOrders(ctx context.Context, tenantID string)
 }

 // UpdatePayInfo 更新支付信息（待支付订单）
-func (d *OrderDao) UpdatePayInfo(ctx context.Context, tenantID, orderNo string, payInfo entity.PayInfo) error {
-	collection, err := d.getCollection(entity.OrderStatusPending)
+func (d *order) UpdatePayInfo(ctx context.Context, tenantID, orderNo string, payInfo entity.PayInfo) error {
+	collection, err := d.getCollection(consts.OrderStatusPending)
 	if err != nil {
 		return err
 	}

-	_, err = collection.UpdateOne(ctx, bson.M{
+	filter := bson.M{
 		"tenant_id": tenantID,
 		"order_no":  orderNo,
-	}, bson.M{"$set": bson.M{
+	}
+	update := bson.M{
 		"pay_info":   payInfo,
 		"updated_at": time.Now(),
-	}})
+	}
+	_, err = mongo.Update(ctx, filter, bson.M{"$set": update}, collection)

 	return err
 }