没创角进掠夺功能提示错误码

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,

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{
+		var customErr = new(comm.CustomError)
-			Code:    pb.ErrorCode_DBError,
+		if errors.As(err, &customErr) {
-			Message: err.Error(),
+			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
 	}
 

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,

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,

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{