From 4211c887cf2206284fef8b685915ef063c757174 Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Fri, 19 Jul 2024 17:53:54 +0800
Subject: [PATCH] fix

---
 app/mix/dao/mysql_zone.go         | 6 +++---
 app/mix/service/logic/vas_zone.go | 4 ++--
 app/mix/service/vasservice.go     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/mix/dao/mysql_zone.go b/app/mix/dao/mysql_zone.go
index 0ae10e1d..a3dd764b 100644
--- a/app/mix/dao/mysql_zone.go
+++ b/app/mix/dao/mysql_zone.go
@@ -592,10 +592,10 @@ func (m *Mysql) GetZoneMemberCountGroupByZoneMemberType(ctx *gin.Context, tx *sq
 }
 
 // 回滚空间退出状态
-func (m *Mysql) RollbackZoneAdmissionExitStatus(ctx *gin.Context, tx *sqlx.Tx, orderCt, id int64) error {
+func (m *Mysql) RollbackZoneAdmissionExitStatus(ctx *gin.Context, tx *sqlx.Tx, orderCt, mid, zid int64) error {
 	var err error
-	sqlStr := "update " + TableVasZoneUnlock + " set admission_ct=?, admission_until=?, admission_unlock_type=? where id=?"
-	args := []any{orderCt, -1, dbstruct.ZoneUnlockTypePay, id}
+	sqlStr := "update " + TableVasZoneUnlock + " set admission_ct=?, admission_until=?, admission_unlock_type=? where mid=? and zid=?"
+	args := []any{orderCt, -1, dbstruct.ZoneUnlockTypePay, mid, zid}
 	if tx != nil {
 		_, err = tx.ExecContext(ctx, sqlStr, args...)
 	} else {
diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go
index 1315602b..016db994 100644
--- a/app/mix/service/logic/vas_zone.go
+++ b/app/mix/service/logic/vas_zone.go
@@ -1291,6 +1291,6 @@ func (v *Vas) ZoneGetIncomePage(ctx *gin.Context, mid int64) (*vasproto.IncomePa
 }
 
 // 获取动态解锁记录
-func (v *Vas) RollbackZoneAdmissionExitStatus(ctx *gin.Context, ct, id int64) (err error) {
-	return v.store.RollbackZoneAdmissionExitStatus(ctx, nil, ct, id)
+func (v *Vas) RollbackZoneAdmissionExitStatus(ctx *gin.Context, ct, mid, zid int64) (err error) {
+	return v.store.RollbackZoneAdmissionExitStatus(ctx, nil, ct, mid, zid)
 }
diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go
index ff04a28f..81820e96 100644
--- a/app/mix/service/vasservice.go
+++ b/app/mix/service/vasservice.go
@@ -1228,7 +1228,7 @@ func (s *Service) OpRollbackZoneAdmissionExitStatus(ctx *gin.Context, req *zonep
 	}
 
 	// 回滚
-	err = _DefaultVas.RollbackZoneAdmissionExitStatus(ctx, order.GetUt(), zu.GetId())
+	err = _DefaultVas.RollbackZoneAdmissionExitStatus(ctx, order.GetUt(), uMid, zid)
 	if err != nil {
 		logger.Error("RollbackZoneAdmissionExitStatus fail, mid: %v, sMid: %v, zid: %v, zu: %v, err: %v", uMid, sMid, zid, util.ToJson(zu), err)
 		return