- {/* Компактный заголовок с переключателями */}
-
+
-
+
-
-
- {/* Переключатели периода и пользовательские даты */}
- Статистика продаж
-Аналитика продаж, заказов и рекламы
-
- {/* Стильные переключатели периода */}
-
-
-
-
-
-
-
-
- {/* Выбор произвольных дат */}
- {useCustomDates && (
- {/* Убираем ограничение по ширине для полного использования экрана */}
{/* Основной контент с табами */}
@@ -132,19 +58,18 @@ export function SellerStatisticsDashboard() {
useCustomDates={useCustomDates}
startDate={startDate}
endDate={endDate}
+ onPeriodChange={setSelectedPeriod}
+ onUseCustomDatesChange={setUseCustomDates}
/>
-
-
+
diff --git a/src/components/ui/calendar.tsx b/src/components/ui/calendar.tsx
new file mode 100644
index 0000000..a5782dd
--- /dev/null
+++ b/src/components/ui/calendar.tsx
@@ -0,0 +1,67 @@
+"use client"
+
+import * as React from "react"
+import { DayPicker } from "react-day-picker"
+import { cn } from "@/lib/utils"
+import { buttonVariants } from "@/components/ui/button"
+import { ChevronLeft, ChevronRight } from "lucide-react"
+
+export type CalendarProps = React.ComponentProps
+
+function Calendar({
+ className,
+ classNames,
+ showOutsideDays = true,
+ ...props
+}: CalendarProps) {
+ return (
+
+ orientation === "left" ?
+ ({
+ from: new Date(2025, 3, 1), // Апрель 2025
+ to: addDays(new Date(2025, 3, 1), 30),
+ })
+
+ React.useEffect(() => {
+ onDateChange?.(date ? { from: date.from, to: date.to } : { from: undefined, to: undefined })
+ }, [date, onDateChange])
+
+ return (
+ ,
+ React.ComponentPropsWithoutRef
+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
+
+
+))
+PopoverContent.displayName = PopoverPrimitive.Content.displayName
+
+export { Popover, PopoverTrigger, PopoverContent }
\ No newline at end of file
diff --git a/src/graphql/queries.ts b/src/graphql/queries.ts
index 32251d1..aeab947 100644
--- a/src/graphql/queries.ts
+++ b/src/graphql/queries.ts
@@ -645,6 +645,75 @@ export const GET_COUNTERPARTY_SUPPLIES = gql`
}
`
+// Wildberries запросы
+export const GET_WILDBERRIES_STATISTICS = gql`
+ query GetWildberriesStatistics($period: String, $startDate: String, $endDate: String) {
+ getWildberriesStatistics(period: $period, startDate: $startDate, endDate: $endDate) {
+ success
+ message
+ data {
+ date
+ sales
+ orders
+ advertising
+ refusals
+ returns
+ revenue
+ buyoutPercentage
+ }
+ }
+ }
+`
+
+export const GET_WILDBERRIES_CAMPAIGN_STATS = gql`
+ query GetWildberriesCampaignStats($input: WildberriesCampaignStatsInput!) {
+ getWildberriesCampaignStats(input: $input) {
+ success
+ message
+ data {
+ advertId
+ views
+ clicks
+ ctr
+ cpc
+ sum
+ atbs
+ orders
+ cr
+ shks
+ sum_price
+ dates
+ days {
+ date
+ views
+ clicks
+ ctr
+ cpc
+ sum
+ atbs
+ orders
+ cr
+ shks
+ sum_price
+ }
+ boosterStats {
+ date
+ views
+ clicks
+ ctr
+ cpc
+ sum
+ atbs
+ orders
+ cr
+ shks
+ sum_price
+ }
+ }
+ }
+ }
+`
+
// Админ запросы
export const ADMIN_ME = gql`
query AdminMe {
diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts
index c2cc441..f60e634 100644
--- a/src/graphql/resolvers.ts
+++ b/src/graphql/resolvers.ts
@@ -5093,6 +5093,98 @@ const wildberriesQueries = {
};
}
},
+
+ getWildberriesCampaignStats: async (
+ _: unknown,
+ { input }: {
+ input: {
+ campaigns: Array<{
+ id: number
+ dates?: string[]
+ interval?: {
+ begin: string
+ end: string
+ }
+ }>
+ }
+ },
+ context: Context
+ ) => {
+ if (!context.user) {
+ throw new GraphQLError("Требуется авторизация", {
+ extensions: { code: "UNAUTHENTICATED" },
+ });
+ }
+
+ try {
+ // Получаем организацию пользователя и её WB API ключ
+ const user = await prisma.user.findUnique({
+ where: { id: context.user.id },
+ include: {
+ organization: {
+ include: {
+ apiKeys: true,
+ }
+ },
+ },
+ });
+
+ if (!user?.organization) {
+ throw new GraphQLError("Организация не найдена");
+ }
+
+ if (user.organization.type !== 'SELLER') {
+ throw new GraphQLError("Доступно только для продавцов");
+ }
+
+ const wbApiKeyRecord = user.organization.apiKeys?.find(
+ key => key.marketplace === 'WILDBERRIES' && key.isActive
+ );
+
+ if (!wbApiKeyRecord) {
+ throw new GraphQLError("WB API ключ не настроен");
+ }
+
+ // Создаем экземпляр сервиса
+ const wbService = new WildberriesService(wbApiKeyRecord.apiKey);
+
+ // Преобразуем запросы в нужный формат
+ const requests = input.campaigns.map(campaign => {
+ if (campaign.dates && campaign.dates.length > 0) {
+ return {
+ id: campaign.id,
+ dates: campaign.dates
+ };
+ } else if (campaign.interval) {
+ return {
+ id: campaign.id,
+ interval: campaign.interval
+ };
+ } else {
+ // Если не указаны ни даты, ни интервал, возвращаем данные только за последние сутки
+ return {
+ id: campaign.id
+ };
+ }
+ });
+
+ // Получаем статистику кампаний
+ const campaignStats = await wbService.getCampaignStats(requests);
+
+ return {
+ success: true,
+ data: campaignStats,
+ message: null
+ };
+ } catch (error) {
+ console.error('Error fetching WB campaign stats:', error);
+ return {
+ success: false,
+ message: error instanceof Error ? error.message : 'Ошибка получения статистики кампаний',
+ data: [],
+ };
+ }
+ },
};
// Добавляем админ запросы и мутации к основным резолверам
diff --git a/src/graphql/typedefs.ts b/src/graphql/typedefs.ts
index 359a90e..d415d2c 100644
--- a/src/graphql/typedefs.ts
+++ b/src/graphql/typedefs.ts
@@ -85,6 +85,11 @@ export const typeDefs = gql`
# Отладка рекламы (временно)
debugWildberriesAdverts: DebugAdvertsResponse!
+
+ # Статистика кампаний Wildberries
+ getWildberriesCampaignStats(
+ input: WildberriesCampaignStatsInput!
+ ): WildberriesCampaignStatsResponse!
}
type Mutation {
@@ -934,4 +939,57 @@ export const typeDefs = gql`
status: Int!
type: Int!
}
+
+ # Типы для статистики кампаний
+ input WildberriesCampaignStatsInput {
+ campaigns: [CampaignStatsRequest!]!
+ }
+
+ input CampaignStatsRequest {
+ id: Int!
+ dates: [String!]
+ interval: CampaignStatsInterval
+ }
+
+ input CampaignStatsInterval {
+ begin: String!
+ end: String!
+ }
+
+ type WildberriesCampaignStatsResponse {
+ success: Boolean!
+ message: String
+ data: [WildberriesCampaignStats!]!
+ }
+
+ type WildberriesCampaignStats {
+ advertId: Int!
+ views: Int!
+ clicks: Int!
+ ctr: Float!
+ cpc: Float!
+ sum: Float!
+ atbs: Int!
+ orders: Int!
+ cr: Float!
+ shks: Int!
+ sum_price: Float!
+ dates: [String!]!
+ days: [WildberriesCampaignDayStats!]!
+ boosterStats: [WildberriesCampaignDayStats!]!
+ }
+
+ type WildberriesCampaignDayStats {
+ date: String!
+ views: Int!
+ clicks: Int!
+ ctr: Float!
+ cpc: Float!
+ sum: Float!
+ atbs: Int!
+ orders: Int!
+ cr: Float!
+ shks: Int!
+ sum_price: Float!
+ }
`;
diff --git a/src/services/wildberries-service.ts b/src/services/wildberries-service.ts
index 0b4f2e4..13af0c5 100644
--- a/src/services/wildberries-service.ts
+++ b/src/services/wildberries-service.ts
@@ -127,6 +127,24 @@ export interface WBAdvertStatsRequest {
}
}
+// Интерфейсы для API /adv/v1/promotion/count
+export interface WBCampaignListItem {
+ advertId: number
+ changeTime: string // date-time
+}
+
+export interface WBAdvertGroup {
+ type: number
+ status: number
+ count: number
+ advert_list: WBCampaignListItem[]
+}
+
+export interface WBCampaignsListResponse {
+ adverts: WBAdvertGroup[] | null
+ all: number
+}
+
export interface WBAdvertStatsResponse {
dates: string[]
views: number
@@ -152,9 +170,45 @@ export interface WBAdvertStatsResponse {
shks: number
sum_price: number
}>
+ boosterStats: Array<{
+ date: string
+ views: number
+ clicks: number
+ ctr: number
+ cpc: number
+ sum: number
+ atbs: number
+ orders: number
+ cr: number
+ shks: number
+ sum_price: number
+ }>
advertId: number
}
+// Новые интерфейсы для метода getCampaignStats
+export interface WBCampaignStatsRequestWithDate {
+ id: number
+ dates: string[]
+}
+
+export interface WBCampaignStatsRequestWithInterval {
+ id: number
+ interval: {
+ begin: string
+ end: string
+ }
+}
+
+export interface WBCampaignStatsRequestWithCampaignID {
+ id: number
+}
+
+export type WBCampaignStatsRequest =
+ | WBCampaignStatsRequestWithDate
+ | WBCampaignStatsRequestWithInterval
+ | WBCampaignStatsRequestWithCampaignID
+
export interface WBStatisticsData {
date: string
sales: number
@@ -204,13 +258,145 @@ class WildberriesService {
return this.makeRequest(url)
}
- // Получение рекламных кампаний
- async getAdverts(status?: number, type?: number, limit = 100, offset = 0): Promise {
- let url = `${this.advertURL}/adv/v0/adverts?limit=${limit}&offset=${offset}`
- if (status) url += `&status=${status}`
- if (type) url += `&type=${type}`
+ // Получение списка всех кампаний с группировкой
+ async getCampaignsList(): Promise {
+ const url = `${this.advertURL}/adv/v1/promotion/count`
+ console.log(`WB API: Getting campaigns list from ${url}`)
+ return this.makeRequest(url)
+ }
+
+ // Получение кампаний за определенный период по changeTime
+ async getCampaignsForPeriod(dateFrom: string, dateTo: string): Promise {
+ const campaignsList = await this.getCampaignsList()
+ const fromDate = new Date(dateFrom)
+ const toDate = new Date(dateTo)
- return this.makeRequest(url)
+ const campaignIds: number[] = []
+
+ if (campaignsList.adverts) {
+ for (const advertGroup of campaignsList.adverts) {
+ if (advertGroup.advert_list) {
+ for (const campaign of advertGroup.advert_list) {
+ const changeTime = new Date(campaign.changeTime)
+ // Проверяем что кампания была изменена в нужном периоде
+ if (changeTime >= fromDate && changeTime <= toDate) {
+ campaignIds.push(campaign.advertId)
+ }
+ }
+ }
+ }
+ }
+
+ console.log(`WB API: Found ${campaignIds.length} campaigns for period ${dateFrom} - ${dateTo}`)
+ return campaignIds
+ }
+
+ // Старый метод для совместимости (используем новый API)
+ async getAdverts(status?: number, type?: number, limit = 100, offset = 0): Promise {
+ const campaignsList = await this.getCampaignsList()
+ const campaigns: WBAdvertData[] = []
+
+ if (campaignsList.adverts) {
+ for (const advertGroup of campaignsList.adverts) {
+ // Фильтрация по статусу и типу если указаны
+ if (status && advertGroup.status !== status) continue
+ if (type && advertGroup.type !== type) continue
+
+ if (advertGroup.advert_list) {
+ for (const campaign of advertGroup.advert_list) {
+ campaigns.push({
+ advertId: campaign.advertId,
+ type: advertGroup.type,
+ status: advertGroup.status,
+ name: `Campaign ${campaign.advertId}`,
+ endTime: campaign.changeTime,
+ createTime: campaign.changeTime,
+ changeTime: campaign.changeTime,
+ startTime: campaign.changeTime, // Используем changeTime как заглушку
+ dailyBudget: 0, // Неизвестно из этого API
+ budget: 0 // Неизвестно из этого API
+ })
+
+ // Применяем лимит
+ if (campaigns.length >= limit) break
+ }
+ }
+ if (campaigns.length >= limit) break
+ }
+ }
+
+ return campaigns.slice(offset, offset + limit)
+ }
+
+ // Получение статистики конкретных кампаний (новый метод)
+ async getCampaignStats(requests: WBCampaignStatsRequest[]): Promise {
+ if (!requests || requests.length === 0) {
+ throw new Error('Requests array cannot be empty')
+ }
+
+ if (requests.length > 100) {
+ throw new Error('Maximum 100 campaigns can be requested at once')
+ }
+
+ const url = `${this.advertURL}/adv/v2/fullstats`
+
+ console.log(`WB API: Requesting campaign stats for ${requests.length} campaigns`)
+ console.log(`WB API: Request body:`, JSON.stringify(requests, null, 2))
+
+ try {
+ const response = await this.makeRequest(url, {
+ method: 'POST',
+ body: JSON.stringify(requests)
+ })
+
+ console.log(`WB API: Campaign stats response:`, JSON.stringify(response, null, 2))
+ return response
+ } catch (error) {
+ console.error(`WB API: Campaign stats error:`, error)
+ throw error
+ }
+ }
+
+ // Получение списка складов
+ async getWarehouses(): Promise {
+ const url = `${this.baseURL}/api/v2/warehouses`
+ console.log(`WB API: Getting warehouses from ${url}`)
+ const response = await this.makeRequest(url)
+ return response || []
+ }
+
+ // Получение карточек товаров
+ async getCards(options: { limit?: number; offset?: number } = {}): Promise {
+ const { limit = 100, offset = 0 } = options
+ const url = `${this.baseURL}/content/v1/cards/cursor/list?sort=updateAt&limit=${limit}&cursor=${offset}`
+ console.log(`WB API: Getting cards from ${url}`)
+ try {
+ const response = await this.makeRequest<{ cards: WildberriesCard[] }>(url)
+ return response?.cards || []
+ } catch (error) {
+ console.error(`WB API: Error getting cards:`, error)
+ return []
+ }
+ }
+
+ // Поиск карточек товаров
+ async searchCards(searchTerm: string, limit = 100): Promise {
+ // Для простоты пока используем тот же API что и getCards
+ // В реальности может потребоваться другой endpoint для поиска
+ const cards = await this.getCards({ limit })
+
+ // Фильтруем результаты по поисковому запросу
+ const filteredCards = cards.filter(card => {
+ const searchLower = searchTerm.toLowerCase()
+ return (
+ card.vendorCode?.toLowerCase().includes(searchLower) ||
+ card.object?.toLowerCase().includes(searchLower) ||
+ card.brand?.toLowerCase().includes(searchLower)
+ )
+ })
+
+ console.log(`WB API: Search "${searchTerm}" found ${filteredCards.length} cards`)
+ return filteredCards
}
// Получение статистики всех рекламных кампаний (v2)
@@ -261,13 +447,37 @@ class WildberriesService {
console.log(`WB API: Got ${salesData.length} sales, ${ordersData.length} orders`)
- // Получаем статистику рекламы напрямую через /adv/v2/fullstats
- let advertStatsData: WBAdvertStatsResponse[] = []
+ // Получаем статистику рекламы через правильный API
+ let advertStatsData: WBAdvertStatsResponse[] = []
try {
- console.log(`WB API: Getting campaign stats for interval: ${dateFrom} to ${dateTo}`)
-
- advertStatsData = await this.getAdvertStats(dateFrom, dateTo)
- console.log(`WB API: Got advertising stats for ${advertStatsData.length} campaigns`)
+ console.log(`WB API: Getting campaign stats for interval: ${dateFrom} to ${dateTo}`)
+
+ try {
+ // Получаем ID кампаний, которые были изменены в указанном периоде
+ const campaignIds = await this.getCampaignsForPeriod(dateFrom, dateTo)
+
+ if (campaignIds.length > 0) {
+ // Создаем запросы для /adv/v2/fullstats с интервалом дат
+ const campaignRequests: WBCampaignStatsRequest[] = campaignIds.map(id => ({
+ id,
+ interval: {
+ begin: dateFrom,
+ end: dateTo
+ }
+ }))
+
+ // Получаем статистику кампаний
+ advertStatsData = await this.getCampaignStats(campaignRequests)
+ console.log(`WB API: Got advertising stats for ${advertStatsData.length} campaigns`)
+ } else {
+ console.log(`WB API: No campaigns found for the specified period`)
+ }
+ } catch (error) {
+ console.error(`WB API: Failed to get campaign stats:`, error)
+ console.log(`WB API: Skipping advertising stats due to API error`)
+ }
+
+ console.log(`WB API: Got advertising stats for ${advertStatsData.length} campaigns total`)
// Логируем детали рекламных затрат
advertStatsData.forEach(stat => {
@@ -282,13 +492,21 @@ class WildberriesService {
const statsMap = new Map()
// Обрабатываем продажи
+ console.log(`WB API: Processing ${salesData.length} sales records`)
salesData.forEach(sale => {
+ const originalDate = sale.date
const date = sale.date.split('T')[0] // Берем только дату без времени
+ console.log(`WB API: Processing sale - original date: ${originalDate}, normalized: ${date}`)
+
// Строгая фильтрация по диапазону дат
- if (date < dateFrom || date > dateTo) return
+ if (date < dateFrom || date > dateTo) {
+ console.log(`WB API: Skipping sale ${date} - outside range ${dateFrom} to ${dateTo}`)
+ return
+ }
if (!statsMap.has(date)) {
+ console.log(`WB API: Creating new stats entry for date ${date}`)
statsMap.set(date, {
date,
sales: 0,
@@ -305,19 +523,29 @@ class WildberriesService {
if (!sale.isCancel) {
stats.sales += 1
stats.revenue += sale.totalPrice * (1 - sale.discountPercent / 100)
+ console.log(`WB API: Added sale to ${date}, total sales now: ${stats.sales}`)
} else {
stats.returns += 1
+ console.log(`WB API: Added return to ${date}, total returns now: ${stats.returns}`)
}
})
// Обрабатываем заказы
+ console.log(`WB API: Processing ${ordersData.length} orders records`)
ordersData.forEach(order => {
+ const originalDate = order.date
const date = order.date.split('T')[0]
+ console.log(`WB API: Processing order - original date: ${originalDate}, normalized: ${date}`)
+
// Строгая фильтрация по диапазону дат
- if (date < dateFrom || date > dateTo) return
+ if (date < dateFrom || date > dateTo) {
+ console.log(`WB API: Skipping order ${date} - outside range ${dateFrom} to ${dateTo}`)
+ return
+ }
if (!statsMap.has(date)) {
+ console.log(`WB API: Creating new stats entry for date ${date} (from orders)`)
statsMap.set(date, {
date,
sales: 0,
@@ -333,8 +561,10 @@ class WildberriesService {
const stats = statsMap.get(date)!
if (!order.isCancel) {
stats.orders += 1
+ console.log(`WB API: Added order to ${date}, total orders now: ${stats.orders}`)
} else {
stats.refusals += 1
+ console.log(`WB API: Added refusal to ${date}, total refusals now: ${stats.refusals}`)
}
})
@@ -390,7 +620,11 @@ class WildberriesService {
// Получаем данные по рекламе (это более сложно, так как нужна отдельная статистика)
// Пока используем заглушку, в реальности нужно вызвать отдельный API
- return Array.from(statsMap.values()).sort((a, b) => a.date.localeCompare(b.date))
+ const finalResults = Array.from(statsMap.values()).sort((a, b) => a.date.localeCompare(b.date))
+ console.log(`WB API: Final aggregated results:`, finalResults)
+ console.log(`WB API: Unique dates count: ${finalResults.length}`)
+
+ return finalResults
} catch (error) {
console.error('Error fetching WB statistics:', error)
throw error
@@ -443,6 +677,24 @@ class WildberriesService {
return this.formatDate(date)
}
+
+ // Статический метод для получения складов с токеном
+ static async getWarehouses(apiKey: string): Promise {
+ const service = new WildberriesService(apiKey)
+ return service.getWarehouses()
+ }
+
+ // Статический метод для получения карточек с токеном
+ static async getAllCards(apiKey: string, limit = 100): Promise {
+ const service = new WildberriesService(apiKey)
+ return service.getCards({ limit })
+ }
+
+ // Статический метод для поиска карточек с токеном
+ static async searchCards(apiKey: string, searchTerm: string, limit = 100): Promise {
+ const service = new WildberriesService(apiKey)
+ return service.searchCards(searchTerm, limit)
+ }
}
export { WildberriesService }
\ No newline at end of file
-
-
-
- Статистика рекламы
-Раздел в разработке
-
+
+
+
+
+
+
+
+
+ )
+}
+
export function DateRangePicker({
startDate,
endDate,
diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsx
new file mode 100644
index 0000000..40ea6ed
--- /dev/null
+++ b/src/components/ui/popover.tsx
@@ -0,0 +1,30 @@
+"use client"
+
+import * as React from "react"
+import * as PopoverPrimitive from "@radix-ui/react-popover"
+import { cn } from "@/lib/utils"
+
+const Popover = PopoverPrimitive.Root
+
+const PopoverTrigger = PopoverPrimitive.Trigger
+
+const PopoverContent = React.forwardRef<
+ React.ElementRef