fix:edit /pay_recharge

desc/wechat/pay_recharge.api

@@ -7,6 +7,7 @@ type (
 
         // user_id | 用户ID 
         UserId  *string `json:"userId,optional"`
+		UserInfo UserInfo `json:"userInfo,optional"`
 
         // number | 变化积分数 
         Number  *float32 `json:"number,optional"`
@@ -22,6 +23,7 @@ type (
 
         // organization_id | 租户ID 
         OrganizationId  *uint64 `json:"organizationId,optional"`
+		OrganizationName  *string `json:"organizationName,optional"`
     }
 
     // The response data of pay recharge list | PayRecharge列表数据

internal/logic/pay_recharge/get_pay_recharge_by_id_logic.go

@@ -2,12 +2,13 @@ package pay_recharge
 
 import (
 	"context"
+	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
 	"wechat-api/internal/utils/dberrorhandler"
 
-    "github.com/suyuan32/simple-admin-common/msg/errormsg"
+	"github.com/suyuan32/simple-admin-common/msg/errormsg"
 
 	"github.com/suyuan32/simple-admin-common/utils/pointy"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -33,24 +34,41 @@ func (l *GetPayRechargeByIdLogic) GetPayRechargeById(req *types.IDReq) (*types.P
 		return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
 	}
 
+	departmentInfo, err := l.svcCtx.CoreRpc.GetDepartmentById(l.ctx, &core.IDReq{Id: data.OrganizationID})
+	if err != nil {
+		return nil, err
+	}
+
+	bUserInfo := types.UserInfo{}
+	if data.UserID != "" {
+		userInfo, _ := l.svcCtx.CoreRpc.GetUserById(l.ctx, &core.UUIDReq{Id: data.UserID})
+		if userInfo != nil {
+			bUserInfo.Id = userInfo.Id
+			bUserInfo.Username = userInfo.Username
+			bUserInfo.Nickname = userInfo.Nickname
+			bUserInfo.Avatar = userInfo.Avatar
+		}
+	}
+
 	return &types.PayRechargeInfoResp{
-	    BaseDataInfo: types.BaseDataInfo{
-            Code: 0,
-            Msg:  errormsg.Success,
-        },
-        Data: types.PayRechargeInfo{
-            BaseIDInfo:    types.BaseIDInfo{
-				Id:          &data.ID,
-				CreatedAt:    pointy.GetPointer(data.CreatedAt.UnixMilli()),
-				UpdatedAt:    pointy.GetPointer(data.UpdatedAt.UnixMilli()),
-            },
-			UserId:	&data.UserID,
-			Number:	&data.Number,
-			Status:	&data.Status,
-			Money:	&data.Money,
-			OutTradeNo:	&data.OutTradeNo,
-			OrganizationId:	&data.OrganizationID,
-        },
+		BaseDataInfo: types.BaseDataInfo{
+			Code: 0,
+			Msg:  errormsg.Success,
+		},
+		Data: types.PayRechargeInfo{
+			BaseIDInfo: types.BaseIDInfo{
+				Id:        &data.ID,
+				CreatedAt: pointy.GetPointer(data.CreatedAt.UnixMilli()),
+				UpdatedAt: pointy.GetPointer(data.UpdatedAt.UnixMilli()),
+			},
+			UserId:           &data.UserID,
+			UserInfo:         bUserInfo,
+			Number:           &data.Number,
+			Status:           &data.Status,
+			Money:            &data.Money,
+			OutTradeNo:       &data.OutTradeNo,
+			OrganizationId:   &data.OrganizationID,
+			OrganizationName: departmentInfo.Name,
+		},
 	}, nil
 }
-

internal/types/types.go

@@ -3360,7 +3360,8 @@ type CreditUsageInfoResp struct {
 type PayRechargeInfo struct {
 	BaseIDInfo
 	// user_id | 用户ID
-	UserId *string `json:"userId,optional"`
+	UserId   *string  `json:"userId,optional"`
+	UserInfo UserInfo `json:"userInfo,optional"`
 	// number | 变化积分数
 	Number *float32 `json:"number,optional"`
 	// status | 状态 1-正常 2-禁用
@@ -3370,7 +3371,8 @@ type PayRechargeInfo struct {
 	// out_trade_no | 外部订单号
 	OutTradeNo *string `json:"outTradeNo,optional"`
 	// organization_id | 租户ID
-	OrganizationId *uint64 `json:"organizationId,optional"`
+	OrganizationId   *uint64 `json:"organizationId,optional"`
+	OrganizationName *string `json:"organizationName,optional"`
 }
 
 // The response data of pay recharge list | PayRecharge列表数据