新功能(#18): 用户提现记录支持区分提现和退佣 (#18)

Co-authored-by: multica-agent <github@multica.ai>

internal/logic/public/user/queryWithdrawalLogLogic.go

@@ -3,6 +3,7 @@ package user
 import (
 	"context"
 
+	"github.com/perfect-panel/server/internal/model/log"
 	"github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
@@ -12,6 +13,11 @@ import (
 	"github.com/pkg/errors"
 )
 
+const (
+	withdrawalLogBizTypeWithdrawal       = "withdrawal"
+	withdrawalLogBizTypeCommissionRefund = "commission_refund"
+)
+
 type QueryWithdrawalLogLogic struct {
 	logger.Logger
 	ctx    context.Context
@@ -43,15 +49,26 @@ func (l *QueryWithdrawalLogLogic) QueryWithdrawalLog(req *types.QueryWithdrawalL
 		size = 10
 	}
 
-	query := l.svcCtx.DB.WithContext(l.ctx).Model(&user.Withdrawal{}).Where("user_id = ?", u.Id)
+	switch req.BizType {
+	case "", withdrawalLogBizTypeWithdrawal:
+		return l.queryWithdrawalLogs(u.Id, page, size)
+	case withdrawalLogBizTypeCommissionRefund:
+		return l.queryCommissionRefundLogs(u.Id, page, size)
+	default:
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "invalid biz_type: %s", req.BizType)
+	}
+}
+
+func (l *QueryWithdrawalLogLogic) queryWithdrawalLogs(userID int64, page, size int) (*types.QueryWithdrawalLogListResponse, error) {
+	query := l.svcCtx.DB.WithContext(l.ctx).Model(&user.Withdrawal{}).Where("user_id = ?", userID)
 
 	var total int64
-	if err = query.Count(&total).Error; err != nil {
+	if err := query.Count(&total).Error; err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count withdrawal logs failed: %v", err)
 	}
 
 	var rows []user.Withdrawal
-	if err = query.Order("id DESC").Limit(size).Offset((page - 1) * size).Find(&rows).Error; err != nil {
+	if err := query.Order("id DESC").Limit(size).Offset((page - 1) * size).Find(&rows).Error; err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query withdrawal logs failed: %v", err)
 	}
 
@@ -59,6 +76,7 @@ func (l *QueryWithdrawalLogLogic) QueryWithdrawalLog(req *types.QueryWithdrawalL
 	for _, row := range rows {
 		list = append(list, types.WithdrawalLog{
 			Id:        row.Id,
+			BizType:   withdrawalLogBizTypeWithdrawal,
 			UserId:    row.UserId,
 			Amount:    row.Amount,
 			Content:   row.Content,
@@ -77,3 +95,53 @@ func (l *QueryWithdrawalLogLogic) QueryWithdrawalLog(req *types.QueryWithdrawalL
 		Total: total,
 	}, nil
 }
+
+func (l *QueryWithdrawalLogLogic) queryCommissionRefundLogs(userID int64, page, size int) (*types.QueryWithdrawalLogListResponse, error) {
+	query := l.svcCtx.DB.WithContext(l.ctx).
+		Model(&log.SystemLog{}).
+		Where("`type` = ? AND object_id = ? AND `content` LIKE ?", log.TypeCommission.Uint8(), userID, "%\"type\":333%")
+
+	var total int64
+	if err := query.Count(&total).Error; err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count commission refund logs failed: %v", err)
+	}
+
+	var rows []log.SystemLog
+	if err := query.Order("id DESC").Limit(size).Offset((page - 1) * size).Find(&rows).Error; err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query commission refund logs failed: %v", err)
+	}
+
+	list := make([]types.WithdrawalLog, 0, len(rows))
+	for _, row := range rows {
+		var content log.Commission
+		if err := content.Unmarshal([]byte(row.Content)); err != nil {
+			l.Errorw("unmarshal commission refund log content failed",
+				logger.Field("log_id", row.Id),
+				logger.Field("error", err.Error()),
+			)
+			continue
+		}
+		if content.Type != log.CommissionTypeRefund {
+			continue
+		}
+
+		timestamp := content.Timestamp
+		if timestamp == 0 {
+			timestamp = row.CreatedAt.UnixMilli()
+		}
+		list = append(list, types.WithdrawalLog{
+			Id:        row.Id,
+			BizType:   withdrawalLogBizTypeCommissionRefund,
+			UserId:    row.ObjectID,
+			Amount:    content.Amount,
+			Content:   row.Content,
+			CreatedAt: timestamp,
+			UpdatedAt: timestamp,
+		})
+	}
+
+	return &types.QueryWithdrawalLogListResponse{
+		List:  list,
+		Total: total,
+	}, nil
+}