diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 7d973b2..f56c0e6 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -110,6 +110,7 @@ type GetcashReq struct { Openid string `json:"openid"` Nickname string `json:"nickname"` Headurl string `json:"headurl"` + Ver string `json:"ver"` } type GetcashData struct { @@ -314,6 +315,8 @@ type TixianDesc struct { Openid string `json:"openid"` Nickname string `json:"nickname"` Headurl string `json:"headurl"` + Editcoin int `json:"editcoin"` + Ver string `json:"ver"` } type AddCoinDesc struct { diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 756d032..e2f8bfe 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -921,8 +921,8 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in return resp.Data.Mycoin, nil } -func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, headurl string) (int, error) { - if goldnum == 0 || uuid == 0 || gameid == "" || channel == "" || openid == "" || nickname == "" || headurl == "" { +func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, headurl, ver string) (int, error) { + if goldnum == 0 || uuid == 0 || gameid == "" || channel == "" || openid == "" || nickname == "" || headurl == "" || ver == "" { logger.Error("GetCashFromSDK param empty") return 0, errors.New("param empty") } @@ -938,6 +938,8 @@ func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, he params.Openid = openid params.Nickname = nickname params.Typ = 6 + params.Ver = ver + params.Editcoin = 1 signtypestr := "sign_type=" + params.Sign_type timestampstr := "time_stamp=" + strconv.Itoa(int(time.Now().Unix())) paramgameid := "gameid=" + gameid @@ -948,6 +950,8 @@ func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, he popenid := "openid=" + openid pmoney := "money=" + strconv.Itoa(goldnum) ptype := "typ=" + "6" //微信 + ped := "editcoin=1" + pver := "ver=" + params.Ver paramlist = append(paramlist, signtypestr) paramlist = append(paramlist, timestampstr) paramlist = append(paramlist, paramgameid) @@ -958,6 +962,8 @@ func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, he paramlist = append(paramlist, popenid) paramlist = append(paramlist, pmoney) paramlist = append(paramlist, ptype) + paramlist = append(paramlist, ped) + paramlist = append(paramlist, pver) sumparam := GettotalParam(paramlist) //加serverkey diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index bc07cc1..958f696 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -102,6 +102,11 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { resp.Code = ERROR_JSONUNMASH_ERROR break } + //临时处理一下 + if rdata.Ver == "" { + rdata.Ver = "2.0.0" + } + uinfo, err := GetUserInfo(uuid) if err != nil || uinfo == nil { logger.Error("redis failed err=%v", err) @@ -119,7 +124,7 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { break } - _, err = GetCashFromSDK(uuid, drawnum, rdata.Gameid, rdata.Channel, rdata.Openid, rdata.Nickname, rdata.Headurl) + _, err = GetCashFromSDK(uuid, drawnum, rdata.Gameid, rdata.Channel, rdata.Openid, rdata.Nickname, rdata.Headurl, rdata.Ver) if err != nil { logger.Error("GetCashFromSDK failed err=%v", err) resp.Message = "从后台提现失败了" -- libgit2 0.21.0