修改

game-server/backend/backstage/app/api/channel/api.go

@@ -606,7 +606,7 @@ func (a *API) FetchPageChannelPromotionOfAllDay(ctx *gin.Context) {
 			ViewNumPrice:     a.computeChannelDataPrice(item.ViewNum, item.CostMoney),
 			DownloadNum:      item.DownloadNum,
 			DownloadNumPrice: a.computeChannelDataPrice(item.DownloadNum, item.CostMoney),
-			DownloadNumRate:  a.computeChannelDataRate(item.ViewNum, item.ViewNum),
+			DownloadNumRate:  a.computeChannelDataRate(item.DownloadNum, item.ViewNum),
 			InstallNum:       item.InstallNum,
 			InstallNumPrice:  a.computeChannelDataPrice(item.InstallNum, item.CostMoney),
 			InstallNumRate:   a.computeChannelDataRate(item.InstallNum, item.DownloadNum),

game-server/backend/backstage/app/api/order/api.go

@@ -10,6 +10,7 @@ import (
 	"github.com/go-playground/validator/v10"
 	"math"
 	"strconv"
+	adminsvc "xgame/backend/backstage/app/service/admin"
 	"xgame/internal/http/helper"
 	ordersvc "xgame/internal/service/order"
 	orderpb "xgame/internal/service/order/pb"
@@ -53,6 +54,14 @@ func (a *API) FetchPageRechargeOrders(ctx *gin.Context) {
 		helper.Fail(ctx, codes.InternalError)
 	}
 
+	// 查询管理员列表
+	adminNameMap, err := adminsvc.NewService().FetchAdminListOfName(context.Background(), &adminsvc.FetchAdminListArgs{
+		Page: 1,
+	})
+	if err != nil {
+		helper.Fail(ctx, codes.Convert(err))
+	}
+
 	reply, err := client.FetchPageRechargeOrders(context.Background(), &orderpb.FetchRechargeOrdersArgs{
 		Page:        req.Page,
 		Limit:       req.Limit,
@@ -73,6 +82,11 @@ func (a *API) FetchPageRechargeOrders(ctx *gin.Context) {
 	data.TotalPage = int32(math.Ceil(float64(reply.Total) / float64(req.Limit)))
 
 	for _, item := range reply.List {
+		operatorName := ""
+		if item.Operator != "" {
+			operatorId, _ := strconv.Atoi(item.Operator)
+			operatorName = adminNameMap[int64(operatorId)]
+		}
 		data.List = append(data.List, &rechargeOrder{
 			Id:             item.Id,
 			OrderNo:        item.OrderNo,
@@ -87,7 +101,7 @@ func (a *API) FetchPageRechargeOrders(ctx *gin.Context) {
 			IfFirstCharge:  item.IfFirstCharge,
 			IsThatDay:      item.IsThatDay,
 			Msg:            item.Msg,
-			Operator:       item.Operator,
+			Operator:       operatorName,
 			OtherInfo:      item.OtherInfo,
 			CreatedTime:    xtime.Unix(item.CreatedTime, 0).Format(xtime.DatetimeLayout),
 			EndTime:        xtime.Unix(item.EndTime, 0).Format(xtime.DatetimeLayout),
@@ -277,6 +291,14 @@ func (a *API) FetchPageExchangeOrders(ctx *gin.Context) {
 		helper.Fail(ctx, codes.InternalError)
 	}
 
+	// 查询管理员列表
+	adminNameMap, err := adminsvc.NewService().FetchAdminListOfName(context.Background(), &adminsvc.FetchAdminListArgs{
+		Page: 1,
+	})
+	if err != nil {
+		helper.Fail(ctx, codes.Convert(err))
+	}
+
 	reply, err := client.FetchPageExchangeOrders(context.Background(), &orderpb.FetchExchangeOrdersArgs{
 		Page:        req.Page,
 		Limit:       req.Limit,
@@ -297,6 +319,11 @@ func (a *API) FetchPageExchangeOrders(ctx *gin.Context) {
 	data.TotalPage = int32(math.Ceil(float64(reply.Total) / float64(req.Limit)))
 
 	for _, item := range reply.List {
+		operatorName := ""
+		if item.Operator != "" {
+			operatorId, _ := strconv.Atoi(item.Operator)
+			operatorName = adminNameMap[int64(operatorId)]
+		}
 		data.List = append(data.List, &exchangeOrder{
 			Id:                item.Id,
 			OrderNo:           item.OrderNo,
@@ -316,7 +343,7 @@ func (a *API) FetchPageExchangeOrders(ctx *gin.Context) {
 			Feedback:          item.Feedback,
 			Money:             item.Money,
 			Msg:               item.Msg,
-			Operator:          item.Operator,
+			Operator:          operatorName,
 			OtherInfo:         item.OtherInfo,
 			CreatedTime:       xtime.Unix(item.CreatedTime, 0).Format(xtime.DatetimeLayout),
 			EndTime:           xtime.Unix(item.EndTime, 0).Format(xtime.DatetimeLayout),