Merge branch 'yhg_20250327' into debug

internal/logic/UsageDetail/get_usage_detail_list_logic.go

@@ -42,14 +42,14 @@ func (l *GetUsageDetailListLogic) GetUsageDetailList(req *types.UsageDetailListR
 		}
 	}
 
-	if req.Type != nil {
+	if req.Type != nil && *req.Type > 0 {
 		predicates = append(predicates, usagedetail.TypeEQ(*req.Type))
 	}
-	if req.BotId != nil {
-		predicates = append(predicates, usagedetail.BotID(*req.BotId))
+	if req.BotId != nil && *req.BotId != "" {
+		predicates = append(predicates, usagedetail.BotIDContains(*req.BotId))
 	}
-	if req.ReceiverId != nil {
-		predicates = append(predicates, usagedetail.ReceiverID(*req.ReceiverId))
+	if req.ReceiverId != nil && *req.ReceiverId != "" {
+		predicates = append(predicates, usagedetail.ReceiverIDContains(*req.ReceiverId))
 	}
 	// 这里是为限制时间段
 	if req.StartDate != nil && *req.StartDate != "" {

internal/logic/credit_usage/get_credit_usage_list_logic.go

@@ -43,7 +43,7 @@ func (l *GetCreditUsageListLogic) GetCreditUsageList(req *types.CreditUsageListR
 		predicates = append(predicates, creditusage.OrganizationID(organizationId))
 	}
 
-	if req.Ntype != nil {
+	if req.Ntype != nil && *req.Ntype > 0 {
 		predicates = append(predicates, creditusage.Ntype(*req.Ntype))
 	}