fix:edit

desc/wechat/credit_usage.api

@@ -22,6 +22,7 @@ type (
 
         // organization_id | 租户ID 
         OrganizationId  *uint64 `json:"organizationId,optional"`
+		OrganizationName  *string `json:"organizationName,optional"`
 
         // nid | 积分变化关联信息ID 
         Nid  *uint64 `json:"nid,optional"`
@@ -53,14 +54,7 @@ type (
     CreditUsageListReq {
         PageInfo
 
-        // user_id | 用户ID 
-        UserId  *string `json:"userId,optional"`
-
-        // table | 积分变化表名 
-        Table  *string `json:"table,optional"`
-
-        // reason | 积分变动原因 
-        Reason  *string `json:"reason,optional"`
+		OrganizationId  *uint64 `json:"organizationId,optional"`
     }
 
     // CreditUsage information response | CreditUsage信息返回体

internal/logic/credit_usage/get_credit_usage_list_logic.go

@@ -2,6 +2,7 @@ package credit_usage
 
 import (
 	"context"
+	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 
 	"wechat-api/ent/creditusage"
 	"wechat-api/ent/predicate"
@@ -31,14 +32,8 @@ func NewGetCreditUsageListLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *GetCreditUsageListLogic) GetCreditUsageList(req *types.CreditUsageListReq) (*types.CreditUsageListResp, error) {
 	var predicates []predicate.CreditUsage
-	if req.UserId != nil {
-		predicates = append(predicates, creditusage.UserID(*req.UserId))
-	}
-	if req.Table != nil {
-		predicates = append(predicates, creditusage.TableEQ(*req.Table))
-	}
-	if req.Reason != nil {
-		predicates = append(predicates, creditusage.ReasonContains(*req.Reason))
+	if req.OrganizationId != nil {
+		predicates = append(predicates, creditusage.OrganizationID(*req.OrganizationId))
 	}
 	data, err := l.svcCtx.DB.CreditUsage.Query().Where(predicates...).Page(l.ctx, req.Page, req.PageSize)
 
@@ -50,6 +45,11 @@ func (l *GetCreditUsageListLogic) GetCreditUsageList(req *types.CreditUsageListR
 	resp.Msg = errormsg.Success
 	resp.Data.Total = data.PageDetails.Total
 
+	departmentInfo, err := l.svcCtx.CoreRpc.GetDepartmentById(l.ctx, &core.IDReq{Id: *req.OrganizationId})
+	if err != nil {
+		return nil, err
+	}
+
 	for _, v := range data.List {
 		resp.Data.Data = append(resp.Data.Data,
 			types.CreditUsageInfo{
@@ -58,15 +58,16 @@ func (l *GetCreditUsageListLogic) GetCreditUsageList(req *types.CreditUsageListR
 					CreatedAt: pointy.GetPointer(v.CreatedAt.UnixMilli()),
 					UpdatedAt: pointy.GetPointer(v.UpdatedAt.UnixMilli()),
 				},
-				UserId:         &v.UserID,
-				Number:         &v.Number,
-				Status:         &v.Status,
-				Ntype:          &v.Ntype,
-				Table:          &v.Table,
-				OrganizationId: &v.OrganizationID,
-				Nid:            &v.Nid,
-				Reason:         &v.Reason,
-				Operator:       &v.Operator,
+				UserId:           &v.UserID,
+				Number:           &v.Number,
+				Status:           &v.Status,
+				Ntype:            &v.Ntype,
+				Table:            &v.Table,
+				OrganizationId:   &v.OrganizationID,
+				OrganizationName: departmentInfo.Name,
+				Nid:              &v.Nid,
+				Reason:           &v.Reason,
+				Operator:         &v.Operator,
 			})
 	}
 

internal/types/types.go

@@ -3313,7 +3313,8 @@ type CreditUsageInfo struct {
 	// table | 积分变化表名
 	Table *string `json:"table,optional"`
 	// organization_id | 租户ID
-	OrganizationId *uint64 `json:"organizationId,optional"`
+	OrganizationId   *uint64 `json:"organizationId,optional"`
+	OrganizationName *string `json:"organizationName,optional"`
 	// nid | 积分变化关联信息ID
 	Nid *uint64 `json:"nid,optional"`
 	// reason | 积分变动原因
@@ -3342,12 +3343,7 @@ type CreditUsageListInfo struct {
 // swagger:model CreditUsageListReq
 type CreditUsageListReq struct {
 	PageInfo
-	// user_id | 用户ID
-	UserId *string `json:"userId,optional"`
-	// table | 积分变化表名
-	Table *string `json:"table,optional"`
-	// reason | 积分变动原因
-	Reason *string `json:"reason,optional"`
+	OrganizationId *uint64 `json:"organizationId,optional"`
 }
 
 // CreditUsage information response | CreditUsage信息返回体