修改公会解散CD

modules/sociaty/api_cross_dismiss.go

@@ -46,17 +46,28 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe
 	globalCnf := this.module.globalConf
 	var isUpdate bool
 	if sociaty.DismissTime == 0 {
-		//更新解散倒计时
+		if sociaty.DismissCD == 0 {
-		update["dismissTime"] = utils.AddHour(int(globalCnf.GuildDissolutionCountDownCd)).Unix()
+			//更新解散倒计时
-		isUpdate = true
+			update["dismissTime"] = utils.AddHour(int(globalCnf.GuildDissolutionCountDownCd)).Unix()
-	} else {
+		} else {
-		if req.Dismiss == 1 { //取消解散
 			if utils.IsInCDHour(int64(sociaty.DismissCD)) {
 				code = pb.ErrorCode_SociatyCDLimit
 				return
 			} else {
+				update["dismissCD"] = utils.AddHour(int(globalCnf.GuildDissolutionCd)).Unix()
+			}
+		}
+		isUpdate = true
+	} else {
+		if req.Dismiss == 1 { //取消解散
+			if sociaty.DismissCD == 0 {
 				// 设置冷区时间
 				update["dismissCD"] = utils.AddHour(int(globalCnf.GuildDissolutionCd)).Unix()
+			} else {
+				if utils.IsInCDHour(int64(sociaty.DismissCD)) {
+					code = pb.ErrorCode_SociatyCDLimit
+					return
+				}
 			}
 			//取消倒计时
 			update["dismissTime"] = 0