1
This commit is contained in:
@@ -58,10 +58,11 @@ func AddUserWithdrawal(ctx *jxcontext.Context, param *model.AddWithdrawalRecordR
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 发起支付
|
// 发起支付
|
||||||
if err := SendPayInfo2Ali(payOrder, param); err != nil {
|
alipayOrder, err := SendPayInfo2Ali(payOrder, param)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := UpdateUserMoney(payOrder, userBill); err != nil {
|
if err := UpdateUserMoney(alipayOrder, userBill); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,7 +217,7 @@ func ManagerExamineWithdrawal(userId, orderId string, examineStatus int, phone,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 发起支付
|
// 发起支付
|
||||||
if err := SendPayInfo2Ali(order, &model.AddWithdrawalRecordReq{
|
alipayOrder, err := SendPayInfo2Ali(order, &model.AddWithdrawalRecordReq{
|
||||||
WithdrawalMoney: order.PayMoney,
|
WithdrawalMoney: order.PayMoney,
|
||||||
AlipayAccount: order.AlipayAccount,
|
AlipayAccount: order.AlipayAccount,
|
||||||
AlipayName: order.AlipayName,
|
AlipayName: order.AlipayName,
|
||||||
@@ -224,10 +225,11 @@ func ManagerExamineWithdrawal(userId, orderId string, examineStatus int, phone,
|
|||||||
Lat: order.Lat,
|
Lat: order.Lat,
|
||||||
CityCode: order.CityCode,
|
CityCode: order.CityCode,
|
||||||
DistrictCode: order.DistrictCode,
|
DistrictCode: order.DistrictCode,
|
||||||
}); err != nil {
|
})
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := UpdateUserMoney(order, userBill); err != nil {
|
if err := UpdateUserMoney(alipayOrder, userBill); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// SendPayInfo2Ali 发起支付
|
// SendPayInfo2Ali 发起支付
|
||||||
func SendPayInfo2Ali(payOrder *model.WithdrawalRecord, param *model.AddWithdrawalRecordReq) error {
|
func SendPayInfo2Ali(payOrder *model.WithdrawalRecord, param *model.AddWithdrawalRecordReq) (*model.WithdrawalRecord, error) {
|
||||||
if payOrder.WithdrawalMoney <= alipayapi.MinWithdrawalMoney {
|
if payOrder.WithdrawalMoney <= alipayapi.MinWithdrawalMoney {
|
||||||
aliResult, err := api.AliPayAPI.Withdrawal4AliPay(&alipayapi.WithdrawalParam{
|
aliResult, err := api.AliPayAPI.Withdrawal4AliPay(&alipayapi.WithdrawalParam{
|
||||||
OutBizNo: payOrder.OrderID,
|
OutBizNo: payOrder.OrderID,
|
||||||
@@ -30,7 +30,7 @@ func SendPayInfo2Ali(payOrder *model.WithdrawalRecord, param *model.AddWithdrawa
|
|||||||
payOrder.PayTime = utils.Str2Time(aliResult.TransDate)
|
payOrder.PayTime = utils.Str2Time(aliResult.TransDate)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return payOrder, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateUserMoney 修改数据库
|
// UpdateUserMoney 修改数据库
|
||||||
|
|||||||
Reference in New Issue
Block a user