From 5d31dedad5c14c83f041cac074a25cef510ec78f Mon Sep 17 00:00:00 2001 From: 陆恒 Date: Mon, 3 Aug 2020 14:52:55 +0800 Subject: [PATCH] 提交 --- src/HttpServer/jsonconf/AchievementConfig.json | 30 +++++++++++++++--------------- src/HttpServer/jsonconf/LuckyBagConfig.json | 14 +++++++------- src/HttpServer/jsonconf/RedPackageConfig.json | 50 +++++++++++++++++++++++++------------------------- src/HttpServer/jsonconf/RmbConfig.json | 42 ++++++++++++------------------------------ src/HttpServer/jsonconf/TaskConfig.json | 26 +++++++++++++------------- src/HttpServer/jsonconf/TurntableConfig.json | 10 +++++----- src/HttpServer/logic/function.go | 36 ++++++++++++++++++++++++++---------- src/HttpServer/logic/httpserver.go | 2 +- src/HttpServer/logic/logic.go | 20 ++++++++++---------- 9 files changed, 114 insertions(+), 116 deletions(-) diff --git a/src/HttpServer/jsonconf/AchievementConfig.json b/src/HttpServer/jsonconf/AchievementConfig.json index 569c29d..abb7056 100644 --- a/src/HttpServer/jsonconf/AchievementConfig.json +++ b/src/HttpServer/jsonconf/AchievementConfig.json @@ -4,7 +4,7 @@ "id": 1, "desc": "累计消除分数达到10000分", "aim": 10000, - "coin": 100, + "coin": 10000, "is_video": 0 }, { @@ -12,7 +12,7 @@ "id": 2, "desc": "累计消除分数达到20000分", "aim": 20000, - "coin": 150, + "coin": 5000, "is_video": 0 }, { @@ -20,7 +20,7 @@ "id": 3, "desc": "累计消除分数达到30000分", "aim": 30000, - "coin": 200, + "coin": 400, "is_video": 1 }, { @@ -100,7 +100,7 @@ "id": 13, "desc": "累计登录4天", "aim": 4, - "coin": 100, + "coin": 10000, "is_video": 0 }, { @@ -108,7 +108,7 @@ "id": 14, "desc": "累计登录6天", "aim": 6, - "coin": 200, + "coin": 8000, "is_video": 0 }, { @@ -116,7 +116,7 @@ "id": 15, "desc": "累计登录8天", "aim": 8, - "coin": 300, + "coin": 6000, "is_video": 1 }, { @@ -164,7 +164,7 @@ "id": 21, "desc": "累计观看视频40次", "aim": 40, - "coin": 100, + "coin": 10000, "is_video": 0 }, { @@ -172,7 +172,7 @@ "id": 22, "desc": "累计观看视频80次", "aim": 80, - "coin": 150, + "coin":8000, "is_video": 0 }, { @@ -180,7 +180,7 @@ "id": 23, "desc": "累计观看视频120次", "aim": 120, - "coin": 200, + "coin": 6000, "is_video": 0 }, { @@ -244,7 +244,7 @@ "id": 31, "desc": "累计消除400行", "aim": 400, - "coin": 100, + "coin": 10000, "is_video": 0 }, { @@ -252,7 +252,7 @@ "id": 32, "desc": "累计消除800行", "aim": 800, - "coin": 100, + "coin": 8000, "is_video": 0 }, { @@ -260,7 +260,7 @@ "id": 33, "desc": "累计消除1600行", "aim": 1600, - "coin": 200, + "coin": 5000, "is_video": 0 }, { @@ -324,7 +324,7 @@ "id": 41, "desc": "累计消除200列", "aim": 200, - "coin": 100, + "coin": 10000, "is_video": 0 }, { @@ -332,7 +332,7 @@ "id": 42, "desc": "累计消除400列", "aim": 400, - "coin": 100, + "coin": 8000, "is_video": 0 }, { @@ -340,7 +340,7 @@ "id": 43, "desc": "累计消除800列", "aim": 800, - "coin": 200, + "coin": 5000, "is_video": 0 }, { diff --git a/src/HttpServer/jsonconf/LuckyBagConfig.json b/src/HttpServer/jsonconf/LuckyBagConfig.json index 113f554..866543d 100644 --- a/src/HttpServer/jsonconf/LuckyBagConfig.json +++ b/src/HttpServer/jsonconf/LuckyBagConfig.json @@ -1,37 +1,37 @@ [ { "id": 1, - "coin": 88, + "coin": 8800, "rate": 5 }, { "id": 2, - "coin": 108, + "coin": 10800, "rate": 15 }, { "id": 3, - "coin": 148, + "coin": 14800, "rate": 25 }, { "id": 4, - "coin": 168, + "coin": 16800, "rate": 25 }, { "id": 5, - "coin": 188, + "coin": 18800, "rate": 15 }, { "id": 6, - "coin": 228, + "coin": 19800, "rate": 10 }, { "id": 7, - "coin": 268, + "coin": 26800, "rate": 5 } ] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/RedPackageConfig.json b/src/HttpServer/jsonconf/RedPackageConfig.json index 4526795..e9b03ec 100644 --- a/src/HttpServer/jsonconf/RedPackageConfig.json +++ b/src/HttpServer/jsonconf/RedPackageConfig.json @@ -2,151 +2,151 @@ { "id": 1, "point": 200, - "free_coin": 60, + "free_coin": 11000, "video_coin": 150 }, { "id": 2, "point": 500, - "free_coin": 60, + "free_coin": 6000, "video_coin": 150 }, { "id": 3, "point": 800, - "free_coin": 50, + "free_coin": 5000, "video_coin": 150 }, { "id": 4, "point": 1200, - "free_coin": 50, + "free_coin": 5000, "video_coin": 150 }, { "id": 5, "point": 1600, - "free_coin": 40, + "free_coin": 4000, "video_coin": 150 }, { "id": 6, "point": 2000, - "free_coin": 40, + "free_coin": 4000, "video_coin": 150 }, { "id": 7, "point": 2400, - "free_coin": 40, + "free_coin": 4000, "video_coin": 150 }, { "id": 8, "point": 2800, - "free_coin": 40, + "free_coin": 4000, "video_coin": 150 }, { "id": 9, "point": 3200, - "free_coin": 35, + "free_coin": 3500, "video_coin": 150 }, { "id": 10, "point": 3600, - "free_coin": 35, + "free_coin": 3500, "video_coin": 150 }, { "id": 11, "point": 3800, - "free_coin": 30, + "free_coin": 3000, "video_coin": 150 }, { "id": 12, "point": 4000, - "free_coin": 30, + "free_coin": 3000, "video_coin": 150 }, { "id": 13, "point": 4200, - "free_coin": 30, + "free_coin": 3000, "video_coin": 150 }, { "id": 14, "point": 4400, - "free_coin": 25, + "free_coin": 2500, "video_coin": 150 }, { "id": 15, "point": 4600, - "free_coin": 25, + "free_coin": 2500, "video_coin": 150 }, { "id": 16, "point": 4800, - "free_coin": 25, + "free_coin": 2500, "video_coin": 150 }, { "id": 17, "point": 5000, - "free_coin": 25, + "free_coin": 2500, "video_coin": 150 }, { "id": 18, "point": 5200, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 19, "point": 5400, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 20, "point": 5600, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 21, "point": 5800, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 22, "point": 6000, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 23, "point": 6200, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 24, "point": 6400, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 }, { "id": 25, "point": 6600, - "free_coin": 20, + "free_coin": 2000, "video_coin": 150 } ] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/RmbConfig.json b/src/HttpServer/jsonconf/RmbConfig.json index 396fc92..fbe841b 100644 --- a/src/HttpServer/jsonconf/RmbConfig.json +++ b/src/HttpServer/jsonconf/RmbConfig.json @@ -1,56 +1,38 @@ [ { "id": 1, - "rmb_num": 0.5, + "rmb_num": 0.3, "time": 1, - "login_day": 2 + "login_day": 1 }, { "id": 2, - "rmb_num": 1, + "rmb_num": 100, "time": 1, - "login_day": 5 + "login_day": 7 }, { "id": 3, - "rmb_num": 1.5, + "rmb_num": 200, "time": 1, - "login_day": 7 + "login_day": 14 }, { "id": 4, - "rmb_num": 2, + "rmb_num": 300, "time": 1, - "login_day": 10 + "login_day": 20 }, { "id": 5, - "rmb_num": 3, + "rmb_num": 400, "time": 1, - "login_day": 15 + "login_day": 30 }, { "id": 6, - "rmb_num": 10, - "time": 1, - "login_day": 20 - }, - { - "id": 7, - "rmb_num": 20, + "rmb_num": 500, "time": 1, - "login_day": 25 - }, - { - "id": 8, - "rmb_num": 30, - "time": 1, - "login_day": 30 - }, - { - "id": 9, - "rmb_num": 100, - "time": 999, - "login_day": 1 + "login_day": 45 } ] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/TaskConfig.json b/src/HttpServer/jsonconf/TaskConfig.json index 0cbca3d..2972382 100644 --- a/src/HttpServer/jsonconf/TaskConfig.json +++ b/src/HttpServer/jsonconf/TaskConfig.json @@ -5,7 +5,7 @@ "day_type": 1, "aims": 5, "active": 5, - "coin": 10, + "coin": 3000, "desc": "在线5min" }, { @@ -14,7 +14,7 @@ "day_type": 1, "aims": 30, "active": 10, - "coin": 40, + "coin": 8000, "desc": "在线30mins" }, { @@ -23,7 +23,7 @@ "day_type": 2, "aims": 5, "active": 5, - "coin": 30, + "coin": 3000, "desc": "游戏中消耗5次体力" }, { @@ -32,7 +32,7 @@ "day_type": 3, "aims": 1, "active": 10, - "coin": 30, + "coin": 5000, "desc": "单局成绩超过2000分" }, { @@ -41,7 +41,7 @@ "day_type": 4, "aims": 5, "active": 20, - "coin": 50, + "coin": 5000, "desc": "观看满5次视频" }, { @@ -50,7 +50,7 @@ "day_type": 5, "aims": 5, "active": 20, - "coin": 40, + "coin": 3000, "desc": "进行转盘抽奖5次" }, { @@ -59,7 +59,7 @@ "day_type": 6, "aims": 3, "active": 30, - "coin": 60, + "coin": 1000, "desc": "开福袋3次" }, { @@ -68,7 +68,7 @@ "day_type": 7, "aims": 1, "active": 15, - "coin": 30, + "coin": 3000, "desc": "放飞火箭1次" }, { @@ -77,7 +77,7 @@ "day_type": 8, "aims": 2, "active": 20, - "coin": 50, + "coin": 3000, "desc": "游戏内重生2次" }, { @@ -86,7 +86,7 @@ "day_type": 9, "aims": 5, "active": 15, - "coin": 50, + "coin": 5000, "desc": "游戏中使用5次道具" }, { @@ -95,7 +95,7 @@ "day_type": 0, "aims": 0, "active": 30, - "coin": 150, + "coin": 1500, "desc": "" }, { @@ -104,7 +104,7 @@ "day_type": 0, "aims": 0, "active": 80, - "coin": 400, + "coin": 4000, "desc": "" }, { @@ -113,7 +113,7 @@ "day_type": 0, "aims": 0, "active": 150, - "coin": 600, + "coin": 4000, "desc": "" } ] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/TurntableConfig.json b/src/HttpServer/jsonconf/TurntableConfig.json index 5605956..f8f7d4e 100644 --- a/src/HttpServer/jsonconf/TurntableConfig.json +++ b/src/HttpServer/jsonconf/TurntableConfig.json @@ -3,35 +3,35 @@ "id": 1, "name": "金币", "type": 101, - "desc": 100, + "desc": 1000, "rate": 10 }, { "id": 2, "name": "金币", "type": 101, - "desc": 120, + "desc": 1200, "rate": 10 }, { "id": 3, "name": "金币", "type": 101, - "desc": 130, + "desc": 1300, "rate": 20 }, { "id": 4, "name": "金币", "type": 101, - "desc": 150, + "desc": 1500, "rate": 20 }, { "id": 5, "name": "金币", "type": 101, - "desc": 180, + "desc": 1800, "rate": 4 }, { diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index a910f0a..2c9fe1f 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -248,7 +248,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr //将状态置位已领取 list.Taskdata[index].Taskstatus = 0 //发奖励 - realgold, err := AddCoinToSdk(uuid, addgold, gameid, channel, REDBAGTYPE_102) + realgold, realaddgold, err := AddCoinToSdk(uuid, addgold, gameid, channel, REDBAGTYPE_102) if err != nil { logger.Info("GetUserInfo HandlerDrawguangold data failed:%v,for:%v", err) resp.Message = "后台提现失败" @@ -257,7 +257,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr } uinfo.RealGold = realgold - resp.Data.Goldnum = addgold + resp.Data.Goldnum = realaddgold resp.Data.Walletgold = uinfo.RealGold return nil @@ -979,7 +979,23 @@ func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, he return newnum, nil } -func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype int) (int, error) { +func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype int) (int, int, error) { + //需要处理一下金币数值 + realaddgoldnum := 0 + newnum, err := GetCoinFromSdk(uuid, gameid, channel) + if err != nil { + logger.Error("AddCoinToSdk failed=%v", err) + return 0, 0, err + } + + if newnum >= 950000 { + if newnum >= 990000 { + realaddgoldnum = 1 + } else { + realaddgoldnum = 100 + } + } + SERVERKEY := conf.GetCoinConf().Key if gameid == "1017" { SERVERKEY = XIAOXINGXING_SERVERKEYTEST_1017 @@ -995,7 +1011,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in paramlist = append(paramlist, pchannel) puid := "uid=" + strconv.Itoa(uuid) paramlist = append(paramlist, puid) - pcoin := "coin=" + strconv.Itoa(goldnum) + pcoin := "coin=" + strconv.Itoa(realaddgoldnum) paramlist = append(paramlist, pcoin) ptyp := "typ=" + strconv.Itoa(atype) paramlist = append(paramlist, ptyp) @@ -1011,7 +1027,7 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in var req AddCoinDesc req.Channel = channel req.Gameid = gameid - req.Coin = goldnum + req.Coin = realaddgoldnum req.Sign = sign req.Sign_type = "md5" req.Time_stamp = strconv.Itoa(int(time.Now().Unix())) @@ -1021,12 +1037,12 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in bys, err := json.Marshal(&req) if err != nil { logger.Error("AddCoinToSdk failed=%v", err) - return 0, err + return 0, realaddgoldnum, err } res, err := DoHttpPost(bys, "api/server/addcoin") if err != nil { logger.Error("AddCoinToSdk failed=%v", err) - return 0, err + return 0, realaddgoldnum, err } logger.Info("AddCoinToSdk res=%v", res) @@ -1034,15 +1050,15 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in err = json.Unmarshal([]byte(res), &resp) if err != nil { logger.Error("AddCoinToSdk failed=%v", err) - return 0, err + return 0, realaddgoldnum, err } if resp.Code != "0" { gold, _ := GetCoinFromSdk(uuid, gameid, channel) logger.Error("AddCoinToSdk failed=%v", resp.Msg) - return gold, err + return gold, realaddgoldnum, err } - return resp.Data.Mycoin, nil + return resp.Data.Mycoin, realaddgoldnum, nil } //计算转盘抽奖 diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index f2633da..7f72a7a 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -249,7 +249,7 @@ func Addcoin(w http.ResponseWriter, r *http.Request) { func Testapi(w http.ResponseWriter, r *http.Request) { logger.Info("Testapiddt") - realgold, err := AddCoinToSdk(4983097, 100000, "1021", "test", 99) + realgold, _, err := AddCoinToSdk(4983097, 100000, "1021", "test", 99) if err != nil { logger.Error("Testapi failed") } diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index e869499..b3d548c 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -518,9 +518,8 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game resp.Code = 1 break }*/ - if addgold > 0 { - realgold, err := AddCoinToSdk(uuid, addgold, gameid, channel, REDBAGTYPE_301) + realgold, realaddgolds, err := AddCoinToSdk(uuid, addgold, gameid, channel, REDBAGTYPE_301) if err != nil { logger.Info("GetUserInfo HandlerQuerydrawreward data failed:%v,for:%v", err, data) resp.Message = "后台加金币失败了" @@ -529,6 +528,7 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game } uinfo.RealGold = realgold + resp.Data.Getgold = realaddgolds } if uinfo.FreeTicket > 0 { @@ -538,7 +538,7 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game } SaveUserInfo(uinfo, uniqueuuid) - resp.Data.Getgold = addgold + resp.Data.Walletgold = uinfo.RealGold resp.Data.Rewardid = rewardid resp.Data.Leftfreeticket = uinfo.FreeTicket @@ -711,7 +711,7 @@ func HandlerDosign(w http.ResponseWriter, data string, uniqueuuid, gameid, chann } readgold := 0 - readgold, err = AddCoinToSdk(uuid, cfg.Sign_coin, gameid, channel, REDBAGTYPE_107) + readgold, _, err = AddCoinToSdk(uuid, cfg.Sign_coin, gameid, channel, REDBAGTYPE_107) if err != nil { logger.Info("GetUserInfo HandlerDosign data failed:%v,for:%v", err, data) resp.Message = "后台失败！" @@ -720,7 +720,7 @@ func HandlerDosign(w http.ResponseWriter, data string, uniqueuuid, gameid, chann } if rdata.Ftype == 2 { - readgold, err = AddCoinToSdk(uuid, cfg.Video_coin, gameid, channel, REDBAGTYPE_107) + readgold, _, err = AddCoinToSdk(uuid, cfg.Video_coin, gameid, channel, REDBAGTYPE_107) if err != nil { logger.Info("GetUserInfo HandlerDosign data failed:%v,for:%v", err, data) resp.Message = "后台失败！" @@ -766,7 +766,7 @@ func HandlerFetchoffliengold(w http.ResponseWriter, data string, uniqueuuid, gam break } - readgold, err := AddCoinToSdk(uuid, uinfo.OfflineGold, gameid, channel, REDBAGTYPE_106) + readgold, _, err := AddCoinToSdk(uuid, uinfo.OfflineGold, gameid, channel, REDBAGTYPE_106) if err != nil { logger.Info("GetUserInfo HandlerFetchoffliengold data failed:%v,for:%v", err, data) resp.Message = "后台失败！" @@ -849,7 +849,7 @@ func HandlerFetchluckybag(w http.ResponseWriter, data string, uniqueuuid, gameid break } - realgold, err := AddCoinToSdk(uuid, addcoin, gameid, channel, REDBAGTYPE_106) + realgold, _, err := AddCoinToSdk(uuid, addcoin, gameid, channel, REDBAGTYPE_106) if err != nil { logger.Info("GetUserInfo HandlerFetchluckybag data failed:%v,for:%v", err, data) resp.Message = "后台加金币失败了" @@ -917,7 +917,7 @@ func HandlerFetchfenredbag(w http.ResponseWriter, data string, uniqueuuid, gamei addgold := cfg.Free_coin readgold := 0 - readgold, err = AddCoinToSdk(uuid, cfg.Free_coin, gameid, channel, REDBAGTYPE_103) + readgold, _, err = AddCoinToSdk(uuid, cfg.Free_coin, gameid, channel, REDBAGTYPE_103) if err != nil { logger.Info("GetUserInfo HandlerFetchfenredbag data failed:%v,for:%v", err, data) resp.Message = "后台失败！" @@ -927,7 +927,7 @@ func HandlerFetchfenredbag(w http.ResponseWriter, data string, uniqueuuid, gamei if rdata.Ftype == 2 { addgold += cfg.Video_coin - readgold, err = AddCoinToSdk(uuid, cfg.Video_coin, gameid, channel, REDBAGTYPE_106) + readgold, _, err = AddCoinToSdk(uuid, cfg.Video_coin, gameid, channel, REDBAGTYPE_106) if err != nil { logger.Info("GetUserInfo HandlerFetchfenredbag data failed:%v,for:%v", err, data) resp.Message = "后台失败！" @@ -983,7 +983,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uniqueuuid, gameid, resp.Code = 1 break } - realgold, err := AddCoinToSdk(uuid, rdata.Goldnum, gameid, channel, REDBAGTYPE_105) + realgold, _, err := AddCoinToSdk(uuid, rdata.Goldnum, gameid, channel, REDBAGTYPE_105) if err != nil { logger.Info("GetUserInfo HandlerDrawguangold data failed:%v,for:%v", err, data) resp.Message = "后台提现失败" -- libgit2 0.21.0