From 941c38ef67d9cc30978c94430c5c7a9e95bbc25e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 19 Feb 2024 11:47:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E5=88=9B=E8=A7=92=E8=BF=9B=E6=8E=A0?=
 =?UTF-8?q?=E5=A4=BA=E5=8A=9F=E8=83=BD=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/plunder/api_challengeover.go    |  2 +-
 modules/plunder/api_getlist.go          | 19 ++++++++++++++++---
 modules/plunder/api_pvpchallenge.go     |  2 +-
 modules/plunder/api_pvpchallengeover.go |  2 +-
 modules/plunder/model_plunder.go        |  4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go
index 0a0e73378..20726ba52 100644
--- a/modules/plunder/api_challengeover.go
+++ b/modules/plunder/api_challengeover.go
@@ -118,7 +118,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
 		return
 	}
 	lock, err = this.module.modelLand.landMutexLock(list.Landid)
-	lock.Lock()
+	err = lock.Lock()
 	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
diff --git a/modules/plunder/api_getlist.go b/modules/plunder/api_getlist.go
index c0767fd2c..16ff7cf9e 100644
--- a/modules/plunder/api_getlist.go
+++ b/modules/plunder/api_getlist.go
@@ -1,6 +1,7 @@
 package plunder
 
 import (
+	"errors"
 	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
@@ -32,10 +33,22 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe
 	}
 	update = make(map[string]interface{})
 	if list, err = this.module.modelPlunder.getPlunderData(session); err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Message: err.Error(),
+		var customErr = new(comm.CustomError)
+		if errors.As(err, &customErr) {
+			code := customErr.Code
+			errdata = &pb.ErrorData{
+				Code:    code,
+				Title:   code.ToString(),
+				Message: err.Error(),
+			}
+		} else {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_DBError,
+				Title:   pb.ErrorCode_DBError.ToString(),
+				Message: err.Error(),
+			}
 		}
+
 		return
 	}
 
diff --git a/modules/plunder/api_pvpchallenge.go b/modules/plunder/api_pvpchallenge.go
index 94eeb8ea0..1ab18baea 100644
--- a/modules/plunder/api_pvpchallenge.go
+++ b/modules/plunder/api_pvpchallenge.go
@@ -67,7 +67,7 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
 	}
 
 	lock, err = this.module.modelLand.landMutexLock(list.Landid)
-	lock.Lock()
+	err = lock.Lock()
 	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go
index 59dcee661..351b4b262 100644
--- a/modules/plunder/api_pvpchallengeover.go
+++ b/modules/plunder/api_pvpchallengeover.go
@@ -47,7 +47,7 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
 		return
 	}
 	lock, err = this.module.modelLand.landMutexLock(list.Landid)
-	lock.Lock()
+	err = lock.Lock()
 	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go
index 867034ab0..a230d82df 100644
--- a/modules/plunder/model_plunder.go
+++ b/modules/plunder/model_plunder.go
@@ -1,7 +1,6 @@
 package plunder
 
 import (
-	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/mgo"
@@ -77,7 +76,8 @@ func (this *modelPlunder) getPlunderData(session comm.IUserSession) (info *pb.DB
 			return
 		}
 		if user.Name == "" { // 临时处理没创角不让进 后面走功能开启配置
-			err = fmt.Errorf("getPlunderData need create ")
+			//err = fmt.Errorf("getPlunderData need create")
+			err = comm.NewCustomError(pb.ErrorCode_RoleNeedCreated)
 			return
 		}
 		info = &pb.DBPlunder{