111
build / task (16.x, npm, macOS-latest) (push) Canceled after 0s
build / task (16.x, npm, ubuntu-latest) (push) Canceled after 0s
build / task (16.x, npm, windows-latest) (push) Canceled after 0s
build / task (16.x, pnpm, macOS-latest) (push) Canceled after 0s
build / task (16.x, pnpm, ubuntu-latest) (push) Canceled after 0s
build / task (16.x, pnpm, windows-latest) (push) Canceled after 0s
build / task (16.x, yarn, macOS-latest) (push) Canceled after 0s
build / task (16.x, yarn, ubuntu-latest) (push) Canceled after 0s
build / task (16.x, yarn, windows-latest) (push) Canceled after 0s
build / task (18.x, npm, macOS-latest) (push) Canceled after 0s
build / task (18.x, npm, ubuntu-latest) (push) Canceled after 0s
build / task (18.x, npm, windows-latest) (push) Canceled after 0s
build / task (18.x, pnpm, macOS-latest) (push) Canceled after 0s
build / task (18.x, pnpm, ubuntu-latest) (push) Canceled after 0s
build / task (18.x, pnpm, windows-latest) (push) Canceled after 0s
build / task (18.x, yarn, macOS-latest) (push) Canceled after 0s
build / task (18.x, yarn, ubuntu-latest) (push) Canceled after 0s
build / task (18.x, yarn, windows-latest) (push) Canceled after 0s
build / task (20.x, npm, macOS-latest) (push) Canceled after 0s
build / task (20.x, npm, ubuntu-latest) (push) Canceled after 0s
build / task (20.x, npm, windows-latest) (push) Canceled after 0s
build / task (20.x, pnpm, macOS-latest) (push) Canceled after 0s
build / task (20.x, pnpm, ubuntu-latest) (push) Canceled after 0s
build / task (20.x, pnpm, windows-latest) (push) Canceled after 0s
build / task (20.x, yarn, macOS-latest) (push) Canceled after 0s
build / task (20.x, yarn, ubuntu-latest) (push) Canceled after 0s
build / task (20.x, yarn, windows-latest) (push) Canceled after 0s
build / task (16.x, npm, macOS-latest) (push) Canceled after 0s
build / task (16.x, npm, ubuntu-latest) (push) Canceled after 0s
build / task (16.x, npm, windows-latest) (push) Canceled after 0s
build / task (16.x, pnpm, macOS-latest) (push) Canceled after 0s
build / task (16.x, pnpm, ubuntu-latest) (push) Canceled after 0s
build / task (16.x, pnpm, windows-latest) (push) Canceled after 0s
build / task (16.x, yarn, macOS-latest) (push) Canceled after 0s
build / task (16.x, yarn, ubuntu-latest) (push) Canceled after 0s
build / task (16.x, yarn, windows-latest) (push) Canceled after 0s
build / task (18.x, npm, macOS-latest) (push) Canceled after 0s
build / task (18.x, npm, ubuntu-latest) (push) Canceled after 0s
build / task (18.x, npm, windows-latest) (push) Canceled after 0s
build / task (18.x, pnpm, macOS-latest) (push) Canceled after 0s
build / task (18.x, pnpm, ubuntu-latest) (push) Canceled after 0s
build / task (18.x, pnpm, windows-latest) (push) Canceled after 0s
build / task (18.x, yarn, macOS-latest) (push) Canceled after 0s
build / task (18.x, yarn, ubuntu-latest) (push) Canceled after 0s
build / task (18.x, yarn, windows-latest) (push) Canceled after 0s
build / task (20.x, npm, macOS-latest) (push) Canceled after 0s
build / task (20.x, npm, ubuntu-latest) (push) Canceled after 0s
build / task (20.x, npm, windows-latest) (push) Canceled after 0s
build / task (20.x, pnpm, macOS-latest) (push) Canceled after 0s
build / task (20.x, pnpm, ubuntu-latest) (push) Canceled after 0s
build / task (20.x, pnpm, windows-latest) (push) Canceled after 0s
build / task (20.x, yarn, macOS-latest) (push) Canceled after 0s
build / task (20.x, yarn, ubuntu-latest) (push) Canceled after 0s
build / task (20.x, yarn, windows-latest) (push) Canceled after 0s
This commit is contained in:
1 parent
cce677e3ff
commit
530cfcd939
42 files changed
+3951
-483
No files matched your search
+60
-41
@@ -1,3 +1,4 @@
|
||||
import { submitExportTask } from "/@/api/asyncTask"
|
||||
import request from "/@/utils/request"
|
||||
|
||||
/** 订单详情中的单张识别证据,字段来自 HardOrderEvidenceImageVo。 */
|
||||
@@ -54,58 +55,73 @@ export interface HardOrderDetail {
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
/** 订单列表统计查询条件;字段与订单分页筛选保持一致。 */
|
||||
export type HardOrderStatisticsQuery = Record<string, any>
|
||||
/** 与订单列表一致的筛选条件,不含分页、排序和勾选记录。 */
|
||||
export type HardOrderStatisticsQuery = Record<string, unknown>
|
||||
|
||||
/** 订单按餐段汇总的统计,金额单位均为分。 */
|
||||
export interface HardOrderMealStatistics {
|
||||
/** 餐段字典编码;历史订单未记录时为空。 */
|
||||
hourType?: string | null
|
||||
/** 订单数。 */
|
||||
orderCount?: number
|
||||
/** 购物车商品份数。 */
|
||||
productCount?: number
|
||||
/** 商品总价。 */
|
||||
totalPrice?: number
|
||||
/** 额外支付。 */
|
||||
extraPrice?: number
|
||||
/** 配送费。 */
|
||||
deliveryPrice?: number
|
||||
/** 实际支付。 */
|
||||
payPrice?: number
|
||||
/** 已退款金额。 */
|
||||
refundPrice?: number
|
||||
/** 订单实际金额,即实际支付减已退款。 */
|
||||
actualPrice?: number
|
||||
}
|
||||
|
||||
/** 订单统计通用汇总,金额单位均为分。 */
|
||||
/** 金额为整数分字符串;计数为字符串,避免累计精度丢失。 */
|
||||
export interface HardOrderStatisticsSummary {
|
||||
orderCount?: number
|
||||
productCount?: number
|
||||
totalPrice?: number
|
||||
extraPrice?: number
|
||||
deliveryPrice?: number
|
||||
payPrice?: number
|
||||
refundPrice?: number
|
||||
actualPrice?: number
|
||||
meals?: HardOrderMealStatistics[]
|
||||
orderCount: string
|
||||
totalPrice: string
|
||||
extraPrice: string
|
||||
couponPrice: string
|
||||
payPrice: string
|
||||
refundPrice: string
|
||||
netPrice: string
|
||||
}
|
||||
|
||||
/** 订单按预计使用日期拆分的统计。 */
|
||||
export interface HardOrderDailyStatistics extends HardOrderStatisticsSummary {
|
||||
date?: string
|
||||
date: string
|
||||
}
|
||||
|
||||
export interface HardOrderPayTypeStatistics extends HardOrderStatisticsSummary {
|
||||
payType: string | null
|
||||
}
|
||||
|
||||
export interface HardOrderMerchantStatistics extends HardOrderStatisticsSummary {
|
||||
merchantId: string | null
|
||||
merchantName: string
|
||||
}
|
||||
|
||||
export interface HardOrderStatisticsData {
|
||||
summary: HardOrderStatisticsSummary
|
||||
daily: HardOrderDailyStatistics[]
|
||||
payTypes: HardOrderPayTypeStatistics[]
|
||||
withoutPayTime: HardOrderStatisticsSummary
|
||||
generatedAt: string
|
||||
}
|
||||
|
||||
/** 订单统计接口统一响应。 */
|
||||
export interface HardOrderStatisticsResponse {
|
||||
data: {
|
||||
total?: HardOrderStatisticsSummary
|
||||
daily?: HardOrderDailyStatistics[]
|
||||
}
|
||||
data: HardOrderStatisticsData
|
||||
msg?: string
|
||||
}
|
||||
|
||||
export interface HardOrderMerchantStatisticsPage {
|
||||
records: HardOrderMerchantStatistics[]
|
||||
current: number
|
||||
size: number
|
||||
hasMore: boolean
|
||||
generatedAt: string
|
||||
}
|
||||
|
||||
export function statistics(query: HardOrderStatisticsQuery) {
|
||||
return request<HardOrderStatisticsData, HardOrderStatisticsResponse>({
|
||||
url: "/hard/hard-order/statistics",
|
||||
method: "post",
|
||||
data: query,
|
||||
timeout: 25000,
|
||||
})
|
||||
}
|
||||
|
||||
export function merchantStatistics(query: HardOrderStatisticsQuery, current = 1, size = 20) {
|
||||
return request<HardOrderMerchantStatisticsPage, { data: HardOrderMerchantStatisticsPage }>({
|
||||
url: "/hard/hard-order/statistics/merchants",
|
||||
method: "post",
|
||||
params: { current, size },
|
||||
data: query,
|
||||
timeout: 25000,
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 离线订单手动支付
|
||||
*/
|
||||
@@ -207,3 +223,6 @@ export function putObj(obj?: Object) {
|
||||
data: obj,
|
||||
})
|
||||
}
|
||||
|
||||
/** 按原筛选条件提交后台分批导出。 */
|
||||
export const submitExport = (query: Record<string, unknown>) => submitExportTask("/hard/hard-order/export-async", query)
|
||||
Reference in new issue
Block a user