diff --git a/app/order/api/internal/logic/order/createOrderLogic.go b/app/order/api/internal/logic/order/createOrderLogic.go index f3e7282..a7489cc 100644 --- a/app/order/api/internal/logic/order/createOrderLogic.go +++ b/app/order/api/internal/logic/order/createOrderLogic.go @@ -83,7 +83,6 @@ func (l *CreateOrderLogic) CreateOrder(req *types.CreateOrderReq) (resp *types.C return nil, err } - orderID := time.Now().UnixNano() consumerName := strconv.FormatInt(consumerID, 10) playerName := strconv.FormatInt(playerID, 10) shopName := "" @@ -94,7 +93,6 @@ func (l *CreateOrderLogic) CreateOrder(req *types.CreateOrderReq) (resp *types.C status := "pending_payment" addReq := &orderservice.AddOrdersReq{ - Id: orderID, ConsumerId: consumerID, ConsumerName: consumerName, PlayerId: playerID, @@ -113,11 +111,12 @@ func (l *CreateOrderLogic) CreateOrder(req *types.CreateOrderReq) (resp *types.C addReq.Note = &req.Note } - if _, err = l.svcCtx.OrderRpc.AddOrders(l.ctx, addReq); err != nil { + addResp, err := l.svcCtx.OrderRpc.AddOrders(l.ctx, addReq) + if err != nil { return nil, err } - created, err := l.svcCtx.OrderRpc.GetOrdersById(l.ctx, &orderservice.GetOrdersByIdReq{Id: orderID}) + created, err := l.svcCtx.OrderRpc.GetOrdersById(l.ctx, &orderservice.GetOrdersByIdReq{Id: addResp.Id}) if err != nil { return nil, err } diff --git a/app/order/api/internal/logic/order/helpers.go b/app/order/api/internal/logic/order/helpers.go index e567430..804ca4a 100644 --- a/app/order/api/internal/logic/order/helpers.go +++ b/app/order/api/internal/logic/order/helpers.go @@ -97,7 +97,6 @@ func transitionOrderStatus(ctx context.Context, svcCtx *svc.ServiceContext, orde actorRole = "user" } _, err = svcCtx.OrderRpc.AddOrderStateLogs(ctx, &orderservice.AddOrderStateLogsReq{ - Id: time.Now().UnixNano(), OrderId: orderID, FromStatus: &fromStatus, ToStatus: toStatus, diff --git a/app/order/api/internal/logic/order/reorderLogic.go b/app/order/api/internal/logic/order/reorderLogic.go index 046186a..01b913b 100644 --- a/app/order/api/internal/logic/order/reorderLogic.go +++ b/app/order/api/internal/logic/order/reorderLogic.go @@ -40,13 +40,11 @@ func (l *ReorderLogic) Reorder(req *types.PathId) (resp *types.CreateOrderResp, return nil, nil } - newID := time.Now().UnixNano() now := time.Now().Unix() status := "pending_payment" searchText := oldOrder.GetSearchText() addReq := &orderservice.AddOrdersReq{ - Id: newID, ConsumerId: oldOrder.GetConsumerId(), ConsumerName: oldOrder.GetConsumerName(), PlayerId: oldOrder.GetPlayerId(), @@ -68,11 +66,12 @@ func (l *ReorderLogic) Reorder(req *types.PathId) (resp *types.CreateOrderResp, addReq.Note = oldOrder.Note } - if _, err = l.svcCtx.OrderRpc.AddOrders(l.ctx, addReq); err != nil { + addResp, err := l.svcCtx.OrderRpc.AddOrders(l.ctx, addReq) + if err != nil { return nil, err } - created, err := l.svcCtx.OrderRpc.GetOrdersById(l.ctx, &orderservice.GetOrdersByIdReq{Id: newID}) + created, err := l.svcCtx.OrderRpc.GetOrdersById(l.ctx, &orderservice.GetOrdersByIdReq{Id: addResp.Id}) if err != nil { return nil, err } diff --git a/app/order/rpc/internal/logic/addOrderStateLogsLogic.go b/app/order/rpc/internal/logic/addOrderStateLogsLogic.go index 413dd0c..c4f0ba4 100644 --- a/app/order/rpc/internal/logic/addOrderStateLogsLogic.go +++ b/app/order/rpc/internal/logic/addOrderStateLogsLogic.go @@ -7,6 +7,7 @@ import ( "juwan-backend/app/order/rpc/internal/svc" "juwan-backend/app/order/rpc/pb" + "juwan-backend/app/snowflake/rpc/snowflake" "github.com/zeromicro/go-zero/core/logx" ) @@ -31,8 +32,13 @@ func (l *AddOrderStateLogsLogic) AddOrderStateLogs(in *pb.AddOrderStateLogsReq) return nil, errors.New("order state log is required") } + idResp, err := l.svcCtx.Snowflake.NextId(l.ctx, &snowflake.NextIdReq{}) + if err != nil { + return nil, err + } + builder := l.svcCtx.OrderModelsRW.OrderStateLogs.Create(). - SetID(in.Id). + SetID(idResp.Id). SetOrderID(in.OrderId). SetToStatus(in.ToStatus). SetAction(in.Action). diff --git a/app/order/rpc/internal/logic/addOrdersLogic.go b/app/order/rpc/internal/logic/addOrdersLogic.go index d62190f..2dcaf5b 100644 --- a/app/order/rpc/internal/logic/addOrdersLogic.go +++ b/app/order/rpc/internal/logic/addOrdersLogic.go @@ -30,14 +30,11 @@ func NewAddOrdersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddOrde // -----------------------orders----------------------- func (l *AddOrdersLogic) AddOrders(in *pb.AddOrdersReq) (*pb.AddOrdersResp, error) { - orderID := in.Id - if orderID <= 0 { - idResp, err := l.svcCtx.Snowflake.NextId(l.ctx, &snowflake.NextIdReq{}) - if err != nil { - return nil, err - } - orderID = idResp.Id + idResp, err := l.svcCtx.Snowflake.NextId(l.ctx, &snowflake.NextIdReq{}) + if err != nil { + return nil, err } + orderID := idResp.Id totalPrice, err := parseDecimal(in.GetTotalPrice()) if err != nil || totalPrice.Cmp(decimal.Zero) <= 0 { @@ -101,5 +98,5 @@ func (l *AddOrdersLogic) AddOrders(in *pb.AddOrdersReq) (*pb.AddOrdersResp, erro return nil, err } - return &pb.AddOrdersResp{}, nil + return &pb.AddOrdersResp{Id: orderID}, nil } diff --git a/app/order/rpc/internal/server/orderServiceServer.go b/app/order/rpc/internal/server/orderServiceServer.go index bf8116e..d7b236a 100644 --- a/app/order/rpc/internal/server/orderServiceServer.go +++ b/app/order/rpc/internal/server/orderServiceServer.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// goctl 1.9.2 +// goctl 1.10.1 // Source: order.proto package server diff --git a/app/order/rpc/orderservice/orderService.go b/app/order/rpc/orderservice/orderService.go index 969c7fa..444447e 100644 --- a/app/order/rpc/orderservice/orderService.go +++ b/app/order/rpc/orderservice/orderService.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// goctl 1.9.2 +// goctl 1.10.1 // Source: order.proto package orderservice diff --git a/app/order/rpc/pb/order.pb.go b/app/order/rpc/pb/order.pb.go index 00004c9..7cada46 100644 --- a/app/order/rpc/pb/order.pb.go +++ b/app/order/rpc/pb/order.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v5.29.6 +// protoc v6.33.5 // source: order.proto package pb @@ -416,6 +416,7 @@ func (x *AddOrdersReq) GetUpdatedAt() int64 { type AddOrdersResp struct { state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -450,6 +451,13 @@ func (*AddOrdersResp) Descriptor() ([]byte, []int) { return file_order_proto_rawDescGZIP(), []int{2} } +func (x *AddOrdersResp) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + type UpdateOrdersReq struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id @@ -1932,8 +1940,9 @@ const file_order_proto_rawDesc = "" + "\f_completedAtB\x0e\n" + "\f_cancelledAtB\f\n" + "\n" + - "_updatedAt\"\x0f\n" + - "\rAddOrdersResp\"\xd3\a\n" + + "_updatedAt\"\x1f\n" + + "\rAddOrdersResp\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"\xd3\a\n" + "\x0fUpdateOrdersReq\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12#\n" + "\n" + diff --git a/app/order/rpc/pb/order_grpc.pb.go b/app/order/rpc/pb/order_grpc.pb.go index 6a34302..9a009b5 100644 --- a/app/order/rpc/pb/order_grpc.pb.go +++ b/app/order/rpc/pb/order_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.6.1 -// - protoc v5.29.6 +// - protoc v6.33.5 // source: order.proto package pb diff --git a/desc/rpc/order.proto b/desc/rpc/order.proto index 0057e03..70cf17f 100644 --- a/desc/rpc/order.proto +++ b/desc/rpc/order.proto @@ -56,6 +56,7 @@ message AddOrdersReq { } message AddOrdersResp { + int64 id = 1; //id } message UpdateOrdersReq {