fix:支付
This commit is contained in:
parent
046c31c898
commit
bc4cf49b2d
|
@ -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))
|
amount := int64(ress.OrderDetailOriginal.OrderAmount.Deposit.PayAmount.Current.CurrentAmount.(float64) / float64(10))
|
||||||
payConfig := &pay.Config{}
|
payConfig := &pay.Config{}
|
||||||
|
@ -260,7 +245,24 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create
|
||||||
return &CreatePrePaymentByDepositRes{
|
return &CreatePrePaymentByDepositRes{
|
||||||
ErrorCode: errorCode,
|
ErrorCode: errorCode,
|
||||||
}, nil
|
}, 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{
|
return &CreatePrePaymentByDepositRes{
|
||||||
OrderDetail: ress.OrderDetail,
|
OrderDetail: ress.OrderDetail,
|
||||||
OrderPay: OrderPay{
|
OrderPay: OrderPay{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user