From 9ecc91077b953309f6a2906cbdbf35ba671eacba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 12 Jul 2022 14:29:46 +0800 Subject: [PATCH] 1 --- business/q_bida/withdrawal_record.go | 12 +++++++----- business/q_bida/withdrawal_record_utils.go | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/business/q_bida/withdrawal_record.go b/business/q_bida/withdrawal_record.go index 63eb6d686..e09d0213c 100644 --- a/business/q_bida/withdrawal_record.go +++ b/business/q_bida/withdrawal_record.go @@ -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 } - if err := UpdateUserMoney(payOrder, userBill); err != nil { + if err := UpdateUserMoney(alipayOrder, userBill); err != nil { 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, AlipayAccount: order.AlipayAccount, AlipayName: order.AlipayName, @@ -224,10 +225,11 @@ func ManagerExamineWithdrawal(userId, orderId string, examineStatus int, phone, Lat: order.Lat, CityCode: order.CityCode, DistrictCode: order.DistrictCode, - }); err != nil { + }) + if err != nil { return err } - if err := UpdateUserMoney(order, userBill); err != nil { + if err := UpdateUserMoney(alipayOrder, userBill); err != nil { return err } return nil diff --git a/business/q_bida/withdrawal_record_utils.go b/business/q_bida/withdrawal_record_utils.go index daf96aa3f..6ba7de1a9 100644 --- a/business/q_bida/withdrawal_record_utils.go +++ b/business/q_bida/withdrawal_record_utils.go @@ -9,7 +9,7 @@ import ( ) // 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 { aliResult, err := api.AliPayAPI.Withdrawal4AliPay(&alipayapi.WithdrawalParam{ OutBizNo: payOrder.OrderID, @@ -30,7 +30,7 @@ func SendPayInfo2Ali(payOrder *model.WithdrawalRecord, param *model.AddWithdrawa payOrder.PayTime = utils.Str2Time(aliResult.TransDate) } } - return nil + return payOrder, nil } // UpdateUserMoney 修改数据库