modules/smithy/api_receive.go

@@ -25,6 +25,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwar
 	if err := this.module.modelTask.updateTaskRecord(session.GetUserId(), req.TaskId); err != nil {
 		var errCustom = new(comm.CustomError)
 		if errors.As(err, &errCustom) {
+			//code = errCustom.Code
 			errdata = &pb.ErrorData{
 				Code:    errCustom.Code,
 				Title:   errCustom.Code.ToString(),

modules/smithy/api_refuse.go

@@ -1,7 +1,6 @@
 package smithy
 
 import (
-	"errors"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 )
@@ -23,19 +22,10 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq)
 
 	cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
 	if err != nil {
-		var errCustom = new(comm.CustomError)
+		errdata = &pb.ErrorData{
-		if errors.As(err, &errCustom) {
+			Code:    pb.ErrorCode_DBError,
-			errdata = &pb.ErrorData{
+			Title:   pb.ErrorCode_DBError.ToString(),
-				Code:    errCustom.Code,
+			Message: err.Error(),
-				Title:   errCustom.Code.ToString(),
-				Message: err.Error(),
-			}
-		} else {
-			errdata = &pb.ErrorData{
-				Code:    pb.ErrorCode_DBError,
-				Title:   pb.ErrorCode_DBError.ToString(),
-				Message: err.Error(),
-			}
 		}
 		return
 	}

modules/smithy/model_task.go

@@ -86,35 +86,29 @@ func (this *modelTask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
 				tt.Received = 1
 			}
 			dt.Tasks = append(dt.Tasks, tt)
-		}
+			update["tasks"] = dt.Tasks
-		update["tasks"] = dt.Tasks
+			if err := this.Change(uid, update); err != nil {
-		if err := this.Change(uid, update); err != nil {
+				this.module.Error(err.Error())
-			this.module.Error(err.Error())
+				return
+			}
 			return
 		}
-		return
 	}
 
-	var newTask []*pb.TujianTask
+	for _, t := range dt.Tasks {
-	existTaskMap := make(map[int32]*pb.TujianTask)
+		for k, v := range condMap {
-	for _, task := range dt.Tasks {
+			// update
-		existTaskMap[task.TaskId] = task
+			if t.TaskId == k {
-	}
+				t.Cond = v
-
+			} else {
-	for k, v := range condMap {
+				//add
-		if task, ok := existTaskMap[k]; ok {
+				dt.Tasks = append(dt.Tasks, &pb.TujianTask{
-			task.Cond = v
+					TaskId: k,
-			if v.State == pb.BuriedItemFinishState_buried_finish {
+					Cond:   v,
-				task.Received = 1
+				})
 			}
-		} else {
-			newTask = append(newTask, &pb.TujianTask{
-				TaskId: k,
-				Cond:   v,
-			})
 		}
 	}
-	dt.Tasks = append(dt.Tasks, newTask...)
 	update["tasks"] = dt.Tasks
 
 	if len(update) > 0 {
@@ -126,30 +120,44 @@ func (this *modelTask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
 }
 
 func (this *modelTask) updateTaskRecord(uid string, taskId int32) error {
+	// if !this.checkTaskStatus(uid, taskId) {
+	// 	return comm.NewCustomError(pb.ErrorCode_SmithyTaskNoFinished)
+	// }
 	dt, err := this.getTaskRecord(uid)
 	if err != nil {
 		if err == mongo.ErrNoDocuments {
+			// tj := &pb.DBTujianTask{Uid: uid}
+			// tj.Tasks = append(tj.Tasks, &pb.TujianTask{TaskId: taskId, Received: 2})
+			// return this.Add(uid, tj)
 			return comm.NewCustomError(pb.ErrorCode_SmithyTaskNoFinished)
 		}
 		return err
 	}
 
+	// taskMap := make(map[int32]int32)
 	update := make(map[string]interface{})
 
 	if dt.Uid != "" {
 		for _, v := range dt.Tasks {
 			if v.TaskId == taskId {
-				if v.Received == 1 {
+				if v.Cond != nil && v.Cond.State == pb.BuriedItemFinishState_buried_finish {
 					v.Received = 2
-				} else if v.Received == 2 {
-					return comm.NewCustomError(pb.ErrorCode_SmithyTaskReceived)
-				} else {
-					return comm.NewCustomError(pb.ErrorCode_SmithyTaskNoFinished)
 				}
-				break
+			} else {
+				return comm.NewCustomError(pb.ErrorCode_SmithyTaskNoFinished)
 			}
+			// 		taskMap[v.TaskId] = v.Received
+			// 	}
 		}
 
+		// if t, ok := taskMap[taskId]; ok {
+		// 	if t == 2 {
+		// 		return comm.NewCustomError(pb.ErrorCode_SmithyTaskReceived)
+		// 	} else {
+		// 		update["received"] = 2
+		// 	}
+		// } else {
+		// 	dt.Tasks = append(dt.Tasks, &pb.TujianTask{TaskId: taskId, Received: 2})
 		update["tasks"] = dt.Tasks
 	}
 
@@ -175,3 +183,15 @@ func (this *modelTask) checkReddot17107(uid string) bool {
 	}
 	return false
 }
+
+// 检查任务状态
+// func (this *modelTask) checkTaskStatus(uid string, taskId int32) bool {
+// 	conf, _ := this.module.configure.GetSmithyTask(taskId)
+// 	if conf == nil {
+// 		return false
+// 	}
+// 	// if ec := this.module.ModuleRtask.CheckCondi(uid, conf.TypeId); ec != nil {
+// 	// 	return false
+// 	// }
+// 	return true
+// }

modules/smithy/model_trade.go

@@ -136,7 +136,7 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) (*pb.DBCustome
 		//上限
 		limit := s.module.modelStove.StoveSkillAddCustomer(uid)
 		left := limit - cus.Total
-		if left < 0 {
+		if left <= 0 {
 			return nil, comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit)
 		}
 

modules/worldtask/model_worldtask.go

@@ -12,7 +12,6 @@ import (
 	"go_dreamfactory/utils"
 
 	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/x/bsonx"
 )
 
 type ModelWorldtask struct {
@@ -26,9 +25,6 @@ func (this *ModelWorldtask) Init(service core.IService, module core.IModule, com
 	this.TableName = comm.TableWorldtask
 	this.moduleWorldtask = module.(*Worldtask)
 	this.service = service
-	this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
-		Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
-	})
 	return
 }