This commit is contained in:
daniel.w 2024-10-23 17:57:16 +08:00
parent 8b76f7cd1e
commit 8a2fe1f465
5 changed files with 12 additions and 14 deletions

View File

@ -14,6 +14,7 @@ func decimalPtrFromString(val string) *decimal.Decimal {
dec, err := decimal.NewFromString(val)
if err != nil {
logx.Errorf("Failed to convert string to decimal: %v", err)
return nil
}
@ -28,6 +29,7 @@ func convertDecimalPtrToDecimal128(d *decimal.Decimal) *primitive.Decimal128 {
result, err := primitive.ParseDecimal128(d.String())
if err != nil {
logx.Errorf("Failed to convert decimal to Decimal128: %v", err)
return nil
}
@ -39,6 +41,7 @@ func convertDecimalToDecimal128(d decimal.Decimal) primitive.Decimal128 {
result, err := primitive.ParseDecimal128(d.String())
if err != nil {
logx.Errorf("Failed to convert decimal to Decimal128: %v", err)
return primitive.NewDecimal128(0, 0)
}
@ -72,16 +75,6 @@ func optionalInt64(i *int64) *int64 {
return nil
}
func optionalDecimalToString(d *decimal.Decimal) *string {
if d != nil {
s := d.String()
return &s
}
return nil
}
func nilString(s *string) *string {
if s == nil {
return nil

View File

@ -4,9 +4,10 @@ import (
"app-cloudep-order-server/gen_result/pb/order"
"app-cloudep-order-server/internal/domain"
"app-cloudep-order-server/internal/svc"
ers "code.30cm.net/digimon/library-go/errs"
"context"
"errors"
ers "code.30cm.net/digimon/library-go/errs"
"github.com/zeromicro/go-zero/core/stores/mon"
"github.com/zeromicro/go-zero/core/logx"
@ -43,9 +44,10 @@ func (l *GetOrderLogic) GetOrder(in *order.GetOrderReq) (*order.GetOrderResp, er
o, err := l.svcCtx.OrderModel.FindOneBusinessID(l.ctx, in.GetBusinessId())
if err != nil {
if errors.As(err, &mon.ErrNotFound) {
if errors.Is(mon.ErrNotFound, err) {
return nil, domain.NotFoundError(domain.DataNotFoundErrorCode, "failed to get this order id:", in.GetBusinessId())
}
return nil, err
}

View File

@ -8,9 +8,10 @@ import (
"app-cloudep-order-server/internal/svc"
"context"
"errors"
"go.mongodb.org/mongo-driver/bson/primitive"
"testing"
"go.mongodb.org/mongo-driver/bson/primitive"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)

View File

@ -6,6 +6,7 @@ import (
"context"
"app-cloudep-order-server/internal/svc"
ers "code.30cm.net/digimon/library-go/errs"
"github.com/zeromicro/go-zero/core/logx"

View File

@ -4,9 +4,10 @@ import (
"app-cloudep-order-server/gen_result/pb/order"
"app-cloudep-order-server/internal/domain"
model "app-cloudep-order-server/internal/model/mongo"
ers "code.30cm.net/digimon/library-go/errs"
"context"
ers "code.30cm.net/digimon/library-go/errs"
"app-cloudep-order-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx"