From 1c0d91424adebd0a46a0491e5f82eb34c32eaf9d Mon Sep 17 00:00:00 2001
From: Rinai <rinai@g-rinai.cn>
Date: Fri, 27 Jun 2025 16:49:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20niuniu=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20bug=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=87=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=20(#1177)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/niuniu/main.go | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugin/niuniu/main.go b/plugin/niuniu/main.go
index 40028efb..ed618c44 100644
--- a/plugin/niuniu/main.go
+++ b/plugin/niuniu/main.go
@@ -81,7 +81,7 @@ func init() {
 		for {
 			select {
 			case <-timer.C:
-				ctx.SendChain(message.At(uid), message.Text(" 超时,已自动取消"))
+				ctx.SendChain(message.At(uid), message.Text(" 超时，已自动取消"))
 				return
 			case r := <-recv:
 				answer = r.Event.Message.String()
@@ -109,6 +109,12 @@ func init() {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
 		}
+		// 数据库操作成功之后，及时删除残留的缓存
+		key := fmt.Sprintf("%d_%d", gid, uid)
+		_, ok := jjCount.Load(key)
+		if ok {
+			jjCount.Delete(key)
+		}
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(sell))
 	})
 	en.OnFullMatch("牛牛背包", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
@@ -165,7 +171,7 @@ func init() {
 		for {
 			select {
 			case <-timer.C:
-				ctx.SendChain(message.At(uid), message.Text(" 超时,已自动取消"))
+				ctx.SendChain(message.At(uid), message.Text(" 超时，已自动取消"))
 				return
 			case r := <-recv:
 				answer = r.Event.Message.String()
@@ -196,16 +202,16 @@ func init() {
 		}
 
 		if time.Since(last.TimeLimit) > time.Hour {
-			ctx.SendChain(message.Text("时间已经过期了,牛牛已被收回!"))
+			ctx.SendChain(message.Text("时间已经过期了，牛牛已被收回!"))
 			jjCount.Delete(fmt.Sprintf("%d_%d", gid, uid))
 			return
 		}
 
 		if last.Count < 4 {
-			ctx.SendChain(message.Text("你还没有被厥够4次呢,不能赎牛牛"))
+			ctx.SendChain(message.Text("你还没有被厥够4次呢，不能赎牛牛"))
 			return
 		}
-		ctx.SendChain(message.Text("再次确认一下哦,这次赎牛牛，牛牛长度将会变成", last.Length, "cm\n还需要嘛【是|否】"))
+		ctx.SendChain(message.Text("再次确认一下哦，这次赎牛牛，牛牛长度将会变成", last.Length, "cm\n还需要嘛【是|否】"))
 		recv, cancel := zero.NewFutureEvent("message", 999, false, zero.CheckUser(uid), zero.CheckGroup(gid), zero.RegexRule(`^(是|否)$`)).Repeat()
 		defer cancel()
 		timer := time.NewTimer(2 * time.Minute)
@@ -222,11 +228,11 @@ func init() {
 					return
 				}
 
-				if err := niu.Redeem(gid, uid, last.Length); err == nil {
+				if err := niu.Redeem(gid, uid, last.Length); err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-
+				// 成功赎回，删除残留的缓存。
 				jjCount.Delete(fmt.Sprintf("%d_%d", gid, uid))
 
 				ctx.SendChain(message.At(uid), message.Text(fmt.Sprintf("恭喜你!成功赎回牛牛,当前长度为:%.2fcm", last.Length)))
@@ -342,8 +348,9 @@ func init() {
 		j := fmt.Sprintf("%d_%d", gid, adduser)
 		count, ok := jjCount.Load(j)
 		var c lastLength
-		// 按照最后一次被jj时的时间计算，超过60分钟则重置
+		// 按照最后一次被 jj 时的时间计算，超过60分钟则重置
 		if !ok {
+			// 第一次被 jj
 			c = lastLength{
 				TimeLimit: time.Now(),
 				Count:     1,
@@ -355,6 +362,7 @@ func init() {
 				Count:     count.Count + 1,
 				Length:    count.Length,
 			}
+			// 超时了，重置
 			if time.Since(c.TimeLimit) > time.Hour {
 				c = lastLength{
 					TimeLimit: time.Now(),