Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

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{

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
 }