From 30fb5f8e018c829df5e66ee94db4131fd2b3d484 Mon Sep 17 00:00:00 2001 From: mofangmin Date: Thu, 22 Aug 2024 11:11:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pay/eanipay/base.go | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/pay/eanipay/base.go b/modules/pay/eanipay/base.go index 5229633..ec532e8 100644 --- a/modules/pay/eanipay/base.go +++ b/modules/pay/eanipay/base.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "net/http" - "server/common" "server/modules/pay/base" "server/modules/pay/values" "server/pb" @@ -134,19 +133,15 @@ func (s *Sub) PackWithdrawReq() interface{} { Description: "BW", NotifyUrl: values.GetWithdrawCallback(values.EaniPay), } - if r.PayType == common.WithdrawTypeBank { - send.PayoutMethod.Type = "BANK_ACCOUNT" - send.PayoutMethod.Mode = "IMPS" - send.PayoutMethod.BankCode = r.PayCode - send.PayoutMethod.BankName = r.BankName - send.PayoutMethod.AccountNumber = r.CardNo - send.PayoutMethod.PayeeName = r.Name - send.PayoutMethod.PayeePhone = r.Phone - send.PayoutMethod.PayeeEmail = r.Email - send.PayoutMethod.PayeeAddress = r.Address - } else { - return nil - } + send.PayoutMethod.Type = "BANK_ACCOUNT" + send.PayoutMethod.Mode = "IMPS" + send.PayoutMethod.BankCode = r.PayCode + send.PayoutMethod.BankName = r.BankName + send.PayoutMethod.AccountNumber = r.CardNo + send.PayoutMethod.PayeeName = r.Name + send.PayoutMethod.PayeePhone = r.Phone + send.PayoutMethod.PayeeEmail = r.Email + send.PayoutMethod.PayeeAddress = r.Address s.Base.ReqData = send return send } From 0fab3bc3fb7bed30e59d039278cf43f5a696cd46 Mon Sep 17 00:00:00 2001 From: mofangmin Date: Thu, 22 Aug 2024 11:11:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- call/pay.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/call/pay.go b/call/pay.go index e6aa6a7..2067b0d 100644 --- a/call/pay.go +++ b/call/pay.go @@ -31,6 +31,9 @@ func GetRechargeInfo(uid int) *common.RechargeInfo { if !util.IsSameDayTimeStamp(now, info.LastRecharge) { info.DayRecharge = 0 } + if !util.IsSameDayTimeStamp(time.Now().Unix(), info.LastWithdraw) { + info.WithdrawCount = 0 + } return info }