diff --git a/service/repositories/order.go b/service/repositories/order.go index 976f5c2d..13e5e0db 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -223,21 +223,6 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create } } } - if len(uOrderDetail) > 0 { - err = fssql.MetadataOrderPATCH(d.MysqlConn, sql, in.OrderSn, gmodel.FsOrder{}, uOrderDetail, "id = ?", order.Id) - if err != nil { - errorCode = *basic.CodeServiceErr - logx.Errorf("create prePayment deposit failed MetadataOrderPATCH, err: %v", err) - return &CreatePrePaymentByDepositRes{ - ErrorCode: errorCode, - }, result.Error - } - } - - ress.OrderDetail.OrderInfo.Utime = &ntime - ress.OrderDetail.OrderInfo.DeliveryMethod = in.DeliveryMethod - ress.OrderDetail.DeliveryAddress = orderAddress - // 支付初始化 amount := int64(ress.OrderDetailOriginal.OrderAmount.Deposit.PayAmount.Current.CurrentAmount.(float64) / float64(10)) payConfig := &pay.Config{} @@ -260,7 +245,24 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create return &CreatePrePaymentByDepositRes{ ErrorCode: errorCode, }, nil + } else { + //uOrderDetail["order_amount"] = map[type]type } + if len(uOrderDetail) > 0 { + err = fssql.MetadataOrderPATCH(d.MysqlConn, sql, in.OrderSn, gmodel.FsOrder{}, uOrderDetail, "id = ?", order.Id) + if err != nil { + errorCode = *basic.CodeServiceErr + logx.Errorf("create prePayment deposit failed MetadataOrderPATCH, err: %v", err) + return &CreatePrePaymentByDepositRes{ + ErrorCode: errorCode, + }, result.Error + } + } + + ress.OrderDetail.OrderInfo.Utime = &ntime + ress.OrderDetail.OrderInfo.DeliveryMethod = in.DeliveryMethod + ress.OrderDetail.DeliveryAddress = orderAddress + return &CreatePrePaymentByDepositRes{ OrderDetail: ress.OrderDetail, OrderPay: OrderPay{