From f06d4b1c28fdde2fbed28e40449a29817aafc3a8 Mon Sep 17 00:00:00 2001
From: mofangmin <mofangmin@zh-games.com>
Date: Mon, 15 Jul 2024 18:54:27 +0800
Subject: [PATCH] =?UTF-8?q?oss=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 call/user.go                             |  4 ++++
 modules/backend/handler/common/common.go |  3 +--
 modules/web/handler/activity.go          | 19 ++++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/call/user.go b/call/user.go
index f75e269..5750011 100644
--- a/call/user.go
+++ b/call/user.go
@@ -616,6 +616,10 @@ func UpdatePlayerProfile(data *common.ESGameData) error {
 func GetPlayerData(uid int) *common.PlayerData {
 	data := &common.PlayerData{UID: uid}
 	db.Mysql().Get(data)
+	now := time.Now()
+	if !util.IsSameDayTimeStamp(now.Unix(), data.DayBetTime) {
+		data.DayBetTime = 0
+	}
 	return data
 }
 
diff --git a/modules/backend/handler/common/common.go b/modules/backend/handler/common/common.go
index 0022e6b..2ca7fdb 100644
--- a/modules/backend/handler/common/common.go
+++ b/modules/backend/handler/common/common.go
@@ -92,7 +92,6 @@ func UploadOSS(c *gin.Context) {
 	}()
 	ossConf := config.GetConfig().Backend.Oss
 	req := new(values.UploadOSSReq)
-	req.ObjectName = c.PostForm("ObjectName")
 	req.Folder = c.PostForm("folder")
 	if req.Folder != "" && !strings.HasSuffix(req.Folder, "/") {
 		req.Folder += "/"
@@ -132,5 +131,5 @@ func UploadOSS(c *gin.Context) {
 		log.Error("UploadOSS PutObject err:%v", err)
 		return
 	}
-	rsp.Url = fmt.Sprintf("https://%s/%s/%s%s", ossConf.Domain, ossConf.ObjectName, req.Folder, file.Filename)
+	rsp.Url = fmt.Sprintf("https://%s/%s%s%s", ossConf.Domain, ossConf.ObjectName, req.Folder, file.Filename)
 }
diff --git a/modules/web/handler/activity.go b/modules/web/handler/activity.go
index 7b81530..1725a75 100644
--- a/modules/web/handler/activity.go
+++ b/modules/web/handler/activity.go
@@ -704,7 +704,6 @@ func ActivityLuckyCodeDraw(c *gin.Context) {
 	if !a.CheckActivityExpire(common.ActivityIDLuckyCode) {
 		return
 	}
-
 	req := new(values.ActivityLuckyCodeDrawReq)
 	if !a.S(req) {
 		return
@@ -733,7 +732,8 @@ func ActivityLuckyCodeDraw(c *gin.Context) {
 	total := call.GetConfigAcitivityLuckyCodeTotalWeight(codeType)
 	if total == 0 {
 		log.Error("con:%+v invalid,uid:%d", con, a.UID)
-		a.Code = values.CodeRetry
+		a.Code = values.CodeParam
+		a.Msg = "रूपांतरण कोड त्रुटि"
 		return
 	}
 	if data.ID == 0 {
@@ -788,6 +788,7 @@ func ActivityLuckyCodeDraw(c *gin.Context) {
 	if err != nil {
 		log.Error("err:%v", err)
 		a.Code = values.CodeRetry
+		a.Msg = "रूपांतरण कोड त्रुटि"
 		return
 	}
 	call.UploadActivityData(a.UID, common.ActivityIDLuckyCode, common.ActivityDataJoin, reward)
@@ -1022,6 +1023,15 @@ func GetSignNewInfo(uid int) (resp *values.ActivitySignInfoResp) {
 	resp.Sign = 7*(data.Wheel-1) + signDay
 	resp.Day = signDay + 1
 	now := time.Now()
+	if data.Finish || util.IsSameDayTimeStamp(now.Unix(), data.SignTime) {
+		for _, v := range resp.List {
+			if v.Day == signDay && data.Wheel >= v.WheelStart && data.Wheel <= v.WheelEnd {
+				resp.Recharge = v.Recharge
+				resp.Bet = v.Bet
+				break
+			}
+		}
+	}
 	if util.IsSameDayTimeStamp(now.Unix(), data.SignTime) {
 		return
 	}
@@ -1125,7 +1135,10 @@ func ActivitySignNewDraw(c *gin.Context) {
 
 	// ok
 	newSign := Sign(day)
-	updates := map[string]interface{}{"sign": newSign, "finish": false, "reward": gorm.Expr("reward + ?", reward), "sign_time": now.Unix()}
+	updates := map[string]interface{}{"sign": newSign, "finish": false, "reward": gorm.Expr("reward + ?", reward)}
+	if config.GetBase().Release {
+		updates["sign_time"] = now.Unix()
+	}
 	rows, err := db.Mysql().UpdateRes(&common.ActivitySignData{UID: a.UID, Sign: data.Sign}, updates)
 	if rows == 0 || err != nil {
 		log.Error("err:%v", err)