fix: use snowflake for all order and state log ID generation
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user