Merge remote-tracking branch 'refs/remotes/origin/main'

Co-authored-by: daniel.w <daniel.w@intteam.net>
Reviewed-on: #2

internal/logic/orderservice/decimal_tools.go

@@ -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

internal/logic/orderservice/get_order_logic.go

@@ -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
 	}
 

internal/logic/orderservice/get_order_logic_test.go

@@ -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"
 )

internal/logic/orderservice/list_order_logic.go

@@ -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"

internal/logic/orderservice/modify_order_status_logic.go

@@ -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"