From 3a14ff435289193656da2b79fb57d7100def6363 Mon Sep 17 00:00:00 2001
From: zhora <zhora@zh-games.com>
Date: Tue, 9 Sep 2025 10:07:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 call/share.go                                          | 8 +++++++-
 modules/backend/handler/examine/examine.go             | 4 +++-
 modules/backend/handler/statistics/reviewAppSummary.go | 2 +-
 modules/backend/values/examine.go                      | 1 +
 modules/web/handler/share.go                           | 1 +
 modules/web/values/shareNew.go                         | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/call/share.go b/call/share.go
index 3da9e76..f626678 100644
--- a/call/share.go
+++ b/call/share.go
@@ -667,8 +667,10 @@ func ShareRankHandler() {
 				}
 				timer := time.NewTimer(nextSettleAt.Sub(now))
 				<-timer.C
-
 				shareRankAward()
+				nextSettleAt = util.GetWeekZeroTime(now).AddDate(0, 0, 7).Add(30 * time.Minute)
+				log.Debug("next share rank at: %s", nextSettleAt.Format(time.DateTime))
+				timer.Reset(nextSettleAt.Sub(time.Now()))
 			}
 		})
 	})
@@ -900,6 +902,10 @@ func UpdateShare(uid, updateType int, updateValue int64, expand ...string) (err
 				RewardAt:    now.Unix(),
 			}
 			awardCount = updateValue
+			if awardCount == 0 { // 绑定的时候不关心奖励数
+				awardCount = amount
+				updateValue = amount
+			}
 			updateValues["reward"] = gorm.Expr("reward + ?", amount)
 			updateValues["withdrawable"] = gorm.Expr("withdrawable + ?", amount)
 		}
diff --git a/modules/backend/handler/examine/examine.go b/modules/backend/handler/examine/examine.go
index 1cd6557..b32a687 100644
--- a/modules/backend/handler/examine/examine.go
+++ b/modules/backend/handler/examine/examine.go
@@ -67,7 +67,9 @@ func WithdrawList(c *gin.Context) {
 	if req.Operator != nil {
 		table1Condition += fmt.Sprintf(" AND operator = %s ", *req.Operator)
 	}
-
+	if req.OrderId != nil {
+		table1Condition += fmt.Sprintf(" AND orderid = '%s' ", *req.OrderId)
+	}
 	// 表2的查询条件
 	table2Condition := ""
 	if req.Platform != nil {
diff --git a/modules/backend/handler/statistics/reviewAppSummary.go b/modules/backend/handler/statistics/reviewAppSummary.go
index 49ca8cf..d2cb26c 100644
--- a/modules/backend/handler/statistics/reviewAppSummary.go
+++ b/modules/backend/handler/statistics/reviewAppSummary.go
@@ -56,7 +56,7 @@ func ReviewAppSummary(c *gin.Context) {
 	group := new(sync.WaitGroup)
 	group.Add(len(tempChannelArr))
 	resp.PlatformData = make([]*values.ReviewData, len(tempChannelArr))
-	if su >= zero {
+	if eu >= zero {
 		for m := 0; m < len(tempChannelArr); m++ {
 			index := m
 			util.Go(func() {
diff --git a/modules/backend/values/examine.go b/modules/backend/values/examine.go
index 906d2d5..37a1752 100644
--- a/modules/backend/values/examine.go
+++ b/modules/backend/values/examine.go
@@ -29,6 +29,7 @@ type WithdrawListReq struct {
 	PayChannel *int    `json:"PayChannel"`
 	Operator   *string `json:"Operator"`
 	Sort       int     `json:"Sort"`
+	OrderId    *string `json:"OrderId"`
 }
 
 // WithdrawListResp 退出列表返回
diff --git a/modules/web/handler/share.go b/modules/web/handler/share.go
index 2577407..60fcb7c 100644
--- a/modules/web/handler/share.go
+++ b/modules/web/handler/share.go
@@ -758,6 +758,7 @@ func RankDetails(c *gin.Context) {
 		rankAt = rankAt.AddDate(0, 0, -7)
 	}
 
+	log.Debug("share rankDetails, %+v rankAt:%d", req, rankAt.Unix())
 	shareRankUsers, count, err := call.ShareRankUserGet(req.Page, req.PageSize, rankAt, true)
 	if err != nil {
 		log.Error("get rank user err, %s", err.Error())
diff --git a/modules/web/values/shareNew.go b/modules/web/values/shareNew.go
index 2869365..abd3558 100644
--- a/modules/web/values/shareNew.go
+++ b/modules/web/values/shareNew.go
@@ -287,7 +287,7 @@ type RewardResp struct {
 }
 
 type RankDetailsReq struct {
-	Previous bool `json:"previous"` // 历史列表
+	Previous bool `json:"Pervious"` // 历史列表
 	Page     int  `json:"page"`
 	PageSize int  `json:"pageSize"`
 }