fix: 修复获取全部/文件读取/ReqShop/ReqShopReqShop 请求错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful

This commit is contained in:
xinian
2026-04-09 15:37:48 +08:00
parent d2cd601802
commit d0abb08d5b
2 changed files with 17 additions and 18 deletions

View File

@@ -4,36 +4,30 @@ import (
"blazing/cool"
"blazing/modules/player/model"
"context"
"errors"
"github.com/pointernil/bitset32"
)
func (s *TaskService) CanShop() bool {
return s.ShopRequirementError() == nil
}
func (s *TaskService) ShopRequirementError() error {
var gg *model.Task
s.dbm(s.Model).Where("task_id", 500).Scan(&gg)
if gg == nil {
return false
if gg == nil || !bitset32.From(gg.Data).Test(80) {
return errors.New("请先完成勇者任务80")
}
r := bitset32.From(gg.Data)
// 分支未完成时,标记完成并发放奖励
if !r.Test(70) {
return false
}
var ggg *model.Task
s.dbm(s.Model).Where("task_id", 600).Scan(&ggg)
if ggg == nil {
return false
if ggg == nil || !bitset32.From(ggg.Data).Test(50) {
return errors.New("请先完成试炼任务50")
}
// 分支未完成时,标记完成并发放奖励
if !bitset32.From(ggg.Data).Test(50) {
return false
}
return true
return nil
}
// 获取任务信息