From be4b752590ac038414ec3f2daaecd29dc2b51429 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 25 Sep 2023 11:29:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=20=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=E9=93=81=E5=8C=A0=E9=93=BA=E4=BB=BB=E5=8A=A1=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/smithy/model_task.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/smithy/model_task.go b/modules/smithy/model_task.go
index e544594c3..a5413529d 100644
--- a/modules/smithy/model_task.go
+++ b/modules/smithy/model_task.go
@@ -71,16 +71,16 @@ func (this *modelTask) updateTaskRecord(uid string, taskId int32) error {
 	return nil
 }
 
-// 红点检测
+// 红点检测 2023/9/25需求 屏蔽铁匠铺任务红点
 func (this *modelTask) checkReddot17107(uid string) bool {
-	dt, err := this.getTaskRecord(uid)
-	if err != nil {
-		return false
-	}
-	for _, v := range dt.Tasks {
-		if v.Received == 1 {
-			return true
-		}
-	}
+	// dt, err := this.getTaskRecord(uid)
+	// if err != nil {
+	// 	return false
+	// }
+	// for _, v := range dt.Tasks {
+	// 	if v.Received == 1 {
+	// 		return true
+	// 	}
+	// }
 	return false
 }

From f08bc06433bc42d35c00164f96d19428df9dc545 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 25 Sep 2023 14:31:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E9=98=9F=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1=20=E6=89=8B=E5=8A=A8=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caravan/api_getreward.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/caravan/api_getreward.go b/modules/caravan/api_getreward.go
index 0b41e240b..bf68e9434 100644
--- a/modules/caravan/api_getreward.go
+++ b/modules/caravan/api_getreward.go
@@ -47,11 +47,11 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.CaravanGetRewa
 						Title: pb.ErrorCode_TrollCantReward.ToString(),
 					}
 					return
+				} else {
+					res = append(res, v.Reward...)
 				}
-				res = append(res, v.Reward...)
 				break
 			}
-
 		}
 		if len(res) == 0 {
 			errdata = &pb.ErrorData{