From 2239c0e54808787395e9e04072ffd0ef815466a0 Mon Sep 17 00:00:00 2001 From: u188 <302761125@qq.com> Date: Mon, 13 Sep 2021 07:44:36 +0000 Subject: [PATCH 1/3] =?UTF-8?q?update=20models/command.go.=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/command.go | 86 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/models/command.go b/models/command.go index f930aff..ced29fe 100644 --- a/models/command.go +++ b/models/command.go @@ -131,7 +131,7 @@ var codeSignals = []CodeSignal{ if zero.Unix() > u.ActiveAt.Unix() { first = true } else { - return fmt.Sprintf("你打过卡了，东币余额%d。", u.Coin) + return fmt.Sprintf("你打过卡了，互助值余额%d。", u.Coin) } } if first { @@ -148,17 +148,47 @@ var codeSignals = []CodeSignal{ "coin": gorm.Expr(fmt.Sprintf("coin+%d", coin)), }) u.Coin += coin - sender.Reply(fmt.Sprintf("你是打卡第%d人，奖励%d个东币，东币余额%d。", total[0]+1, coin, u.Coin)) + sender.Reply(fmt.Sprintf("你是打卡第%d人，奖励%d个互助值，互助值余额%d。", total[0]+1, coin, u.Coin)) ReturnCoin(sender) return "" } return nil }, }, - { - Command: []string{"coin", "东币", "余额", "yu", "yue"}, + { + Command: []string{"清零"}, + Admin: true, Handle: func(sender *Sender) interface{} { - return fmt.Sprintf("东币余额%d", GetCoin(sender.UserID)) + sender.handleJdCookies(func(ck *JdCookie) { + ck.Update(Priority, 1) + + }) + sender.Reply("优先级已清零") + return nil + }, + }, + { + Command: []string{"更新优先级"}, + Handle: func(sender *Sender) interface{} { + coin:=GetCoin(sender.UserID) + t:=time.Now() + if t.Weekday().String()=="Monday"{ + sender.handleJdCookies(func(ck *JdCookie) { + ck.Update(Priority, coin) + }) + sender.Reply("优先级已更新") + ClearCoin(sender.UserID) + }else{ + sender.Reply("等周一再更新呆瓜") + } + return nil + }, + }, + + { + Command: []string{"coin", "互助值", "余额", "yu", "yue"}, + Handle: func(sender *Sender) interface{} { + return fmt.Sprintf("互助值余额%d", GetCoin(sender.UserID)) }, }, @@ -251,10 +281,10 @@ var codeSignals = []CodeSignal{ } if !sender.IsAdmin { if cost > 1 { - return "你只能获得1东币" + return "你只能获得1互助值" } else { AddCoin(sender.UserID) - return "太可怜了，给你1东币" + return "太可怜了，给你1互助值" } } else { AdddCoin(sender.UserID, cost) @@ -274,9 +304,9 @@ var codeSignals = []CodeSignal{ } if err := db.Where("number = ?", sender.UserID).First(u).Error; err != nil || u.Coin < cost { - return "东币不足，先去打卡吧。" + return "互助值不足，先去打卡吧。" } else { - sender.Reply(fmt.Sprintf("你使用%d枚东币。", cost)) + sender.Reply(fmt.Sprintf("你使用%d枚互助值。", cost)) } baga := 0 if u.Coin > 100000 { @@ -285,18 +315,18 @@ var codeSignals = []CodeSignal{ } r := time.Now().Nanosecond() % 10 if r < 7 || baga > 0 { - sender.Reply(fmt.Sprintf("很遗憾你失去了%d枚东币。", cost)) + sender.Reply(fmt.Sprintf("很遗憾你失去了%d枚互助值。", cost)) cost = -cost } else { if r == 9 { cost *= 4 - sender.Reply(fmt.Sprintf("恭喜你4倍暴击获得%d枚东币，20秒后自动转入余额。", cost)) + sender.Reply(fmt.Sprintf("恭喜你4倍暴击获得%d枚互助值，20秒后自动转入余额。", cost)) time.Sleep(time.Second * 20) } else { - sender.Reply(fmt.Sprintf("很幸运你获得%d枚东币，10秒后自动转入余额。", cost)) + sender.Reply(fmt.Sprintf("很幸运你获得%d枚互助值，10秒后自动转入余额。", cost)) time.Sleep(time.Second * 10) } - sender.Reply(fmt.Sprintf("%d枚东币已到账。", cost)) + sender.Reply(fmt.Sprintf("%d枚互助值已到账。", cost)) } db.Model(u).Update("coin", gorm.Expr(fmt.Sprintf("coin + %d", cost))) return nil @@ -348,7 +378,7 @@ var codeSignals = []CodeSignal{ } u := &User{} if err := db.Where("number = ?", sender.UserID).First(u).Error; err != nil || u.Coin < cost { - return "东币不足，先去打卡吧。" + return "互助值不足，先去打卡吧。" } baga := 0 if u.Coin > 100000 { @@ -357,18 +387,18 @@ var codeSignals = []CodeSignal{ } r := time.Now().Nanosecond() % 10 if r < 6 || baga > 0 { - sender.Reply(fmt.Sprintf("很遗憾你失去了%d枚东币。", cost)) + sender.Reply(fmt.Sprintf("很遗憾你失去了%d枚互助值。", cost)) cost = -cost } else { if r == 9 { cost *= 2 - sender.Reply(fmt.Sprintf("恭喜你幸运暴击获得%d枚东币，20秒后自动转入余额。", cost)) + sender.Reply(fmt.Sprintf("恭喜你幸运暴击获得%d枚互助值，20秒后自动转入余额。", cost)) time.Sleep(time.Second * 20) } else { - sender.Reply(fmt.Sprintf("很幸运你获得%d枚东币，10秒后自动转入余额。", cost)) + sender.Reply(fmt.Sprintf("很幸运你获得%d枚互助值，10秒后自动转入余额。", cost)) time.Sleep(time.Second * 10) } - sender.Reply(fmt.Sprintf("%d枚东币已到账。", cost)) + sender.Reply(fmt.Sprintf("%d枚互助值已到账。", cost)) } db.Model(u).Update("coin", gorm.Expr(fmt.Sprintf("coin + %d", cost))) return nil @@ -414,7 +444,7 @@ var codeSignals = []CodeSignal{ u := &User{} if err := tx.Where("number = ?", sender.UserID).First(u).Error; err != nil { tx.Rollback() - return "东币不足，先去打卡吧。" + return "互助值不足，先去打卡吧。" } w := &Wish{ Content: ct, @@ -423,7 +453,7 @@ var codeSignals = []CodeSignal{ } if u.Coin < cost { tx.Rollback() - return fmt.Sprintf("东币不足，需要%d个东币。", cost) + return fmt.Sprintf("互助值不足，需要%d个互助值。", cost) } if err := tx.Create(w).Error; err != nil { tx.Rollback() @@ -435,7 +465,7 @@ var codeSignals = []CodeSignal{ } tx.Commit() (&JdCookie{}).Push(fmt.Sprintf("有人许愿%s，愿望id为%d。", w.Content, w.ID)) - return fmt.Sprintf("收到愿望，已扣除%d个东币。", cost) + return fmt.Sprintf("收到愿望，已扣除%d个互助值。", cost) }, }, { @@ -615,7 +645,7 @@ var codeSignals = []CodeSignal{ ).RowsAffected == 0 { return "先去打卡吧你。" } - return "东币+1" + return "互助值+1" }, }, { @@ -750,7 +780,7 @@ var codeSignals = []CodeSignal{ db.Model(User{}).Where("number = ?", sender.UserID).Updates(map[string]interface{}{ "coin": gorm.Expr(fmt.Sprintf("coin - %d", cost)), }) - return fmt.Sprintf("转账成功，扣除手续费%d枚东币。", cost) + return fmt.Sprintf("转账成功，扣除手续费%d枚互助值。", cost) } if amount > 10000 { return "单笔转账限额10000。" @@ -769,7 +799,7 @@ var codeSignals = []CodeSignal{ if !sender.IsAdmin { if amount <= cost { tx.Rollback() - return fmt.Sprintf("转账失败，手续费需要%d个东币。", cost) + return fmt.Sprintf("转账失败，手续费需要%d个互助值。", cost) } real = amount - cost } else { @@ -851,17 +881,17 @@ func ReturnCoin(sender *Sender) { "coin", gorm.Expr(fmt.Sprintf("coin + %d", w.Coin)), ).RowsAffected == 0 { tx.Rollback() - sender.Reply("愿望未达成退还东币失败。") + sender.Reply("愿望未达成退还互助值失败。") return } - sender.Reply(fmt.Sprintf("愿望未达成退还%d枚东币。", w.Coin)) + sender.Reply(fmt.Sprintf("愿望未达成退还%d枚互助值。", w.Coin)) if tx.Model(&w).Update( "status", 1, ).RowsAffected == 0 { tx.Rollback() - sender.Reply("愿望未达成退还东币失败。") + sender.Reply("愿望未达成退还互助值失败。") return } } tx.Commit() -} +} \ No newline at end of file From b6cb2f5648193777a83feeb385cf85b562cb9de2 Mon Sep 17 00:00:00 2001 From: u188 <302761125@qq.com> Date: Mon, 13 Sep 2021 07:46:12 +0000 Subject: [PATCH 2/3] =?UTF-8?q?update=20models/user.go.=20=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E5=80=BC=E9=87=8D=E6=96=B0=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/user.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/models/user.go b/models/user.go index 39135c1..8d438f4 100644 --- a/models/user.go +++ b/models/user.go @@ -14,6 +14,17 @@ type User struct { ActiveAt time.Time Coin int } +func ClearCoin(uid int) int { + var u User + if db.Where("number = ?", uid).First(&u).Error != nil { + return 0 + } + db.Model(u).Updates(map[string]interface{}{ + "coin": gorm.Expr(fmt.Sprintf("%d",1)), + }) + u.Coin=1 + return u.Coin +} func AdddCoin(uid int , num int) int { var u User if db.Where("number = ?", uid).First(&u).Error != nil { From 414994c2e952359fed58d92e6884065a758d867f Mon Sep 17 00:00:00 2001 From: u188 <302761125@qq.com> Date: Mon, 13 Sep 2021 07:48:36 +0000 Subject: [PATCH 3/3] =?UTF-8?q?update=20models/bot.go.=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=92=E5=8A=A9=E5=80=BC=E5=90=8D=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2QQ=E9=A3=8E=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/bot.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/bot.go b/models/bot.go index 89b247c..24e384e 100644 --- a/models/bot.go +++ b/models/bot.go @@ -175,10 +175,10 @@ var handleMessage = func(msgs ...interface{}) interface{} { if !sender.IsAdmin { coin := GetCoin(sender.UserID) if coin < 8 { - return "推一推需要8个许愿币。" + return "推一推需要8个互助值。" } RemCoin(sender.UserID, 8) - sender.Reply("推一推即将开始，已扣除8个许愿币。") + sender.Reply("推一推即将开始，已扣除8个互助值。") } runTask(&Task{Path: "jd_tyt.js", Envs: []Env{ {Name: "tytpacketId", Value: ss[1]}, @@ -276,7 +276,7 @@ var handleMessage = func(msgs ...interface{}) interface{} { } } } else { - sender.Reply(fmt.Sprintf("无效，东币-1，余额%d", RemCoin(sender.UserID, 1))) + sender.Reply(fmt.Sprintf("无效，互助值-1，余额%d", RemCoin(sender.UserID, 1))) } } go func() {