v1.1

2025-12-09 18:55:28 +08:00
parent 8d00d67540
commit c23ab8338b
209 changed files with 5445 additions and 3963 deletions
--- a/app/main/api/internal/logic/admin_order/admincreateorderlogic.go
+++ b/app/main/api/internal/logic/admin_order/admincreateorderlogic.go
@@ -11,6 +11,7 @@ import (
 	"ycc-server/app/main/model"
 	"ycc-server/common/xerr"

+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
@@ -48,6 +49,7 @@ func (l *AdminCreateOrderLogic) AdminCreateOrder(req *types.AdminCreateOrderReq)

 	// 创建订单对象
 	order := &model.Order{
+		Id:              uuid.NewString(),
 		OrderNo:         orderNo,
 		PlatformOrderId: sql.NullString{String: req.PlatformOrderId, Valid: req.PlatformOrderId != ""},
 		ProductId:       product.Id,
@@ -58,19 +60,14 @@ func (l *AdminCreateOrderLogic) AdminCreateOrder(req *types.AdminCreateOrderReq)
 	}

 	// 使用事务处理订单创建
-	var orderId int64
+	var orderId string
 	err = l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
 		// 插入订单
-		result, err := l.svcCtx.OrderModel.Insert(ctx, session, order)
+		_, err := l.svcCtx.OrderModel.Insert(ctx, session, order)
 		if err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminCreateOrder, 创建订单失败 err: %v", err)
 		}
-
-		// 获取订单ID
-		orderId, err = result.LastInsertId()
-		if err != nil {
-			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminCreateOrder, 获取订单ID失败 err: %v", err)
-		}
+		orderId = order.Id

 		return nil
 	})
--- a/app/main/api/internal/logic/admin_order/admingetorderlistlogic.go
+++ b/app/main/api/internal/logic/admin_order/admingetorderlistlogic.go
@@ -97,16 +97,16 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
 	}

 	// 并发获取产品信息和查询状态
-	productMap := make(map[int64]string)
-	queryStateMap := make(map[int64]string)
-	agentOrderMap := make(map[int64]bool)           // 代理订单映射
-	agentProcessStatusMap := make(map[int64]string) // 代理处理状态映射
+	productMap := make(map[string]string)
+	queryStateMap := make(map[string]string)
+	agentOrderMap := make(map[string]bool)           // 代理订单映射
+	agentProcessStatusMap := make(map[string]string) // 代理处理状态映射

 	var mu sync.Mutex

 	// 批量获取查询状态
 	if len(orders) > 0 {
-		orderIds := make([]int64, 0, len(orders))
+		orderIds := make([]string, 0, len(orders))
 		for _, order := range orders {
 			orderIds = append(orderIds, order.Id)
 		}
@@ -121,14 +121,14 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
 		}

 		// 2. 记录已找到查询状态的订单ID
-		foundOrderIds := make(map[int64]bool)
+		foundOrderIds := make(map[string]bool)
 		for _, query := range queries {
 			queryStateMap[query.OrderId] = query.QueryState
 			foundOrderIds[query.OrderId] = true
 		}

 		// 3. 查找未找到查询状态的订单是否在清理日志中
-		notFoundOrderIds := make([]int64, 0)
+		notFoundOrderIds := make([]string, 0)
 		for _, orderId := range orderIds {
 			if !foundOrderIds[orderId] {
 				notFoundOrderIds = append(notFoundOrderIds, orderId)
@@ -175,7 +175,7 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR

 		// 对于代理订单，查询代理处理状态
 		if len(agentOrders) > 0 {
-			agentOrderIds := make([]int64, 0, len(agentOrders))
+			agentOrderIds := make([]string, 0, len(agentOrders))
 			for _, agentOrder := range agentOrders {
 				agentOrderIds = append(agentOrderIds, agentOrder.OrderId)
 			}
@@ -188,13 +188,13 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
 			}

 			// 记录有佣金记录的订单为处理成功
-			processedOrderIds := make(map[int64]bool)
+			processedOrderIds := make(map[string]bool)
 			for _, commission := range commissions {
 				processedOrderIds[commission.OrderId] = true
 			}

 			// 创建订单状态映射，避免重复查找
-			orderStatusMap := make(map[int64]string)
+			orderStatusMap := make(map[string]string)
 			for _, order := range orders {
 				orderStatusMap[order.Id] = order.Status
 			}
--- a/app/main/api/internal/logic/admin_order/adminrefundorderlogic.go
+++ b/app/main/api/internal/logic/admin_order/adminrefundorderlogic.go
@@ -1,19 +1,20 @@
 package admin_order

 import (
-	"context"
-	"database/sql"
-	"fmt"
-	"time"
+    "context"
+    "database/sql"
+    "fmt"
+    "time"

-	"ycc-server/app/main/api/internal/svc"
-	"ycc-server/app/main/api/internal/types"
-	"ycc-server/app/main/model"
-	"ycc-server/common/xerr"
+    "ycc-server/app/main/api/internal/svc"
+    "ycc-server/app/main/api/internal/types"
+    "ycc-server/app/main/model"
+    "ycc-server/common/xerr"

-	"github.com/pkg/errors"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stores/sqlx"
+    "github.com/pkg/errors"
+    "github.com/zeromicro/go-zero/core/logx"
+    "github.com/zeromicro/go-zero/core/stores/sqlx"
+    "github.com/google/uuid"
 )

 const (
@@ -55,7 +56,7 @@ func (l *AdminRefundOrderLogic) AdminRefundOrder(req *types.AdminRefundOrderReq)
 }

 // getAndValidateOrder 获取并验证订单信息
-func (l *AdminRefundOrderLogic) getAndValidateOrder(orderId int64, refundAmount float64) (*model.Order, error) {
+func (l *AdminRefundOrderLogic) getAndValidateOrder(orderId string, refundAmount float64) (*model.Order, error) {
 	order, err := l.svcCtx.OrderModel.FindOne(l.ctx, orderId)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminRefundOrder, 查询订单失败 err: %v", err)
@@ -132,17 +133,18 @@ func (l *AdminRefundOrderLogic) handleWechatRefund(order *model.Order, req *type
 func (l *AdminRefundOrderLogic) createRefundRecordAndUpdateOrder(order *model.Order, req *types.AdminRefundOrderReq, refundNo, platformRefundId, orderStatus, refundStatus string) error {
 	return l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
 		// 创建退款记录
-		refund := &model.OrderRefund{
-			RefundNo:         refundNo,
-			PlatformRefundId: l.createNullString(platformRefundId),
-			OrderId:          order.Id,
-			UserId:           order.UserId,
-			ProductId:        order.ProductId,
-			RefundAmount:     req.RefundAmount,
-			RefundReason:     l.createNullString(req.RefundReason),
-			Status:           refundStatus, // 使用传入的状态，不再硬编码
-			RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
-		}
+    refund := &model.OrderRefund{
+        Id:               uuid.NewString(),
+        RefundNo:         refundNo,
+        PlatformRefundId: l.createNullString(platformRefundId),
+        OrderId:          order.Id,
+        UserId:           order.UserId,
+        ProductId:        order.ProductId,
+        RefundAmount:     req.RefundAmount,
+        RefundReason:     l.createNullString(req.RefundReason),
+        Status:           refundStatus, // 使用传入的状态，不再硬编码
+        RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
+    }

 		if _, err := l.svcCtx.OrderRefundModel.Insert(ctx, session, refund); err != nil {
 			return fmt.Errorf("创建退款记录失败: %v", err)
@@ -160,17 +162,18 @@ func (l *AdminRefundOrderLogic) createRefundRecordAndUpdateOrder(order *model.Or

 // createRefundRecordOnly 仅创建退款记录，不更新订单状态（用于退款失败的情况）
 func (l *AdminRefundOrderLogic) createRefundRecordOnly(order *model.Order, req *types.AdminRefundOrderReq, refundNo, platformRefundId, refundStatus string) error {
-	refund := &model.OrderRefund{
-		RefundNo:         refundNo,
-		PlatformRefundId: l.createNullString(platformRefundId),
-		OrderId:          order.Id,
-		UserId:           order.UserId,
-		ProductId:        order.ProductId,
-		RefundAmount:     req.RefundAmount,
-		RefundReason:     l.createNullString(req.RefundReason),
-		Status:           refundStatus,
-		RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
-	}
+    refund := &model.OrderRefund{
+        Id:               uuid.NewString(),
+        RefundNo:         refundNo,
+        PlatformRefundId: l.createNullString(platformRefundId),
+        OrderId:          order.Id,
+        UserId:           order.UserId,
+        ProductId:        order.ProductId,
+        RefundAmount:     req.RefundAmount,
+        RefundReason:     l.createNullString(req.RefundReason),
+        Status:           refundStatus,
+        RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
+    }

 	_, err := l.svcCtx.OrderRefundModel.Insert(l.ctx, nil, refund)
 	if err != nil {