jager/novatask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:分享返利备注以及eventid

Browse Source
This commit is contained in:
lianghuanjie
2025-01-10 19:25:41 +08:00
parent e2a7fcf603
commit f6a4bfce72
5 changed files with 62 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/logic/admin/send_email_reward_logic.go
View File

@@ -2,13 +2,10 @@ package admin
import ( import (
"context" "context"
"github.com/zeromicro/go-zero/core/threading"
"nova_task/internal/model"
"nova_task/internal/pkg/errs"
"strings"
"time"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/threading"
"nova_task/internal/consts"
"nova_task/internal/pkg/errs"
"nova_task/internal/svc" "nova_task/internal/svc"
) )
@@ -54,29 +51,7 @@ func (l *SendEmailRewardLogic) SendEmailReward() error {
continue continue
} }
// points,elite_points,castile,keys err = l.svcCtx.AddUserAsset(ctx, u.Id, consts.AssetType(rw.RewardType), rw.Value, rw.Remark, 0, 0, false)
switch strings.ToLower(rw.RewardType) {
case "points":
err = l.svcCtx.TaskAssetModel.AddPoint(ctx, u.Id, rw.Value)
case "elite_points":
err = l.svcCtx.TaskAssetModel.AddElitePoints(ctx, u.Id, rw.Value)
case "castile":
err = l.svcCtx.TaskAssetModel.AddCastile(ctx, u.Id, rw.Value)
case "keys":
err = l.svcCtx.TaskAssetModel.AddKeys(ctx, u.Id, int(rw.Value.IntPart()))
}
if err != nil {
l.Errorw("add asset failed", logx.Field("err", err), logx.Field("uid", u.Id), logx.Field("rewardType", rw.RewardType), logx.Field("value", rw.Value))
} else {
l.Infow("add asset success", logx.Field("uid", u.Id), logx.Field("rewardType", rw.RewardType), logx.Field("value", rw.Value))
}
_, err = l.svcCtx.TaskAssetRecordModel.Insert(ctx, &model.NhTaskAssetRecord{
Uid: int(u.Id),
AssetField: rw.RewardType,
Count: rw.Value.InexactFloat64(),
Remark: rw.Remark,
CreateTime: int(time.Now().Unix()),
})
if err != nil { if err != nil {
l.Errorw("insert task asset record failed", logx.Field("err", err), logx.Field("uid", u.Id), logx.Field("rewardType", rw.RewardType), logx.Field("value", rw.Value)) l.Errorw("insert task asset record failed", logx.Field("err", err), logx.Field("uid", u.Id), logx.Field("rewardType", rw.RewardType), logx.Field("value", rw.Value))
} }

35
internal/logic/nft/stake_settle_logic.go
View File

@@ -5,7 +5,8 @@ import (
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/spf13/cast" "github.com/spf13/cast"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
"nova_task/internal/model" "github.com/zeromicro/go-zero/core/stores/sqlx"
"nova_task/internal/consts"
"nova_task/internal/pkg/utils" "nova_task/internal/pkg/utils"
"nova_task/internal/svc" "nova_task/internal/svc"
"time" "time"
@@ -106,30 +107,20 @@ func (l *StakeSettleLogic) StakeSettle() {
gameBonus = taskConf.OccupyPercent gameBonus = taskConf.OccupyPercent
reward = reward.Mul(decimal.NewFromFloat(float64(100+gameBonus) / 100)) reward = reward.Mul(decimal.NewFromFloat(float64(100+gameBonus) / 100))
} }
err = l.svcCtx.StakeRewardModel.SetReward(l.ctx, uid, awardSeq, gameBonus, tokensDecimal, reward) err = l.svcCtx.DBConn.TransactCtx(l.ctx, func(ctx context.Context, session sqlx.Session) error {
if err != nil { err = l.svcCtx.StakeRewardModel.SetReward(l.ctx, uid, awardSeq, gameBonus, tokensDecimal, reward)
logx.Errorw("set reward failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward)) if err != nil {
continue //logx.Errorw("set reward failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward))
} return err
}
// 加资产 // 加资产
err = l.svcCtx.TaskAssetModel.AddCastile(l.ctx, uid, reward) err = l.svcCtx.AddUserAssetWithSession(l.ctx, session, uid, consts.AssetType_Castile, reward, "nft软质押奖励", 0, 0, false)
if err != nil { return err
logx.Errorw("add castile failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("reward", reward))
continue
}
// 加资产记录表
_, err = l.svcCtx.TaskAssetRecordModel.Insert(l.ctx, &model.NhTaskAssetRecord{
Uid: int(uid),
EventId: 0,
AssetField: "castile",
Count: reward.InexactFloat64(),
Remark: "nft软质押奖励",
ProvideUid: 0,
CreateTime: int(now.Unix()),
}) })
if err != nil { if err != nil {
logx.Errorw("insert task asset record failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("reward", reward)) logx.Errorw("质押结算发放奖励失败", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward))
} }
} }
} }

29
internal/logic/task/get_task_reward_logic.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/spf13/cast" "github.com/spf13/cast"
"github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stores/sqlx"
"nova_task/internal/consts"
"nova_task/internal/model" "nova_task/internal/model"
"nova_task/internal/pkg/errs" "nova_task/internal/pkg/errs"
"nova_task/internal/pkg/utils" "nova_task/internal/pkg/utils"
@@ -70,19 +71,21 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
return err return err
} }
// 给予用户奖励 // 给予用户奖励
err = l.svcCtx.TaskAssetModel.WithSession(session).AddPoint(l.ctx, uint(uid), decimal.NewFromInt(int64(task.Points))) err = l.svcCtx.AddUserAssetWithSession(l.ctx, session, uint(uid), consts.AssetType_Points, decimal.NewFromInt(int64(task.Points)), "完成任务："+task.Title, uint64(task.Id), 0, true)
if err != nil { //err = l.svcCtx.TaskAssetModel.WithSession(session).AddPoint(l.ctx, uint(uid), decimal.NewFromInt(int64(task.Points)))
return err //if err != nil {
} // return err
// 记录用户获奖记录 //}
_, err = l.svcCtx.TaskAssetRecordModel.Insert(l.ctx, &model.NhTaskAssetRecord{ //// 记录用户获奖记录
Uid: uid, //_, err = l.svcCtx.TaskAssetRecordModel.Insert(l.ctx, &model.NhTaskAssetRecord{
EventId: uint64(task.Id), // Uid: uid,
AssetField: "points", // EventId: uint64(task.Id),
Count: float64(task.Points), // AssetField: "points",
Remark: "完成任务：" + task.Title, // Count: float64(task.Points),
CreateTime: int(time.Now().Unix()), // Remark: "完成任务：" + task.Title,
}) // CreateTime: int(time.Now().Unix()),
//})
return err return err
}) })

4
internal/model/nh_task_asset_record_model.go
View File

@@ -16,7 +16,7 @@ type (
// and implement the added methods in customNhTaskAssetRecordModel. // and implement the added methods in customNhTaskAssetRecordModel.
NhTaskAssetRecordModel interface { NhTaskAssetRecordModel interface {
nhTaskAssetRecordModel nhTaskAssetRecordModel
withSession(session sqlx.Session) NhTaskAssetRecordModel WithSession(session sqlx.Session) NhTaskAssetRecordModel
} }
customNhTaskAssetRecordModel struct { customNhTaskAssetRecordModel struct {
@@ -31,7 +31,7 @@ func NewNhTaskAssetRecordModel(conn sqlx.SqlConn) NhTaskAssetRecordModel {
} }
} }
func (m *customNhTaskAssetRecordModel) withSession(session sqlx.Session) NhTaskAssetRecordModel { func (m *customNhTaskAssetRecordModel) WithSession(session sqlx.Session) NhTaskAssetRecordModel {
return NewNhTaskAssetRecordModel(sqlx.NewSqlConnFromSession(session)) return NewNhTaskAssetRecordModel(sqlx.NewSqlConnFromSession(session))
} }

39
internal/svc/service_context.go
View File

@@ -3,6 +3,7 @@ package svc
import ( import (
"context" "context"
"errors" "errors"
"fmt"
ea "github.com/earn-alliance/earnalliance-go" ea "github.com/earn-alliance/earnalliance-go"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
@@ -22,8 +23,8 @@ type ServiceContext struct {
Config config.Config Config config.Config
TaskModel model.NhTaskModel TaskModel model.NhTaskModel
TaskAssetModel model.NhTaskAssetModel taskAssetModel model.NhTaskAssetModel
TaskAssetRecordModel model.NhTaskAssetRecordModel taskAssetRecordModel model.NhTaskAssetRecordModel
TaskProgressModel model.NhTaskProgressModel TaskProgressModel model.NhTaskProgressModel
TwitterModel model.NhTwitterModel TwitterModel model.NhTwitterModel
PromoteBindModel model.NhPromoteBindModel PromoteBindModel model.NhPromoteBindModel
@@ -60,8 +61,8 @@ func NewServiceContext(c config.Config) *ServiceContext {
Config: c, Config: c,
TaskModel: model.NewNhTaskModel(dbConn), TaskModel: model.NewNhTaskModel(dbConn),
TaskAssetModel: model.NewNhTaskAssetModel(dbConn), taskAssetModel: model.NewNhTaskAssetModel(dbConn),
TaskAssetRecordModel: model.NewNhTaskAssetRecordModel(dbConn), taskAssetRecordModel: model.NewNhTaskAssetRecordModel(dbConn),
TaskProgressModel: model.NewNhTaskProgressModel(dbConn), TaskProgressModel: model.NewNhTaskProgressModel(dbConn),
TwitterModel: model.NewNhTwitterModel(dbConn), TwitterModel: model.NewNhTwitterModel(dbConn),
PromoteBindModel: model.NewNhPromoteBindModel(dbConn), PromoteBindModel: model.NewNhPromoteBindModel(dbConn),
@@ -149,24 +150,33 @@ func (s *ServiceContext) GetUidByEmail(ctx context.Context, email string) (uint,
return u.Id, nil return u.Id, nil
} }
func (s *ServiceContext) AddUserAsset(ctx context.Context, uid uint, asset consts.AssetType, amount decimal.Decimal, remark string, eventId uint64, provideUid uint, referralReward bool) error { func (s *ServiceContext) AddUserAssetWithSession(ctx context.Context, session sqlx.Session, uid uint, asset consts.AssetType, amount decimal.Decimal, remark string, eventId uint64, provideUid uint, referralReward bool) error {
var assetModel model.NhTaskAssetModel
var recordModel model.NhTaskAssetRecordModel
if session != nil {
assetModel = s.taskAssetModel.WithSession(session)
recordModel = s.taskAssetRecordModel.WithSession(session)
} else {
assetModel = s.taskAssetModel
recordModel = s.taskAssetRecordModel
}
var err error var err error
switch asset { switch asset {
case consts.AssetType_Points: case consts.AssetType_Points:
err = s.TaskAssetModel.AddPoint(ctx, uid, amount) err = assetModel.AddPoint(ctx, uid, amount)
case consts.AssetType_Castile: case consts.AssetType_Castile:
err = s.TaskAssetModel.AddCastile(ctx, uid, amount) err = assetModel.AddCastile(ctx, uid, amount)
case consts.AssetType_Elite_Points: case consts.AssetType_Elite_Points:
err = s.TaskAssetModel.AddElitePoints(ctx, uid, amount) err = assetModel.AddElitePoints(ctx, uid, amount)
case consts.AssetType_Keys: case consts.AssetType_Keys:
err = s.TaskAssetModel.AddKeys(ctx, uid, int(amount.IntPart())) err = assetModel.AddKeys(ctx, uid, int(amount.IntPart()))
default: default:
return errors.New("unknown asset type") return errors.New("unknown asset type")
} }
if err != nil { if err != nil {
return err return err
} }
_, err = s.TaskAssetRecordModel.Insert(ctx, &model.NhTaskAssetRecord{ _, err = recordModel.Insert(ctx, &model.NhTaskAssetRecord{
Uid: int(uid), Uid: int(uid),
EventId: eventId, EventId: eventId,
AssetField: string(asset), AssetField: string(asset),
@@ -198,6 +208,11 @@ func (s *ServiceContext) AddUserAsset(ctx context.Context, uid uint, asset const
} else if s.AmbassadorModel.IsAmbassador(ctx, pb.ShareUid) { } else if s.AmbassadorModel.IsAmbassador(ctx, pb.ShareUid) {
rate = 10 rate = 10
} }
rewardAmount := amount.Mul(decimal.NewFromFloat(float64(rate) / 100)) rated := decimal.NewFromFloat(float64(rate) / 100)
return s.AddUserAsset(ctx, pb.ShareUid, asset, rewardAmount, "referral reward", 0, uid, false) rewardAmount := amount.Mul(rated)
return s.AddUserAssetWithSession(ctx, session, pb.ShareUid, asset, rewardAmount, fmt.Sprintf("分享返利,比例%s", rated.String()), 7, uid, false)
}
func (s *ServiceContext) AddUserAsset(ctx context.Context, uid uint, asset consts.AssetType, amount decimal.Decimal, remark string, eventId uint64, provideUid uint, referralReward bool) error {
return s.AddUserAssetWithSession(ctx, nil, uid, asset, amount, remark, eventId, provideUid, referralReward)
} }