fix:订单优化
This commit is contained in:
parent
2e08e3db7b
commit
416b9d22d7
|
@ -345,7 +345,7 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic
|
|||
}, err
|
||||
}
|
||||
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 1)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 1)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "order invoice detail handler failed, err: %v", err)
|
||||
errorCode = *basic.CodeServiceErr
|
||||
|
@ -565,7 +565,7 @@ func (d *defaultOrder) Delete(ctx context.Context, in *DeleteReq) (res *DeleteRe
|
|||
logc.Errorf(ctx, "order delete failed, err: %v", err)
|
||||
return result.Error
|
||||
}
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 0)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 0)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "order delete failed DetailOrderDetailHandler,OrderSn:%s, err: %v", in.OrderSn, err)
|
||||
return err
|
||||
|
@ -692,7 +692,7 @@ func (d *defaultOrder) Close(ctx context.Context, in *CloseReq) (res *CloseRes,
|
|||
logc.Errorf(ctx, "order close failed, err: %v", err)
|
||||
return result.Error
|
||||
}
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 0)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 0)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "order close failed DetailOrderDetailHandler,OrderSn:%s, err: %v", in.OrderSn, err)
|
||||
return err
|
||||
|
@ -840,7 +840,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
|||
logc.Errorf(ctx, "PaymentSuccessful failed order Take, eventId:%s,err: %v", in.EventId, err)
|
||||
return err
|
||||
}
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 0)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 0)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "PaymentSuccessful failed DetailOrderDetailHandler,eventId:%s, err: %v", in.EventId, err)
|
||||
return err
|
||||
|
@ -1034,7 +1034,7 @@ func (d *defaultOrder) CreatePrePaymentByBalance(ctx context.Context, in *Create
|
|||
}, err
|
||||
}
|
||||
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 1)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 1)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "create prePayment balance failed DetailOrderDetailHandler, err: %v", err)
|
||||
errorCode = *basic.CodeServiceErr
|
||||
|
@ -1138,7 +1138,7 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create
|
|||
}, err
|
||||
}
|
||||
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 1)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 1)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "create prePayment deposit failed DetailOrderDetailHandler, err: %v", err)
|
||||
errorCode = *basic.CodeServiceErr
|
||||
|
@ -1296,7 +1296,7 @@ func (d *defaultOrder) List(ctx context.Context, in *ListReq) (res *ListRes, err
|
|||
return nil, result.Error
|
||||
}
|
||||
for _, order := range orderList {
|
||||
ress, err := d.OrderDetailHandler(ctx, &order, 1)
|
||||
ress, err := d.DetailHandler(ctx, &order, 1)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -1357,7 +1357,7 @@ func (d *defaultOrder) Detail(ctx context.Context, in *DetailReq) (res *DetailRe
|
|||
// }
|
||||
// }
|
||||
|
||||
ress, err := d.OrderDetailHandler(ctx, &orderInfo, 1)
|
||||
ress, err := d.DetailHandler(ctx, &orderInfo, 1)
|
||||
if err != nil {
|
||||
logc.Errorf(ctx, "order detail failed, err: %v", err)
|
||||
errorCode = *basic.CodeServiceErr
|
||||
|
@ -1673,7 +1673,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
|
|||
}
|
||||
|
||||
// 详情处理
|
||||
func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel.FsOrder, original int64) (res *DetailRes, err error) {
|
||||
func (d *defaultOrder) DetailHandler(ctx context.Context, orderInfo *gmodel.FsOrder, original int64) (res *DetailRes, err error) {
|
||||
|
||||
var orderAmount gmodel.OrderAmount
|
||||
err = json.Unmarshal(*orderInfo.OrderAmount, &orderAmount)
|
||||
|
|
Loading…
Reference in New Issue
Block a user