Commit 886edac5a5990bfe7e91ca67fe8dbf7047995488
1 parent
df0935f0
Exists in
master
and in
4 other branches
提交
Showing
2 changed files
with
14 additions
and
13 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -419,12 +419,12 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str | @@ -419,12 +419,12 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str | ||
| 419 | return 0, 0, 0, 0, 0, 0, 0 | 419 | return 0, 0, 0, 0, 0, 0, 0 |
| 420 | } | 420 | } |
| 421 | case REWARDTYPE_GOLD: | 421 | case REWARDTYPE_GOLD: |
| 422 | - _, err := AddCoinToSdk(uinfo.Userid, num, gameid, channel, 100) | 422 | + goldnum, err := AddCoinToSdk(uinfo.Userid, num, gameid, channel, 100) |
| 423 | if err != nil { | 423 | if err != nil { |
| 424 | logger.Error("RewardUser failer err=%v", err) | 424 | logger.Error("RewardUser failer err=%v", err) |
| 425 | } | 425 | } |
| 426 | - //uinfo.RealGold = | ||
| 427 | - uinfo.RealGold += num | 426 | + uinfo.RealGold = goldnum |
| 427 | + //uinfo.RealGold += num | ||
| 428 | return 0, 0, 0, 0, 0, 0, uinfo.RealGold | 428 | return 0, 0, 0, 0, 0, 0, uinfo.RealGold |
| 429 | default: | 429 | default: |
| 430 | return 0, 0, 0, 0, 0, 0, 0 | 430 | return 0, 0, 0, 0, 0, 0, 0 |
src/HttpServer/logic/logic.go
| @@ -268,25 +268,25 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | @@ -268,25 +268,25 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) { | ||
| 268 | break | 268 | break |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | - _, err = AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 100) | 271 | + goldnum, err := AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 100) |
| 272 | if err != nil { | 272 | if err != nil { |
| 273 | logger.Error("AddCoinToSdk failed err=%v", err) | 273 | logger.Error("AddCoinToSdk failed err=%v", err) |
| 274 | resp.Message = "网络错误" | 274 | resp.Message = "网络错误" |
| 275 | resp.Code = ERROR_SRV_ERROR | 275 | resp.Code = ERROR_SRV_ERROR |
| 276 | break | 276 | break |
| 277 | } | 277 | } |
| 278 | - //uinfo.RealGold = | ||
| 279 | - uinfo.RealGold += cfg.Cash | 278 | + uinfo.RealGold = goldnum |
| 279 | + //uinfo.RealGold += cfg.Cash | ||
| 280 | 280 | ||
| 281 | if rdata.Rewardtype == 2 { | 281 | if rdata.Rewardtype == 2 { |
| 282 | - _, err = AddCoinToSdk(uuid, cfg.Extracash, rdata.Gameid, rdata.Channel, 100) | 282 | + goldnum, err = AddCoinToSdk(uuid, cfg.Extracash, rdata.Gameid, rdata.Channel, 100) |
| 283 | if err != nil { | 283 | if err != nil { |
| 284 | logger.Error("AddCoinToSdk failed err=%v", err) | 284 | logger.Error("AddCoinToSdk failed err=%v", err) |
| 285 | resp.Message = "网络错误" | 285 | resp.Message = "网络错误" |
| 286 | resp.Code = ERROR_SRV_ERROR | 286 | resp.Code = ERROR_SRV_ERROR |
| 287 | break | 287 | break |
| 288 | } | 288 | } |
| 289 | - //uinfo.RealGold = | 289 | + uinfo.RealGold = goldnum |
| 290 | uinfo.RealGold += cfg.Extracash | 290 | uinfo.RealGold += cfg.Extracash |
| 291 | } | 291 | } |
| 292 | 292 | ||
| @@ -354,7 +354,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | @@ -354,7 +354,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | ||
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | //uinfo.RealGold = | 356 | //uinfo.RealGold = |
| 357 | - _, err = AddCoinToSdk(uuid, cfg.Num, rdata.Gameid, rdata.Channel, 100) | 357 | + goldnum, err := AddCoinToSdk(uuid, cfg.Num, rdata.Gameid, rdata.Channel, 100) |
| 358 | if err != nil { | 358 | if err != nil { |
| 359 | uinfo.SignSum-- | 359 | uinfo.SignSum-- |
| 360 | logger.Error("AddCoinToSdk failed err=%v", err) | 360 | logger.Error("AddCoinToSdk failed err=%v", err) |
| @@ -364,7 +364,8 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | @@ -364,7 +364,8 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | ||
| 364 | } | 364 | } |
| 365 | 365 | ||
| 366 | uinfo.IsSignToday = 1 | 366 | uinfo.IsSignToday = 1 |
| 367 | - uinfo.RealGold += cfg.Num | 367 | + uinfo.RealGold = goldnum |
| 368 | + //uinfo.RealGold += cfg.Num | ||
| 368 | 369 | ||
| 369 | resp.Data.Goldnum = uinfo.RealGold | 370 | resp.Data.Goldnum = uinfo.RealGold |
| 370 | 371 | ||
| @@ -702,7 +703,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | @@ -702,7 +703,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | ||
| 702 | } | 703 | } |
| 703 | 704 | ||
| 704 | //todo 此处需要调佣SDK接口通知金币变化 | 705 | //todo 此处需要调佣SDK接口通知金币变化 |
| 705 | - _, err = AddCoinToSdk(uuid, rdata.Goldnum, rdata.Gameid, rdata.Channel, 100) | 706 | + goldnum, err := AddCoinToSdk(uuid, rdata.Goldnum, rdata.Gameid, rdata.Channel, 100) |
| 706 | if err != nil { | 707 | if err != nil { |
| 707 | logger.Error("Drawgold failed err=%v", err) | 708 | logger.Error("Drawgold failed err=%v", err) |
| 708 | resp.Message = "从存钱罐提取金币失败了" | 709 | resp.Message = "从存钱罐提取金币失败了" |
| @@ -711,8 +712,8 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | @@ -711,8 +712,8 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) { | ||
| 711 | } | 712 | } |
| 712 | 713 | ||
| 713 | uinfo.GuanGold = uinfo.GuanGold - rdata.Goldnum | 714 | uinfo.GuanGold = uinfo.GuanGold - rdata.Goldnum |
| 714 | - //uinfo.RealGold = | ||
| 715 | - uinfo.RealGold += rdata.Goldnum | 715 | + uinfo.RealGold = goldnum |
| 716 | + //uinfo.RealGold += rdata.Goldnum | ||
| 716 | 717 | ||
| 717 | resp.Data.Guangold = uinfo.GuanGold | 718 | resp.Data.Guangold = uinfo.GuanGold |
| 718 | resp.Data.Wallgold = uinfo.RealGold | 719 | resp.Data.Wallgold = uinfo.RealGold |