商户订单
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
export default interface IMerchantWithdrawal {
|
||||
id?: number;
|
||||
withdraw_no?: string;
|
||||
merchant_id?: number;
|
||||
amount?: number;
|
||||
channel?: string;
|
||||
account_info?: string;
|
||||
status?: number;
|
||||
remark?: string;
|
||||
processed_at?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
export default interface IOrder {
|
||||
id?: number;
|
||||
order_no?: string;
|
||||
user_id?: number;
|
||||
merchant_id?: number;
|
||||
address_id?: number;
|
||||
total_amount?: number;
|
||||
discount_amount?: number;
|
||||
delivery_fee?: number;
|
||||
payment_amount?: number;
|
||||
pay_type?: number;
|
||||
pay_status?: number;
|
||||
paid_at?: string;
|
||||
status?: number;
|
||||
cancel_reason?: string;
|
||||
remark?: string;
|
||||
completed_at?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
export default interface IOrderPayment {
|
||||
id?: number;
|
||||
payment_no?: string;
|
||||
order_id?: number;
|
||||
user_id?: number;
|
||||
payment_transaction_id?: string;
|
||||
amount?: number;
|
||||
pay_type?: number;
|
||||
status?: number;
|
||||
paid_at?: string;
|
||||
refund_at?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
export default interface IOrderRefund {
|
||||
id?: number;
|
||||
refund_no?: string;
|
||||
order_id?: number;
|
||||
order_item_id?: number;
|
||||
user_id?: number;
|
||||
merchant_id?: number;
|
||||
amount?: number;
|
||||
reason?: string;
|
||||
images?: string;
|
||||
status?: number;
|
||||
reply?: string;
|
||||
processed_at?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
export default {
|
||||
"merchant.withdrawal.page.title": "Merchant Withdrawals",
|
||||
"merchant.withdrawal.page.description": "Manage merchant withdrawal requests",
|
||||
"merchant.withdrawal.id": "ID",
|
||||
"merchant.withdrawal.withdraw_no": "Withdraw No.",
|
||||
"merchant.withdrawal.merchant_id": "Merchant ID",
|
||||
"merchant.withdrawal.amount": "Amount",
|
||||
"merchant.withdrawal.channel": "Channel",
|
||||
"merchant.withdrawal.channel.wechat": "WeChat",
|
||||
"merchant.withdrawal.channel.alipay": "Alipay",
|
||||
"merchant.withdrawal.channel.bank": "Bank Card",
|
||||
"merchant.withdrawal.account_info": "Account Info",
|
||||
"merchant.withdrawal.status": "Status",
|
||||
"merchant.withdrawal.status.0": "Pending Review",
|
||||
"merchant.withdrawal.status.1": "Approved",
|
||||
"merchant.withdrawal.status.2": "Completed",
|
||||
"merchant.withdrawal.status.3": "Rejected",
|
||||
"merchant.withdrawal.remark": "Remark",
|
||||
"merchant.withdrawal.processed_at": "Processed At",
|
||||
"merchant.withdrawal.created_at": "Created At",
|
||||
"merchant.withdrawal.updated_at": "Updated At",
|
||||
};
|
||||
@@ -0,0 +1,21 @@
|
||||
export default {
|
||||
"merchant.order_payment.page.title": "Order Payment Logs",
|
||||
"merchant.order_payment.page.description": "View order payment records",
|
||||
"merchant.order_payment.id": "ID",
|
||||
"merchant.order_payment.payment_no": "Payment No.",
|
||||
"merchant.order_payment.order_id": "Order ID",
|
||||
"merchant.order_payment.user_id": "User ID",
|
||||
"merchant.order_payment.payment_transaction_id": "Transaction ID",
|
||||
"merchant.order_payment.amount": "Amount",
|
||||
"merchant.order_payment.pay_type": "Pay Type",
|
||||
"merchant.order_payment.pay_type.0": "Balance",
|
||||
"merchant.order_payment.pay_type.1": "WeChat",
|
||||
"merchant.order_payment.status": "Status",
|
||||
"merchant.order_payment.status.0": "Unpaid",
|
||||
"merchant.order_payment.status.1": "Paid",
|
||||
"merchant.order_payment.status.2": "Refunded",
|
||||
"merchant.order_payment.paid_at": "Paid At",
|
||||
"merchant.order_payment.refund_at": "Refund At",
|
||||
"merchant.order_payment.created_at": "Created At",
|
||||
"merchant.order_payment.updated_at": "Updated At",
|
||||
};
|
||||
@@ -37,6 +37,8 @@ import merchantProductCategory from "./merchant/product-category";
|
||||
import merchantProduct from "./merchant/product";
|
||||
import merchantPrinter from "./merchant/printer";
|
||||
import merchantPrintTask from "./merchant/print-task";
|
||||
import merchantOrder from "./merchant/order";
|
||||
import merchantRefund from "./merchant/refund";
|
||||
|
||||
import taskCategory from "./task/category";
|
||||
import taskOrderErrand from "./task/order-errand";
|
||||
@@ -55,6 +57,8 @@ import financeDeposit from "./finance/deposit";
|
||||
import financeDepositPayment from "./finance/deposit-payment";
|
||||
import financeWithdrawal from "./finance/withdrawal";
|
||||
import financeTransaction from "./finance/transaction";
|
||||
import financeOrderPayment from "./finance/order-payment";
|
||||
import financeMerchantWithdrawal from "./finance/merchant-withdrawal";
|
||||
|
||||
import userProfile from "./user/profile";
|
||||
|
||||
@@ -98,6 +102,8 @@ export default {
|
||||
...merchantProduct,
|
||||
...merchantPrinter,
|
||||
...merchantPrintTask,
|
||||
...merchantOrder,
|
||||
...merchantRefund,
|
||||
...taskCategory,
|
||||
...taskOrderErrand,
|
||||
...taskOrderPickup,
|
||||
@@ -113,6 +119,8 @@ export default {
|
||||
...financeDepositPayment,
|
||||
...financeWithdrawal,
|
||||
...financeTransaction,
|
||||
...financeOrderPayment,
|
||||
...financeMerchantWithdrawal,
|
||||
...userProfile,
|
||||
...xinForm,
|
||||
...xinTable,
|
||||
|
||||
@@ -61,6 +61,8 @@ export default {
|
||||
"menu.merchant.product": "Products",
|
||||
"menu.merchant.printer": "Printers",
|
||||
"menu.merchant.print-task": "Print Tasks",
|
||||
"menu.merchant.order": "Orders",
|
||||
"menu.merchant.refund": "Refunds",
|
||||
"menu.task": "Campus Tasks",
|
||||
"menu.task.orders": "Task Orders",
|
||||
"menu.task.category": "Categories",
|
||||
@@ -80,5 +82,7 @@ export default {
|
||||
"menu.finance.deposit_payment": "Deposit Payments",
|
||||
"menu.finance.withdrawal": "Withdrawals",
|
||||
"menu.finance.transaction": "Transactions",
|
||||
"menu.finance.order_payment": "Order Payments",
|
||||
"menu.finance.merchant_withdrawal": "Merchant Withdrawals",
|
||||
"menu.xin-admin": "XinAdmin",
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
export default {
|
||||
"merchant.order.page.title": "Order Management",
|
||||
"merchant.order.page.description": "Manage campus merchant orders",
|
||||
"merchant.order.id": "ID",
|
||||
"merchant.order.order_no": "Order No.",
|
||||
"merchant.order.user_id": "User ID",
|
||||
"merchant.order.merchant_id": "Merchant ID",
|
||||
"merchant.order.address_id": "Address ID",
|
||||
"merchant.order.total_amount": "Total Amount",
|
||||
"merchant.order.discount_amount": "Discount",
|
||||
"merchant.order.delivery_fee": "Delivery Fee",
|
||||
"merchant.order.payment_amount": "Payment Amount",
|
||||
"merchant.order.pay_type": "Pay Type",
|
||||
"merchant.order.pay_type.0": "Balance",
|
||||
"merchant.order.pay_type.1": "WeChat",
|
||||
"merchant.order.pay_status": "Pay Status",
|
||||
"merchant.order.pay_status.0": "Unpaid",
|
||||
"merchant.order.pay_status.1": "Paid",
|
||||
"merchant.order.pay_status.2": "Refunding",
|
||||
"merchant.order.pay_status.3": "Refunded",
|
||||
"merchant.order.status": "Order Status",
|
||||
"merchant.order.status.0": "Unpaid",
|
||||
"merchant.order.status.1": "Pending Delivery",
|
||||
"merchant.order.status.2": "Delivering",
|
||||
"merchant.order.status.3": "Completed",
|
||||
"merchant.order.status.4": "Cancelled",
|
||||
"merchant.order.cancel_reason": "Cancel Reason",
|
||||
"merchant.order.remark": "Remark",
|
||||
"merchant.order.paid_at": "Paid At",
|
||||
"merchant.order.completed_at": "Completed At",
|
||||
"merchant.order.created_at": "Created At",
|
||||
"merchant.order.updated_at": "Updated At",
|
||||
};
|
||||
@@ -0,0 +1,22 @@
|
||||
export default {
|
||||
"merchant.refund.page.title": "Order Refunds",
|
||||
"merchant.refund.page.description": "Handle user refund requests",
|
||||
"merchant.refund.id": "ID",
|
||||
"merchant.refund.refund_no": "Refund No.",
|
||||
"merchant.refund.order_id": "Order ID",
|
||||
"merchant.refund.order_item_id": "Order Item ID",
|
||||
"merchant.refund.user_id": "User ID",
|
||||
"merchant.refund.merchant_id": "Merchant ID",
|
||||
"merchant.refund.amount": "Amount",
|
||||
"merchant.refund.reason": "Reason",
|
||||
"merchant.refund.images": "Images",
|
||||
"merchant.refund.status": "Status",
|
||||
"merchant.refund.status.0": "Pending",
|
||||
"merchant.refund.status.1": "Approved",
|
||||
"merchant.refund.status.2": "Completed",
|
||||
"merchant.refund.status.3": "Rejected",
|
||||
"merchant.refund.reply": "Reply",
|
||||
"merchant.refund.processed_at": "Processed At",
|
||||
"merchant.refund.created_at": "Created At",
|
||||
"merchant.refund.updated_at": "Updated At",
|
||||
};
|
||||
@@ -0,0 +1,22 @@
|
||||
export default {
|
||||
"merchant.withdrawal.page.title": "商户提现",
|
||||
"merchant.withdrawal.page.description": "管理商户提现申请",
|
||||
"merchant.withdrawal.id": "ID",
|
||||
"merchant.withdrawal.withdraw_no": "提现编号",
|
||||
"merchant.withdrawal.merchant_id": "商户ID",
|
||||
"merchant.withdrawal.amount": "提现金额",
|
||||
"merchant.withdrawal.channel": "提现渠道",
|
||||
"merchant.withdrawal.channel.wechat": "微信",
|
||||
"merchant.withdrawal.channel.alipay": "支付宝",
|
||||
"merchant.withdrawal.channel.bank": "银行卡",
|
||||
"merchant.withdrawal.account_info": "账户信息",
|
||||
"merchant.withdrawal.status": "审核状态",
|
||||
"merchant.withdrawal.status.0": "待审核",
|
||||
"merchant.withdrawal.status.1": "已通过",
|
||||
"merchant.withdrawal.status.2": "已完成",
|
||||
"merchant.withdrawal.status.3": "已拒绝",
|
||||
"merchant.withdrawal.remark": "备注",
|
||||
"merchant.withdrawal.processed_at": "处理时间",
|
||||
"merchant.withdrawal.created_at": "申请时间",
|
||||
"merchant.withdrawal.updated_at": "更新时间",
|
||||
};
|
||||
@@ -0,0 +1,21 @@
|
||||
export default {
|
||||
"merchant.order_payment.page.title": "订单支付日志",
|
||||
"merchant.order_payment.page.description": "查看商城订单支付记录",
|
||||
"merchant.order_payment.id": "ID",
|
||||
"merchant.order_payment.payment_no": "支付编号",
|
||||
"merchant.order_payment.order_id": "订单ID",
|
||||
"merchant.order_payment.user_id": "用户ID",
|
||||
"merchant.order_payment.payment_transaction_id": "三方交易ID",
|
||||
"merchant.order_payment.amount": "支付金额",
|
||||
"merchant.order_payment.pay_type": "支付方式",
|
||||
"merchant.order_payment.pay_type.0": "余额",
|
||||
"merchant.order_payment.pay_type.1": "微信",
|
||||
"merchant.order_payment.status": "支付状态",
|
||||
"merchant.order_payment.status.0": "待支付",
|
||||
"merchant.order_payment.status.1": "已支付",
|
||||
"merchant.order_payment.status.2": "已退款",
|
||||
"merchant.order_payment.paid_at": "支付时间",
|
||||
"merchant.order_payment.refund_at": "退款时间",
|
||||
"merchant.order_payment.created_at": "创建时间",
|
||||
"merchant.order_payment.updated_at": "更新时间",
|
||||
};
|
||||
@@ -37,6 +37,8 @@ import merchantProductCategory from "./merchant/product-category";
|
||||
import merchantProduct from "./merchant/product";
|
||||
import merchantPrinter from "./merchant/printer";
|
||||
import merchantPrintTask from "./merchant/print-task";
|
||||
import merchantOrder from "./merchant/order";
|
||||
import merchantRefund from "./merchant/refund";
|
||||
|
||||
import taskCategory from "./task/category";
|
||||
import taskOrderErrand from "./task/order-errand";
|
||||
@@ -55,6 +57,8 @@ import financeDeposit from "./finance/deposit";
|
||||
import financeDepositPayment from "./finance/deposit-payment";
|
||||
import financeWithdrawal from "./finance/withdrawal";
|
||||
import financeTransaction from "./finance/transaction";
|
||||
import financeOrderPayment from "./finance/order-payment";
|
||||
import financeMerchantWithdrawal from "./finance/merchant-withdrawal";
|
||||
|
||||
import userProfile from "./user/profile";
|
||||
|
||||
@@ -98,6 +102,8 @@ export default {
|
||||
...merchantProduct,
|
||||
...merchantPrinter,
|
||||
...merchantPrintTask,
|
||||
...merchantOrder,
|
||||
...merchantRefund,
|
||||
...taskCategory,
|
||||
...taskOrderErrand,
|
||||
...taskOrderPickup,
|
||||
@@ -113,6 +119,8 @@ export default {
|
||||
...financeDepositPayment,
|
||||
...financeWithdrawal,
|
||||
...financeTransaction,
|
||||
...financeOrderPayment,
|
||||
...financeMerchantWithdrawal,
|
||||
...userProfile,
|
||||
...xinForm,
|
||||
...xinTable,
|
||||
|
||||
@@ -61,6 +61,8 @@ export default {
|
||||
"menu.merchant.product": "商品管理",
|
||||
"menu.merchant.printer": "打印机管理",
|
||||
"menu.merchant.print-task": "打印任务",
|
||||
"menu.merchant.order": "订单管理",
|
||||
"menu.merchant.refund": "订单退款",
|
||||
"menu.task": "校园任务",
|
||||
"menu.task.category": "任务分类",
|
||||
"menu.task.order_errand": "跑腿订单",
|
||||
@@ -80,5 +82,7 @@ export default {
|
||||
"menu.finance.deposit_payment": "保证金支付日志",
|
||||
"menu.finance.withdrawal": "接单员提现",
|
||||
"menu.finance.transaction": "三方支付流水",
|
||||
"menu.finance.order_payment": "订单支付日志",
|
||||
"menu.finance.merchant_withdrawal": "商户提现",
|
||||
"menu.xin-admin": "XinAdmin",
|
||||
};
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
export default {
|
||||
"merchant.order.page.title": "订单管理",
|
||||
"merchant.order.page.description": "管理校园商户订单",
|
||||
"merchant.order.id": "ID",
|
||||
"merchant.order.order_no": "订单号",
|
||||
"merchant.order.user_id": "用户ID",
|
||||
"merchant.order.merchant_id": "商户ID",
|
||||
"merchant.order.address_id": "地址ID",
|
||||
"merchant.order.total_amount": "订单总额",
|
||||
"merchant.order.discount_amount": "优惠金额",
|
||||
"merchant.order.delivery_fee": "配送费",
|
||||
"merchant.order.payment_amount": "实付金额",
|
||||
"merchant.order.pay_type": "支付方式",
|
||||
"merchant.order.pay_type.0": "余额",
|
||||
"merchant.order.pay_type.1": "微信",
|
||||
"merchant.order.pay_status": "支付状态",
|
||||
"merchant.order.pay_status.0": "待支付",
|
||||
"merchant.order.pay_status.1": "已支付",
|
||||
"merchant.order.pay_status.2": "退款中",
|
||||
"merchant.order.pay_status.3": "已退款",
|
||||
"merchant.order.status": "订单状态",
|
||||
"merchant.order.status.0": "待支付",
|
||||
"merchant.order.status.1": "待配送",
|
||||
"merchant.order.status.2": "配送中",
|
||||
"merchant.order.status.3": "已完成",
|
||||
"merchant.order.status.4": "已取消",
|
||||
"merchant.order.cancel_reason": "取消原因",
|
||||
"merchant.order.remark": "备注",
|
||||
"merchant.order.paid_at": "支付时间",
|
||||
"merchant.order.completed_at": "完成时间",
|
||||
"merchant.order.created_at": "创建时间",
|
||||
"merchant.order.updated_at": "更新时间",
|
||||
};
|
||||
@@ -0,0 +1,22 @@
|
||||
export default {
|
||||
"merchant.refund.page.title": "订单退款",
|
||||
"merchant.refund.page.description": "处理用户退款申请",
|
||||
"merchant.refund.id": "ID",
|
||||
"merchant.refund.refund_no": "退款编号",
|
||||
"merchant.refund.order_id": "订单ID",
|
||||
"merchant.refund.order_item_id": "订单项ID",
|
||||
"merchant.refund.user_id": "用户ID",
|
||||
"merchant.refund.merchant_id": "商户ID",
|
||||
"merchant.refund.amount": "退款金额",
|
||||
"merchant.refund.reason": "退款原因",
|
||||
"merchant.refund.images": "凭证图片",
|
||||
"merchant.refund.status": "退款状态",
|
||||
"merchant.refund.status.0": "待处理",
|
||||
"merchant.refund.status.1": "已同意",
|
||||
"merchant.refund.status.2": "已完成",
|
||||
"merchant.refund.status.3": "已拒绝",
|
||||
"merchant.refund.reply": "处理回复",
|
||||
"merchant.refund.processed_at": "处理时间",
|
||||
"merchant.refund.created_at": "申请时间",
|
||||
"merchant.refund.updated_at": "更新时间",
|
||||
};
|
||||
@@ -0,0 +1,158 @@
|
||||
import { Tag, Typography } from 'antd';
|
||||
import React from 'react';
|
||||
import XinTable from '@/components/XinTable';
|
||||
import type { XinTableColumn, XinTableProps } from '@/components/XinTable/typings';
|
||||
import type IMerchantWithdrawal from '@/domain/iMerchantWithdrawal';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
dayjs.extend(relativeTime);
|
||||
|
||||
const Table: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const columns: XinTableColumn<IMerchantWithdrawal>[] = [
|
||||
{
|
||||
title: t('merchant.withdrawal.id'),
|
||||
dataIndex: 'id',
|
||||
hideInForm: true,
|
||||
sorter: true,
|
||||
align: 'center',
|
||||
width: 80,
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.withdraw_no'),
|
||||
dataIndex: 'withdraw_no',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.merchant_id'),
|
||||
dataIndex: 'merchant_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.amount'),
|
||||
dataIndex: 'amount',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.channel'),
|
||||
dataIndex: 'channel',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 'wechat', label: t('merchant.withdrawal.channel.wechat') },
|
||||
{ value: 'alipay', label: t('merchant.withdrawal.channel.alipay') },
|
||||
{ value: 'bank', label: t('merchant.withdrawal.channel.bank') },
|
||||
],
|
||||
},
|
||||
render: (value: string) => {
|
||||
const colorMap: Record<string, string> = { wechat: 'green', alipay: 'blue', bank: 'orange' };
|
||||
const labelMap: Record<string, string> = {
|
||||
wechat: t('merchant.withdrawal.channel.wechat'),
|
||||
alipay: t('merchant.withdrawal.channel.alipay'),
|
||||
bank: t('merchant.withdrawal.channel.bank'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? value}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.withdrawal.channel.wechat'), value: 'wechat' },
|
||||
{ text: t('merchant.withdrawal.channel.alipay'), value: 'alipay' },
|
||||
{ text: t('merchant.withdrawal.channel.bank'), value: 'bank' },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.status'),
|
||||
dataIndex: 'status',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.withdrawal.status.0') },
|
||||
{ value: 1, label: t('merchant.withdrawal.status.1') },
|
||||
{ value: 2, label: t('merchant.withdrawal.status.2') },
|
||||
{ value: 3, label: t('merchant.withdrawal.status.3') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'warning', 1: 'processing', 2: 'success', 3: 'error' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.withdrawal.status.0'),
|
||||
1: t('merchant.withdrawal.status.1'),
|
||||
2: t('merchant.withdrawal.status.2'),
|
||||
3: t('merchant.withdrawal.status.3'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.withdrawal.status.0'), value: 0 },
|
||||
{ text: t('merchant.withdrawal.status.1'), value: 1 },
|
||||
{ text: t('merchant.withdrawal.status.2'), value: 2 },
|
||||
{ text: t('merchant.withdrawal.status.3'), value: 3 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.remark'),
|
||||
dataIndex: 'remark',
|
||||
valueType: 'text',
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.processed_at'),
|
||||
dataIndex: 'processed_at',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
||||
},
|
||||
{
|
||||
title: t('merchant.withdrawal.created_at'),
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
dataIndex: 'created_at',
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||
},
|
||||
];
|
||||
|
||||
const tableProps: XinTableProps<IMerchantWithdrawal> = {
|
||||
api: '/merchant/withdrawal',
|
||||
columns,
|
||||
rowKey: 'id',
|
||||
accessName: 'merchant.withdrawal',
|
||||
addShow: false,
|
||||
scroll: { x: 1200 },
|
||||
formProps: {
|
||||
grid: true,
|
||||
colProps: { span: 12 },
|
||||
rowProps: { gutter: [30, 0] },
|
||||
layout: 'vertical',
|
||||
},
|
||||
modalProps: { width: 800 },
|
||||
cardProps: { variant: 'borderless' },
|
||||
pagination: { size: 'small', style: { marginBottom: 0 } },
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="mb-5">
|
||||
<Title level={3}>{t('merchant.withdrawal.page.title')}</Title>
|
||||
<Text type="secondary">{t('merchant.withdrawal.page.description')}</Text>
|
||||
</div>
|
||||
<XinTable<IMerchantWithdrawal> {...tableProps} />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default Table;
|
||||
@@ -0,0 +1,161 @@
|
||||
import { Tag, Typography } from 'antd';
|
||||
import React from 'react';
|
||||
import XinTable from '@/components/XinTable';
|
||||
import type { XinTableColumn, XinTableProps } from '@/components/XinTable/typings';
|
||||
import type IOrderPayment from '@/domain/iOrderPayment';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
dayjs.extend(relativeTime);
|
||||
|
||||
const Table: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const columns: XinTableColumn<IOrderPayment>[] = [
|
||||
{
|
||||
title: t('merchant.order_payment.id'),
|
||||
dataIndex: 'id',
|
||||
hideInForm: true,
|
||||
sorter: true,
|
||||
align: 'center',
|
||||
width: 80,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.payment_no'),
|
||||
dataIndex: 'payment_no',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.order_id'),
|
||||
dataIndex: 'order_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.user_id'),
|
||||
dataIndex: 'user_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.amount'),
|
||||
dataIndex: 'amount',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.pay_type'),
|
||||
dataIndex: 'pay_type',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.order_payment.pay_type.0') },
|
||||
{ value: 1, label: t('merchant.order_payment.pay_type.1') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'default', 1: 'blue' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.order_payment.pay_type.0'),
|
||||
1: t('merchant.order_payment.pay_type.1'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.order_payment.pay_type.0'), value: 0 },
|
||||
{ text: t('merchant.order_payment.pay_type.1'), value: 1 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.status'),
|
||||
dataIndex: 'status',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.order_payment.status.0') },
|
||||
{ value: 1, label: t('merchant.order_payment.status.1') },
|
||||
{ value: 2, label: t('merchant.order_payment.status.2') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'warning', 1: 'success', 2: 'default' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.order_payment.status.0'),
|
||||
1: t('merchant.order_payment.status.1'),
|
||||
2: t('merchant.order_payment.status.2'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.order_payment.status.0'), value: 0 },
|
||||
{ text: t('merchant.order_payment.status.1'), value: 1 },
|
||||
{ text: t('merchant.order_payment.status.2'), value: 2 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.paid_at'),
|
||||
dataIndex: 'paid_at',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.refund_at'),
|
||||
dataIndex: 'refund_at',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
||||
},
|
||||
{
|
||||
title: t('merchant.order_payment.created_at'),
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
dataIndex: 'created_at',
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||
},
|
||||
];
|
||||
|
||||
const tableProps: XinTableProps<IOrderPayment> = {
|
||||
api: '/merchant/order-payment',
|
||||
columns,
|
||||
rowKey: 'id',
|
||||
accessName: 'merchant.order_payment',
|
||||
addShow: false,
|
||||
editShow: false,
|
||||
scroll: { x: 1200 },
|
||||
formProps: {
|
||||
grid: true,
|
||||
colProps: { span: 12 },
|
||||
rowProps: { gutter: [30, 0] },
|
||||
layout: 'vertical',
|
||||
},
|
||||
modalProps: { width: 800 },
|
||||
cardProps: { variant: 'borderless' },
|
||||
pagination: { size: 'small', style: { marginBottom: 0 } },
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="mb-5">
|
||||
<Title level={3}>{t('merchant.order_payment.page.title')}</Title>
|
||||
<Text type="secondary">{t('merchant.order_payment.page.description')}</Text>
|
||||
</div>
|
||||
<XinTable<IOrderPayment> {...tableProps} />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default Table;
|
||||
@@ -0,0 +1,226 @@
|
||||
import { Tag, Typography } from 'antd';
|
||||
import React from 'react';
|
||||
import XinTable from '@/components/XinTable';
|
||||
import type { XinTableColumn, XinTableProps } from '@/components/XinTable/typings';
|
||||
import type IOrder from '@/domain/iOrder';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
dayjs.extend(relativeTime);
|
||||
|
||||
const Table: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const columns: XinTableColumn<IOrder>[] = [
|
||||
{
|
||||
title: t('merchant.order.id'),
|
||||
dataIndex: 'id',
|
||||
hideInForm: true,
|
||||
sorter: true,
|
||||
align: 'center',
|
||||
width: 80,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.order_no'),
|
||||
dataIndex: 'order_no',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.user_id'),
|
||||
dataIndex: 'user_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.merchant_id'),
|
||||
dataIndex: 'merchant_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.total_amount'),
|
||||
dataIndex: 'total_amount',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.discount_amount'),
|
||||
dataIndex: 'discount_amount',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.delivery_fee'),
|
||||
dataIndex: 'delivery_fee',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.payment_amount'),
|
||||
dataIndex: 'payment_amount',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.pay_type'),
|
||||
dataIndex: 'pay_type',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.order.pay_type.0') },
|
||||
{ value: 1, label: t('merchant.order.pay_type.1') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'default', 1: 'blue' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.order.pay_type.0'),
|
||||
1: t('merchant.order.pay_type.1'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.order.pay_type.0'), value: 0 },
|
||||
{ text: t('merchant.order.pay_type.1'), value: 1 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.pay_status'),
|
||||
dataIndex: 'pay_status',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.order.pay_status.0') },
|
||||
{ value: 1, label: t('merchant.order.pay_status.1') },
|
||||
{ value: 2, label: t('merchant.order.pay_status.2') },
|
||||
{ value: 3, label: t('merchant.order.pay_status.3') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'warning', 1: 'success', 2: 'processing', 3: 'default' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.order.pay_status.0'),
|
||||
1: t('merchant.order.pay_status.1'),
|
||||
2: t('merchant.order.pay_status.2'),
|
||||
3: t('merchant.order.pay_status.3'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.order.pay_status.0'), value: 0 },
|
||||
{ text: t('merchant.order.pay_status.1'), value: 1 },
|
||||
{ text: t('merchant.order.pay_status.2'), value: 2 },
|
||||
{ text: t('merchant.order.pay_status.3'), value: 3 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.status'),
|
||||
dataIndex: 'status',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.order.status.0') },
|
||||
{ value: 1, label: t('merchant.order.status.1') },
|
||||
{ value: 2, label: t('merchant.order.status.2') },
|
||||
{ value: 3, label: t('merchant.order.status.3') },
|
||||
{ value: 4, label: t('merchant.order.status.4') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'warning', 1: 'processing', 2: 'processing', 3: 'success', 4: 'default' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.order.status.0'),
|
||||
1: t('merchant.order.status.1'),
|
||||
2: t('merchant.order.status.2'),
|
||||
3: t('merchant.order.status.3'),
|
||||
4: t('merchant.order.status.4'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.order.status.0'), value: 0 },
|
||||
{ text: t('merchant.order.status.1'), value: 1 },
|
||||
{ text: t('merchant.order.status.2'), value: 2 },
|
||||
{ text: t('merchant.order.status.3'), value: 3 },
|
||||
{ text: t('merchant.order.status.4'), value: 4 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.paid_at'),
|
||||
dataIndex: 'paid_at',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.completed_at'),
|
||||
dataIndex: 'completed_at',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.remark'),
|
||||
dataIndex: 'remark',
|
||||
valueType: 'text',
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.order.created_at'),
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
dataIndex: 'created_at',
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||
},
|
||||
];
|
||||
|
||||
const tableProps: XinTableProps<IOrder> = {
|
||||
api: '/merchant/order',
|
||||
columns,
|
||||
rowKey: 'id',
|
||||
accessName: 'merchant.order',
|
||||
scroll: { x: 1400 },
|
||||
formProps: {
|
||||
grid: true,
|
||||
colProps: { span: 12 },
|
||||
rowProps: { gutter: [30, 0] },
|
||||
layout: 'vertical',
|
||||
},
|
||||
modalProps: { width: 800 },
|
||||
cardProps: { variant: 'borderless' },
|
||||
pagination: { size: 'small', style: { marginBottom: 0 } },
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="mb-5">
|
||||
<Title level={3}>{t('merchant.order.page.title')}</Title>
|
||||
<Text type="secondary">{t('merchant.order.page.description')}</Text>
|
||||
</div>
|
||||
<XinTable<IOrder> {...tableProps} />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default Table;
|
||||
@@ -0,0 +1,152 @@
|
||||
import { Tag, Typography } from 'antd';
|
||||
import React from 'react';
|
||||
import XinTable from '@/components/XinTable';
|
||||
import type { XinTableColumn, XinTableProps } from '@/components/XinTable/typings';
|
||||
import type IOrderRefund from '@/domain/iOrderRefund';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
dayjs.extend(relativeTime);
|
||||
|
||||
const Table: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const columns: XinTableColumn<IOrderRefund>[] = [
|
||||
{
|
||||
title: t('merchant.refund.id'),
|
||||
dataIndex: 'id',
|
||||
hideInForm: true,
|
||||
sorter: true,
|
||||
align: 'center',
|
||||
width: 80,
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.refund_no'),
|
||||
dataIndex: 'refund_no',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.order_id'),
|
||||
dataIndex: 'order_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.user_id'),
|
||||
dataIndex: 'user_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.merchant_id'),
|
||||
dataIndex: 'merchant_id',
|
||||
valueType: 'text',
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.amount'),
|
||||
dataIndex: 'amount',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: number) => `¥${value ?? '0.00'}`,
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.reason'),
|
||||
dataIndex: 'reason',
|
||||
valueType: 'text',
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.status'),
|
||||
dataIndex: 'status',
|
||||
valueType: 'select',
|
||||
fieldProps: {
|
||||
options: [
|
||||
{ value: 0, label: t('merchant.refund.status.0') },
|
||||
{ value: 1, label: t('merchant.refund.status.1') },
|
||||
{ value: 2, label: t('merchant.refund.status.2') },
|
||||
{ value: 3, label: t('merchant.refund.status.3') },
|
||||
],
|
||||
},
|
||||
render: (value: number) => {
|
||||
const colorMap: Record<number, string> = { 0: 'warning', 1: 'processing', 2: 'success', 3: 'error' };
|
||||
const labelMap: Record<number, string> = {
|
||||
0: t('merchant.refund.status.0'),
|
||||
1: t('merchant.refund.status.1'),
|
||||
2: t('merchant.refund.status.2'),
|
||||
3: t('merchant.refund.status.3'),
|
||||
};
|
||||
return <Tag color={colorMap[value] ?? 'default'}>{labelMap[value] ?? '-'}</Tag>;
|
||||
},
|
||||
filters: [
|
||||
{ text: t('merchant.refund.status.0'), value: 0 },
|
||||
{ text: t('merchant.refund.status.1'), value: 1 },
|
||||
{ text: t('merchant.refund.status.2'), value: 2 },
|
||||
{ text: t('merchant.refund.status.3'), value: 3 },
|
||||
],
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.reply'),
|
||||
dataIndex: 'reply',
|
||||
valueType: 'text',
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.processed_at'),
|
||||
dataIndex: 'processed_at',
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
||||
},
|
||||
{
|
||||
title: t('merchant.refund.created_at'),
|
||||
hideInForm: true,
|
||||
hideInSearch: true,
|
||||
dataIndex: 'created_at',
|
||||
align: 'center',
|
||||
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||
},
|
||||
];
|
||||
|
||||
const tableProps: XinTableProps<IOrderRefund> = {
|
||||
api: '/merchant/refund',
|
||||
columns,
|
||||
rowKey: 'id',
|
||||
accessName: 'merchant.refund',
|
||||
addShow: false,
|
||||
scroll: { x: 1200 },
|
||||
formProps: {
|
||||
grid: true,
|
||||
colProps: { span: 12 },
|
||||
rowProps: { gutter: [30, 0] },
|
||||
layout: 'vertical',
|
||||
},
|
||||
modalProps: { width: 800 },
|
||||
cardProps: { variant: 'borderless' },
|
||||
pagination: { size: 'small', style: { marginBottom: 0 } },
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="mb-5">
|
||||
<Title level={3}>{t('merchant.refund.page.title')}</Title>
|
||||
<Text type="secondary">{t('merchant.refund.page.description')}</Text>
|
||||
</div>
|
||||
<XinTable<IOrderRefund> {...tableProps} />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default Table;
|
||||
Reference in New Issue
Block a user