Merge branch 'fix/release' into dev

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
 }
 

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.Type = "BANK_ACCOUNT"
+	send.PayoutMethod.Mode = "IMPS"
-		send.PayoutMethod.Mode = "IMPS"
+	send.PayoutMethod.BankCode = r.PayCode
-		send.PayoutMethod.BankCode = r.PayCode
+	send.PayoutMethod.BankName = r.BankName
-		send.PayoutMethod.BankName = r.BankName
+	send.PayoutMethod.AccountNumber = r.CardNo
-		send.PayoutMethod.AccountNumber = r.CardNo
+	send.PayoutMethod.PayeeName = r.Name
-		send.PayoutMethod.PayeeName = r.Name
+	send.PayoutMethod.PayeePhone = r.Phone
-		send.PayoutMethod.PayeePhone = r.Phone
+	send.PayoutMethod.PayeeEmail = r.Email
-		send.PayoutMethod.PayeeEmail = r.Email
+	send.PayoutMethod.PayeeAddress = r.Address
-		send.PayoutMethod.PayeeAddress = r.Address
-	} else {
-		return nil
-	}
 	s.Base.ReqData = send
 	return send
 }