errorcode

modules/modulebase.go

@@ -323,15 +323,25 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn)
 	}
 	// 校验数量
 	for k, v := range attrs {
-		if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < int64(v) {
+		amount := this.ModuleUser.QueryAttributeValue(session.GetUserId(), k)
-			code = pb.ErrorCode_ResNoEnough
+		if amount < int64(v) {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ResNoEnough,
+				Title:   pb.ErrorCode_ResNoEnough.ToString(),
+				Message: fmt.Sprintf("资源%v的数量:%v 小于 %v", k, amount, v),
+			}
 			// this.Warn("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v})
 			return
 		}
 	}
 	for k, v := range items { //校验消费资源是否充足
-		if int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) < v {
+		amount := int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k))
-			code = pb.ErrorCode_ResNoEnough
+		if amount < v {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ResNoEnough,
+				Title:   pb.ErrorCode_ResNoEnough.ToString(),
+				Message: fmt.Sprintf("道具%v的数量:%v 小于 %v", k, amount, v),
+			}
 			// this.Warn("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v})
 			return
 		}

modules/user/api_battlerecord.go

@@ -21,7 +21,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler
 	user := this.module.GetUser(uid)
 	userEx, err := this.module.GetUserExpand(uid)
 	if err != nil {
-		code = pb.ErrorCode_UserExpandNull
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_UserExpandNull,
+			Title:   pb.ErrorCode_UserExpandNull.ToString(),
+			Message: err.Error(),
+		}
 		return
 	}
 
@@ -33,7 +37,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler
 	// 心魔塔
 	iPagoda, err := this.service.GetModule(comm.ModulePagoda)
 	if err != nil {
-		code = pb.ErrorCode_SystemError
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_SystemError,
+			Title:   pb.ErrorCode_SystemError.ToString(),
+			Message: err.Error(),
+		}
 		return
 	}
 
@@ -47,7 +55,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler
 	//狩猎
 	ihunting, err := this.service.GetModule(comm.ModuleHunting)
 	if err != nil {
-		code = pb.ErrorCode_SystemError
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ExternalModule,
+			Title:   pb.ErrorCode_ExternalModule.ToString(),
+			Message: err.Error(),
+		}
 		return
 	}
 
@@ -60,7 +72,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler
 	//维京远征
 	iviking, err := this.service.GetModule(comm.ModuleViking)
 	if err != nil {
-		code = pb.ErrorCode_SystemError
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ExternalModule,
+			Title:   pb.ErrorCode_ExternalModule.ToString(),
+			Message: err.Error(),
+		}
 		return
 	}
 

modules/user/api_changetips.go

@@ -6,20 +6,20 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 )
 
-//参数校验
+// 参数校验
 func (this *apiComp) ChangeTipsCheck(session comm.IUserSession, req *pb.UserChangeTipsReq) (errdata *pb.ErrorData) {
 
 	return
 }
 
-//修改提示次数
+// 修改提示次数
 func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTipsReq) (errdata *pb.ErrorData) {
 
 	update := make(map[string]interface{}, 0)
 	if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil {
 
 		if conf := this.module.ModuleTools.GetGlobalConf().DailyTips; conf.N > 0 {
-			if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); errdata != nil {
+			if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); errdata != nil {
 				return
 			}
 		}

modules/user/api_create.go

@@ -11,19 +11,18 @@ import (
 func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData) {
 	name := strings.TrimSpace(req.NickName)
 	if name == "" || len(name) > 30 {
-		code = pb.ErrorCode_UserNickNameEmpty
+		errdata = &pb.ErrorData{
-		this.module.Error("参数错误",
+			Code:  pb.ErrorCode_UserNickNameEmpty,
-			log.Field{Key: "uid", Value: session.GetUserId()},
+			Title: pb.ErrorCode_UserNickNameEmpty.ToString(),
-			log.Field{Key: "params", Value: req.String()},
+		}
-		)
 	}
 
 	return
 }
 
 // 创角
-func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData, edata *pb.ErrorData) {
+func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData) {
-	if code = this.CreateCheck(session, req); errdata != nil {
+	if errdata = this.CreateCheck(session, req); errdata != nil {
 		return
 	}
 
@@ -32,20 +31,28 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 	//获取用户
 	self := this.module.modelUser.GetUser(session.GetUserId())
 	if self == nil {
-		code = pb.ErrorCode_UserSessionNobeing
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_UserNofound,
+			Title: pb.ErrorCode_UserNofound.ToString(),
+		}
 		return
 	}
 
 	//已否已创角
 	if self.Created {
-		code = pb.ErrorCode_RoleCreated
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_RoleCreated,
+			Title: pb.ErrorCode_RoleCreated.ToString(),
+		}
 		return
 	}
 
 	//查询昵称是否重复
 	if ok := this.module.modelUser.NickNameIsExist(req.NickName); !ok {
-		code = pb.ErrorCode_UserNickNameExist
+		errdata = &pb.ErrorData{
-		// this.sendMsg(session, UserSubTypeCreate, resp)
+			Code:  pb.ErrorCode_UserNickNameExist,
+			Title: pb.ErrorCode_UserNickNameExist.ToString(),
+		}
 		return
 	}
 
@@ -72,7 +79,10 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 	}
 
 	if err := this.module.modelUser.Change(uid, update); err != nil {
-		code = pb.ErrorCode_DBError
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_DBError,
+			Title: pb.ErrorCode_DBError.ToString(),
+		}
 		this.module.Error("创角",
 			log.Field{Key: "uid", Value: uid},
 			log.Field{Key: "params", Value: update},

modules/worldtask/api_mine.go

@@ -18,17 +18,25 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineR
 
 func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (errdata *pb.ErrorData) {
 	uid := session.GetUserId()
-	data = &pb.ErrorData{}
+
 	user := this.module.ModuleUser.GetUser(uid)
 	if user == nil {
-		code = pb.ErrorCode_UserNofound
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_UserNofound,
+			Title:   pb.ErrorCode_UserNofound.ToString(),
+			Message: "战斗记录是空",
+		}
 		return
 	}
 
 	myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid)
 	if err != nil {
 		this.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
-		code = pb.ErrorCode_DBError
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
 		return
 	}
 

modules/worldtask/model_worldtask.go

@@ -139,7 +139,7 @@ func (this *ModelWorldtask) checkCondi(uid string, condiId int32) bool {
 	if m, err := this.service.GetModule(comm.ModuleRtask); err == nil {
 		iwt, ok := m.(comm.IRtask)
 		if ok {
-			if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success {
+			if errdata := iwt.CheckCondi(uid, condiId); errdata != nil {
 				this.moduleWorldtask.Debug("任务完成条件不满足",
 					log.Field{Key: "uid", Value: uid},
 					log.Field{Key: "condiId", Value: condiId},