From ee316fccea14be8144921ad963e82b89033de180 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 11 Nov 2024 14:12:14 +0800
Subject: [PATCH] 1

---
 server/wheelserver/api/v1/activity/activity.go | 10 +++++-----
 server/wheelserver/model/user.go               |  2 +-
 server/wheelserver/router/activity/activity.go |  5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/wheelserver/api/v1/activity/activity.go b/server/wheelserver/api/v1/activity/activity.go
index 22a09c87..020a15a3 100644
--- a/server/wheelserver/api/v1/activity/activity.go
+++ b/server/wheelserver/api/v1/activity/activity.go
@@ -21,10 +21,10 @@ func (this *ActivityApi) RollDice(c *gin.Context) {
 	user := new(model.User)
 	nowTime := f5.GetApp().GetRealSeconds()
 	if err, found := user.Find(s.GetAccountId(), nowTime); err != nil  {
-		f5.RspErr(c, 500, "server internal error")
+		f5.RspErr(c, 500, "server internal error1")
 		return
 	} else if !found {
-		f5.RspErr(c, 500, "server internal error")
+		f5.RspErr(c, 500, "server internal error2")
 		return
 	}
 	if user.Dice <= 0 {
@@ -33,16 +33,16 @@ func (this *ActivityApi) RollDice(c *gin.Context) {
 	}
 	rewardMeta := mt.Table.Reward.RandElement()
 	if rewardMeta == nil {
-		f5.RspErr(c, 500, "server internal error")
+		f5.RspErr(c, 500, "server internal error3")
 		return
 	}
 	score := rewardMeta.RandScore()
 	if score <= 0 {
-		f5.RspErr(c, 500, "server internal error")
+		f5.RspErr(c, 500, "server internal error4")
 		return
 	}
 	if err := user.DecDice(1); err != nil {
-		f5.RspErr(c, 500, "server internal error")
+		f5.RspErr(c, 500, "server internal error5")
 		return
 	}
 	rspObj := struct {
diff --git a/server/wheelserver/model/user.go b/server/wheelserver/model/user.go
index d021d927..05e486d2 100644
--- a/server/wheelserver/model/user.go
+++ b/server/wheelserver/model/user.go
@@ -53,7 +53,7 @@ func (this *User) Create() error {
 }
 
 func (this *User) DecDice(num int32) error {
-	if this.Score < int64(num) {
+	if this.Dice < num {
 		return errors.New("")
 	}
 	oldDice := this.Dice
diff --git a/server/wheelserver/router/activity/activity.go b/server/wheelserver/router/activity/activity.go
index 3e950292..64569aad 100644
--- a/server/wheelserver/router/activity/activity.go
+++ b/server/wheelserver/router/activity/activity.go
@@ -2,6 +2,7 @@ package activity
 
 import (
 	"f5"
+	"main/middleware"
 	"main/api/v1"
 )
 
@@ -9,5 +10,7 @@ type ActivityRouter struct{}
 
 func (this *ActivityRouter) InitRouter() {
 	api := v1.ApiGroupApp.ActivityApiGroup
-	f5.GetApp().GetGinEngine().POST("/api/v1/activity/roll_dice", api.ActivityApi.RollDice)
+	f5.GetApp().GetGinEngine().POST("/api/v1/activity/roll_dice",
+		middleware.JwtAuth,
+		api.ActivityApi.RollDice)
 }