From 6893ece693ac8916b9c85d8345b8a083f8f60d06 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 2 Feb 2024 18:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=B4=97=E7=BB=83=E5=B8=A6=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/equipment/api_ench.go        |  1 +
 modules/equipment/api_wash.go        |  4 +---
 modules/equipment/api_washconfirm.go | 22 +++++++++++++++-------
 modules/mergegroup/module.go         |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go
index 2630fee40..38863f6c2 100644
--- a/modules/equipment/api_ench.go
+++ b/modules/equipment/api_ench.go
@@ -43,6 +43,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
 		}
 		return
 	}
+
 	need = make([]*cfg.Gameatn, 0)
 	need = append(need, conf.Need...)
 	need = append(need, &cfg.Gameatn{
diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go
index ade48f36d..73540d207 100644
--- a/modules/equipment/api_wash.go
+++ b/modules/equipment/api_wash.go
@@ -35,8 +35,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
 	if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil {
 		this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err)
 		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_SystemError,
-			Title:   pb.ErrorCode_SystemError.ToString(),
+			Code:    pb.ErrorCode_DBError,
 			Message: err.Error(),
 		}
 		return
@@ -45,7 +44,6 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
 		this.module.Errorf("Equip_Check err:%v", err)
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ConfigNoFound,
-			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
 			Message: err.Error(),
 		}
 		return
diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go
index f48a64789..bc12d95f3 100644
--- a/modules/equipment/api_washconfirm.go
+++ b/modules/equipment/api_washconfirm.go
@@ -42,13 +42,7 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
 		}
 		return
 	}
-	if len(equip.AdverbEntry) != len(req.Pids) {
-		errdata = &pb.ErrorData{
-			Code:  pb.ErrorCode_ReqParameterError,
-			Title: pb.ErrorCode_ReqParameterError.ToString(),
-		}
-		return
-	}
+
 	if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil {
 		this.module.Errorf("Equip_Check err:%v", err)
 		errdata = &pb.ErrorData{
@@ -59,6 +53,13 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
 		return
 	}
 	if conf.EquipId == 1 {
+		if len(equip.AdverbEntry) != len(req.Pids) {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ReqParameterError,
+				Message: "AdverbEntry.count != Pids.count",
+			}
+			return
+		}
 		for i, v := range equip.AdverbEntry {
 			if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
 				errdata = &pb.ErrorData{
@@ -90,6 +91,13 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
 			return
 		}
 	} else {
+		if len(equip.Adverbskill) != len(req.Pids) {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ReqParameterError,
+				Message: "Adverbskill.count != Pids.count",
+			}
+			return
+		}
 		for i, v := range equip.Adverbskill {
 			if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
 				errdata = &pb.ErrorData{
diff --git a/modules/mergegroup/module.go b/modules/mergegroup/module.go
index 557b42d9c..8c30b2c2b 100644
--- a/modules/mergegroup/module.go
+++ b/modules/mergegroup/module.go
@@ -56,5 +56,5 @@ func (this *MergeGroup) Start() (err error) {
 
 //检查合并
 func (this *MergeGroup) CheckMerge() {
-
+	
 }