From 96b7aef02c9cd054a33a51fb443d9a704b54efe5 Mon Sep 17 00:00:00 2001
From: mofangmin <mofangmin@zh-games.com>
Date: Mon, 5 Aug 2024 20:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pay/base/signmd5.go | 3 +++
 modules/pay/gopay/base.go   | 2 +-
 modules/pay/gopay/values.go | 1 +
 modules/pay/mlpay/base.go   | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/pay/base/signmd5.go b/modules/pay/base/signmd5.go
index 82a5935..973987d 100644
--- a/modules/pay/base/signmd5.go
+++ b/modules/pay/base/signmd5.go
@@ -3,6 +3,8 @@ package base
 import (
 	"server/util"
 	"strings"
+
+	"github.com/liangdas/mqant/log"
 )
 
 func (b *Base) SignMD5(send interface{}) string {
@@ -16,5 +18,6 @@ func (b *Base) SignMD5(send interface{}) string {
 	if b.ShouldSignUpper {
 		ret = strings.ToUpper(ret)
 	}
+	log.Info("SignStr:%v,SignMD5:%v", signStr, ret)
 	return ret
 }
diff --git a/modules/pay/gopay/base.go b/modules/pay/gopay/base.go
index e0f97f9..7cb48e1 100644
--- a/modules/pay/gopay/base.go
+++ b/modules/pay/gopay/base.go
@@ -114,7 +114,7 @@ func (s *Sub) PackWithdrawReq() interface{} {
 func (s *Sub) CheckSign(str string) bool {
 	// str += "&key=" + key
 	checkSign := ""
-	s.Base.CallbackResp.Msg = "success"
+	s.Base.CallbackResp.Msg = "SUCCESS"
 	mySign := ""
 	if s.Base.Opt == 3 {
 		req := s.Base.CallbackReq.(*PayCallbackReq)
diff --git a/modules/pay/gopay/values.go b/modules/pay/gopay/values.go
index 45dc903..cececc8 100644
--- a/modules/pay/gopay/values.go
+++ b/modules/pay/gopay/values.go
@@ -87,5 +87,6 @@ type WithdrawCallbackReq struct {
 		Fee      string `json:"fee"`      // 手续费
 		Currency string `json:"currency"` // 货币类型
 		Sign     string `json:"sign"`     // 签名值，详情见1 签名说明
+		Utr      string `json:"utr"`
 	} `json:"data"` // 数据字段
 }
diff --git a/modules/pay/mlpay/base.go b/modules/pay/mlpay/base.go
index d59e93e..91d0adf 100644
--- a/modules/pay/mlpay/base.go
+++ b/modules/pay/mlpay/base.go
@@ -88,6 +88,9 @@ func (s *Sub) GetResp() (proto.Message, error) {
 
 func (s *Sub) PackPayReq() interface{} {
 	r := s.Base.PayReq
+	if len(r.Phone) == 12 {
+		r.Phone = r.Phone[2:]
+	}
 	userDataStr, _ := json.Marshal(UserData{UserName: r.Name, UserEmail: r.Email, UserPhone: r.Phone})
 	send := &PayReq{
 		PartnerID:      PartnerId,