Northern_Lights/ZeroBot-Plugin
1
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2025-12-19 05:30:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(wallet): 修复钱包余额判断逻辑 (#957)

Browse Source 
- ”管理钱包余额“里的amount变量带符号
- “钱包转账”里的amount变量不带符号
This commit is contained in:
vatebur 2024-08-19 23:56:04 +08:00 committed by GitHub
parent 5d2898bc53
commit 31b70179f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1311,7 +1311,7 @@ print("run[CQ:image,file="+j["img"]+"]")
- [x] 管理钱包余额[+金额|-金额][@xxx] - [x] 管理钱包余额[+金额|-金额][@xxx]
- [x] 查看我的钱包|查询钱包余额[@xxx] - [x] 查看我的钱包|查看钱包余额[@xxx]
- [x] 钱包转账[金额][@xxx] - [x] 钱包转账[金额][@xxx]

12
plugin/wallet/wallet.go
View File

@ -29,7 +29,7 @@ func init() {
Help: "- 查看钱包排名\n" + Help: "- 查看钱包排名\n" +
"- 设置硬币名称XX\n" + "- 设置硬币名称XX\n" +
"- 管理钱包余额[+金额|-金额][@xxx]\n" + "- 管理钱包余额[+金额|-金额][@xxx]\n" +
"- 查看我的钱包|查询钱包余额[@xxx]\n" + "- 查看我的钱包|查看钱包余额[@xxx]\n" +
"- 钱包转账[金额][@xxx]\n" + "- 钱包转账[金额][@xxx]\n" +
"注：仅超级用户能“管理钱包余额”\n", "注：仅超级用户能“管理钱包余额”\n",
PrivateDataFolder: "wallet", PrivateDataFolder: "wallet",
@ -177,8 +177,8 @@ func init() {
ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("QQ号处理失败")) ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("QQ号处理失败"))
return return
} }
if amount < wallet.GetWalletOf(uidInt) { if amount+wallet.GetWalletOf(uidInt) < 0 {
ctx.SendChain(message.Text("管理失败:对方钱包余额不足，扣款失败:")) ctx.SendChain(message.Text("管理失败:对方钱包余额不足，扣款失败"))
return return
} }
err = wallet.InsertWalletOf(uidInt, amount) err = wallet.InsertWalletOf(uidInt, amount)
@ -190,7 +190,7 @@ func init() {
}) })
// 保留用户习惯,兼容旧语法“查看我的钱包” // 保留用户习惯,兼容旧语法“查看我的钱包”
en.OnPrefixGroup([]string{`查询钱包余额`, `查看我的钱包`}).SetBlock(true).Limit(ctxext.LimitByGroup). en.OnPrefixGroup([]string{`查看钱包余额`, `查看我的钱包`}).SetBlock(true).Limit(ctxext.LimitByGroup).
Handle(func(ctx *zero.Ctx) { Handle(func(ctx *zero.Ctx) {
param := ctx.State["args"].(string) param := ctx.State["args"].(string)
var uidStr string var uidStr string
@ -212,8 +212,8 @@ func init() {
Handle(func(ctx *zero.Ctx) { Handle(func(ctx *zero.Ctx) {
param := strings.TrimSpace(ctx.State["args"].(string)) param := strings.TrimSpace(ctx.State["args"].(string))
// 捕获修改的金额 // 捕获修改的金额,amount扣款金额恒正（要注意符号）
re := regexp.MustCompile(`^[+-]?\d+$`) re := regexp.MustCompile(`^[+]?\d+$`)
amount, err := strconv.Atoi(re.FindString(param)) amount, err := strconv.Atoi(re.FindString(param))
if err != nil || amount <= 0 { if err != nil || amount <= 0 {
ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("输入额异常，请检查金额或at是否正常")) ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("输入额异常，请检查金额或at是否正常"))