From 798be672bc09689b31c1401bc8e18403056a7a4a Mon Sep 17 00:00:00 2001 From: Rogee Date: Tue, 30 Dec 2025 23:31:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8switch=E8=AF=AD=E5=8F=A5=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/services/order.go | 21 +++++++++++++++++---- backend/app/services/wallet.go | 11 ++++++++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/backend/app/services/order.go b/backend/app/services/order.go index e47bb53..26a14b7 100644 --- a/backend/app/services/order.go +++ b/backend/app/services/order.go @@ -70,7 +70,11 @@ func (s *order) GetUserOrder(ctx context.Context, userID int64, id string) (*use return &dto, nil } -func (s *order) Create(ctx context.Context, userID int64, form *transaction_dto.OrderCreateForm) (*transaction_dto.OrderCreateResponse, error) { +func (s *order) Create( + ctx context.Context, + userID int64, + form *transaction_dto.OrderCreateForm, +) (*transaction_dto.OrderCreateResponse, error) { if userID == 0 { return nil, errorx.ErrUnauthorized } @@ -166,7 +170,12 @@ func (s *order) Create(ctx context.Context, userID int64, form *transaction_dto. }, nil } -func (s *order) Pay(ctx context.Context, userID int64, id string, form *transaction_dto.OrderPayForm) (*transaction_dto.OrderPayResponse, error) { +func (s *order) Pay( + ctx context.Context, + userID int64, + id string, + form *transaction_dto.OrderPayForm, +) (*transaction_dto.OrderPayResponse, error) { if userID == 0 { return nil, errorx.ErrUnauthorized } @@ -174,7 +183,9 @@ func (s *order) Pay(ctx context.Context, userID int64, id string, form *transact oid := cast.ToInt64(id) // Fetch Order - o, err := models.OrderQuery.WithContext(ctx).Where(models.OrderQuery.ID.Eq(oid), models.OrderQuery.UserID.Eq(uid)).First() + o, err := models.OrderQuery.WithContext(ctx). + Where(models.OrderQuery.ID.Eq(oid), models.OrderQuery.UserID.Eq(uid)). + First() if err != nil { return nil, errorx.ErrRecordNotFound } @@ -253,7 +264,9 @@ func (s *order) settleOrder(ctx context.Context, o *models.Order, method, extern items, _ := tx.OrderItem.WithContext(ctx).Where(tx.OrderItem.OrderID.Eq(o.ID)).Find() for _, item := range items { // Check if access already exists (idempotency) - exists, _ := tx.ContentAccess.WithContext(ctx).Where(tx.ContentAccess.UserID.Eq(o.UserID), tx.ContentAccess.ContentID.Eq(item.ContentID)).Exists() + exists, _ := tx.ContentAccess.WithContext(ctx). + Where(tx.ContentAccess.UserID.Eq(o.UserID), tx.ContentAccess.ContentID.Eq(item.ContentID)). + Exists() if exists { continue } diff --git a/backend/app/services/wallet.go b/backend/app/services/wallet.go index 36fa978..f4cdc30 100644 --- a/backend/app/services/wallet.go +++ b/backend/app/services/wallet.go @@ -45,10 +45,11 @@ func (s *wallet) GetWallet(ctx context.Context, userID int64) (*user_dto.WalletR for _, o := range orders { var txType string var title string - if o.Type == consts.OrderTypeContentPurchase { + switch o.Type { + case consts.OrderTypeContentPurchase: txType = "expense" title = "购买内容" - } else if o.Type == consts.OrderTypeRecharge { + case consts.OrderTypeRecharge: txType = "income" title = "钱包充值" } @@ -68,7 +69,11 @@ func (s *wallet) GetWallet(ctx context.Context, userID int64) (*user_dto.WalletR }, nil } -func (s *wallet) Recharge(ctx context.Context, userID int64, form *user_dto.RechargeForm) (*user_dto.RechargeResponse, error) { +func (s *wallet) Recharge( + ctx context.Context, + userID int64, + form *user_dto.RechargeForm, +) (*user_dto.RechargeResponse, error) { amount := int64(form.Amount * 100) if amount <= 0 { return nil, errorx.ErrBadRequest.WithMsg("金额无效")