Merge remote-tracking branch 'origin/master'

This commit is contained in:
chy
2025-06-25 10:35:15 +08:00
30 changed files with 216 additions and 488 deletions

View File

@ -480,15 +480,7 @@ func (s *sReward) GetGoodsDetails(ctx context.Context, in *model.GetGoodsDetails
func (s *sReward) OperateTaskReward(ctx context.Context, in *model.OperateTaskRewardIn) (out *model.OperateTaskRewardOut, err error) {
// 如果是系统管理员给任务添加奖励,需要校验奖励的来源
exist, err := dao.Tasks.Ctx(ctx).Where(do.Tasks{Id: in.TaskId}).Exist()
if err != nil {
return nil, ecode.Fail.Sub("任务不存在")
}
if !exist {
return nil, ecode.Params.Sub("任务不存在")
}
exist, err = dao.Rewards.Ctx(ctx).Where(do.Rewards{Id: in.RewardId}).Exist()
exist, err := dao.Rewards.Ctx(ctx).Where(do.Rewards{Id: in.RewardId}).Exist()
if err != nil {
return nil, ecode.Fail.Sub("奖励不存在")
}