From dcdcd6f4301a7614bfba6e6c5ab7060c06106cf3 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Mon, 26 Aug 2024 14:18:31 +0800
Subject: [PATCH] block player

---
 .../adminserver/api/v1/system/block_player.go |  4 +--
 server/adminserver/api/v1/system/whitelist.go |  4 +--
 server/marketserver/api/v1/user/user.go       |  2 +-
 server/marketserver/service/user.go           | 32 +++++++++++++++----
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/server/adminserver/api/v1/system/block_player.go b/server/adminserver/api/v1/system/block_player.go
index 789a8879..f1b1d9cd 100644
--- a/server/adminserver/api/v1/system/block_player.go
+++ b/server/adminserver/api/v1/system/block_player.go
@@ -132,7 +132,7 @@ func (bpa *BlockPlayerApi) Edit(c *gin.Context) {
 
 	blockplayer := new(system.BlockPlayer)
 	db := f5.GetApp().GetOrmDb(constant.CONF_DB)
-	if err := db.Take(blockplayer, "account_id =?", req.Account).Error; err != nil {
+	if err := db.Take(blockplayer, "account_id = ? AND deleted = 0", req.Account).Error; err != nil {
 		if !f5.IsOrmErrRecordNotFound(err) {
 			c.JSON(http.StatusOK, gin.H{
 				"code":    500,
@@ -178,7 +178,7 @@ func (bpa *BlockPlayerApi) Del(c *gin.Context) {
 
 	blockplayer := new(system.BlockPlayer)
 	db := f5.GetApp().GetOrmDb(constant.CONF_DB)
-	if err := db.Take(blockplayer, "account_id =?", req.Account).Error; err != nil {
+	if err := db.Take(blockplayer, "account_id = ? AND deleted = 0", req.Account).Error; err != nil {
 		if !f5.IsOrmErrRecordNotFound(err) {
 			c.JSON(http.StatusOK, gin.H{
 				"code":    500,
diff --git a/server/adminserver/api/v1/system/whitelist.go b/server/adminserver/api/v1/system/whitelist.go
index 890a08ee..b45fa2f1 100644
--- a/server/adminserver/api/v1/system/whitelist.go
+++ b/server/adminserver/api/v1/system/whitelist.go
@@ -207,8 +207,8 @@ func (bpa *WhiteListApi) Del(c *gin.Context) {
 	} else {
 		if whiteListItem.Deleted == 1 {
 			c.JSON(http.StatusOK, gin.H{
-				"code":    0,
-				"message": "",
+				"code":    2,
+				"message": "无法查到记录",
 			})
 
 			return
diff --git a/server/marketserver/api/v1/user/user.go b/server/marketserver/api/v1/user/user.go
index 7c6667a0..524b2997 100644
--- a/server/marketserver/api/v1/user/user.go
+++ b/server/marketserver/api/v1/user/user.go
@@ -118,7 +118,7 @@ func (this *UserApi) Info(c *gin.Context) {
 				if err != nil {
 					return
 				}
-				for ds.Next() {
+				if ds.Next() {
 					diamond += q5.ToFloat64(ds.GetByIndex(0))
 				}
 			})
diff --git a/server/marketserver/service/user.go b/server/marketserver/service/user.go
index 117b1277..4992acb7 100644
--- a/server/marketserver/service/user.go
+++ b/server/marketserver/service/user.go
@@ -1,22 +1,40 @@
 package service
 
 import (
-	//"strings"
+	"f5"
+	"main/constant"
+	"q5"
 )
 
+//"strings"
+
 type user struct {
 }
 
-func (this *user) init(){
+func (this *user) init() {
 }
 
-func (this *user) unInit(){
+func (this *user) unInit() {
 }
 
 func (this *user) InBlackList(userIdentity string) (bool, error) {
-	/*
-	if strings.ToLower(userIdentity) == strings.ToLower("0x52f01e8791cb558c93ee0c59ea5ff5d79fc82044") {
+	if userIdentity == "" {
 		return true, nil
-	}*/
-	return false, nil
+	}
+
+	var queryerr error
+	blocked := false
+	f5.GetGoStyleDb().RawQuery(
+		constant.CONF_DB,
+		"SELECT * FROM t_blockplayer WHERE 1=1 AND account_id = ?",
+		[]string{userIdentity},
+		func(err error, ds *f5.DataSet) {
+			if err != nil {
+				queryerr = err
+				return
+			}
+
+			blocked = ds.Next() && q5.SafeToInt32(ds.GetByName("blocked")) != 0 && q5.SafeToInt32(ds.GetByName("deleted")) == 0
+		})
+	return blocked, queryerr
 }