S-VPN/server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(purchase): streamline error handling and improve JSON marshaling for temporary orders

Browse Source
This commit is contained in:
Chang lue Tsen
2025-09-06 11:03:14 -04:00
parent d477ba4772
commit d5ed82955e
5 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/logic/public/portal/purchaseCheckoutLogic.go
+1 -1
View File
@@ -337,7 +337,7 @@ func (l *PurchaseCheckoutLogic) balancePayment(u *user.User, o *order.Order) err
logger.Field("orderNo", o.OrderNo),
logger.Field("userId", u.Id),
)
err := l.svcCtx.OrderModel.UpdateOrderStatus(l.ctx, o.OrderNo, 2)
err = l.svcCtx.OrderModel.UpdateOrderStatus(l.ctx, o.OrderNo, 2)
if err != nil {
l.Errorw("[PurchaseCheckout] Update order status error",
logger.Field("error", err.Error()),
internal/logic/public/portal/purchaseLogic.go
+8 -7
View File
@@ -6,18 +6,17 @@ import (
"fmt"
"time"
"github.com/perfect-panel/server/pkg/payment"
"github.com/perfect-panel/server/pkg/constant"
"github.com/hibiken/asynq"
"github.com/perfect-panel/server/internal/model/order"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/constant"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/payment"
"github.com/perfect-panel/server/pkg/tool"
"github.com/perfect-panel/server/pkg/xerr"
queue "github.com/perfect-panel/server/queue/types"
"github.com/hibiken/asynq"
"github.com/pkg/errors"
"gorm.io/gorm"
)
@@ -137,13 +136,15 @@ func (l *PurchaseLogic) Purchase(req *types.PortalPurchaseRequest) (resp *types.
Password: req.Password,
InviteCode: req.InviteCode,
}
if _, err = l.svcCtx.Redis.Set(l.ctx, fmt.Sprintf(constant.TempOrderCacheKey, orderInfo.OrderNo), tempOrder.Marshal(), CloseOrderTimeMinutes*time.Minute).Result(); err != nil {
content, _ := tempOrder.Marshal()
if _, err = l.svcCtx.Redis.Set(l.ctx, fmt.Sprintf(constant.TempOrderCacheKey, orderInfo.OrderNo), string(content), CloseOrderTimeMinutes*time.Minute).Result(); err != nil {
l.Errorw("[Purchase] Redis set error", logger.Field("error", err.Error()), logger.Field("order_no", orderInfo.OrderNo))
return err
}
l.Infow("[Purchase] Guest order", logger.Field("order_no", orderInfo.OrderNo), logger.Field("identifier", req.Identifier))
// save guest order
if err := l.svcCtx.OrderModel.Insert(l.ctx, orderInfo, tx); err != nil {
if err = l.svcCtx.OrderModel.Insert(l.ctx, orderInfo, tx); err != nil {
return err
}
return nil
internal/logic/public/portal/queryPurchaseOrderLogic.go
+1 -1
View File
@@ -95,7 +95,7 @@ func (l *QueryPurchaseOrderLogic) handleTemporaryOrder(orderInfo *order.Order, r
}
// Validate user and email
if err := l.validateUserAndEmail(orderInfo, req.Identifier, req.Identifier); err != nil {
if err = l.validateUserAndEmail(orderInfo, req.AuthType, req.Identifier); err != nil {
return "", err
}