refactor(log): consolidate logging models and update related logic for improved clarity and functionality
This commit is contained in:
@@ -3,6 +3,7 @@ package user
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/log"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/user"
|
||||
@@ -44,14 +45,20 @@ func (l *QueryUserAffiliateLogic) QueryUserAffiliate() (resp *types.QueryUserAff
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query User Affiliate failed: %v", err)
|
||||
}
|
||||
err = l.svcCtx.UserModel.Transaction(l.ctx, func(db *gorm.DB) error {
|
||||
return db.Model(&user.CommissionLog{}).
|
||||
Where("user_id = ?", u.Id).
|
||||
Select("COALESCE(SUM(amount), 0)").
|
||||
Scan(&sum).Error
|
||||
data, _, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &log.FilterParams{
|
||||
Page: 1,
|
||||
Size: 99999,
|
||||
Type: log.TypeCommission.Uint8(),
|
||||
ObjectID: u.Id,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query User Affiliate failed: %v", err)
|
||||
|
||||
for _, datum := range data {
|
||||
content := log.Commission{}
|
||||
if err = content.Unmarshal([]byte(datum.Content)); err != nil {
|
||||
l.Errorf("[QueryUserAffiliate] unmarshal comission log failed: %v", err.Error())
|
||||
continue
|
||||
}
|
||||
sum += content.Amount
|
||||
}
|
||||
|
||||
return &types.QueryUserAffiliateCountResponse{
|
||||
|
||||
Reference in New Issue
Block a user