From 71e591b18af4192bcc843865b5b5ef8199e831c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Fri, 9 May 2025 12:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/enums.js | 1 + src/views/bst/index/components/MchStat.vue | 217 ++++++++++++++---- .../components/PlatformIncomeDailyStat.vue | 32 ++- 3 files changed, 201 insertions(+), 49 deletions(-) diff --git a/src/utils/enums.js b/src/utils/enums.js index e46405e..644f6e8 100644 --- a/src/utils/enums.js +++ b/src/utils/enums.js @@ -232,6 +232,7 @@ export const StatKeys = { ORDER_USER_COUNT: "order_user_count", // 累计订单用户 ORDER_COUNT: "order_count", // 订单数量 ORDER_PAY_AMOUNT: "order_pay_amount", // 订单支付金额 + ORDER_FINISHED_PAY_AMOUNT: "order_finished_pay_amount", // 订单结算支付金额 ORDER_REFUND_AMOUNT: "order_refund_amount", // 订单退款金额 ORDER_WAIT_VERIFY_COUNT: "order_wait_verify_count", // 待审核的订单 ORDER_STATUS_COUNT: "order_status_count", // 订单状态数量 diff --git a/src/views/bst/index/components/MchStat.vue b/src/views/bst/index/components/MchStat.vue index d196dbb..5b96994 100644 --- a/src/views/bst/index/components/MchStat.vue +++ b/src/views/bst/index/components/MchStat.vue @@ -13,48 +13,68 @@ :picker-options="DatePickerOptions.DEFAULT" /> - + - +
-
订单实收
+
+ 订单实收 + +
+
订单实收 = 结算支付金额（结算时间） - 支付退款金额（退款时间）
+
结算支付金额：{{ stat.orderFinishedPayAmount | fix2 | dv }} 元
+
支付退款金额：{{ stat.orderRefundAmount | fix2 | dv }} 元
+
+ + +
{{ stat.orderActualAmount | fix2 | dv }}
-
我的收入
+
我的收入 + +
+
我的收入 = 结算分成（结算时间） - 分成退款（退款时间）
+
结算分成：{{ stat.bonusAmount | fix2 | dv }} 元
+
分成退款：{{ stat.bonusRefundAmount | fix2 | dv }} 元
+
+ + +
{{ stat.bonusActualAmount | fix2 | dv }}
 - -
-
-
订单金额
-
{{ stat.orderActualTotalAmount | fix2 | dv }}
-
- - +
订单数量
{{ stat.orderCount | dv }}
 - +
已完成
{{ orderFinishedCount | dv }}
 - +
进行中
@@ -64,47 +84,164 @@ - + - +
-
骑行费
+
+ 骑行费 + +
+
用户结束订单后，实际收取到的骑行费
+
骑行费不会超过预存款
+
+ + +
{{ stat.orderRiddingFee | fix2 | dv }}
 - +
-
调度费
+
+ 调度费 + +
+
用户结束订单后，实际收取到的调度费
+
当【预存款 - 骑行费】不足以支付调度费时，
+
将剩余金额全部收取为调度费
+
+ + +
{{ stat.orderDispatchFee | fix2 | dv }}
 - +
-
管理费
+
+ 管理费 + +
+
用户结束订单后，实际收取到的管理费
+
当【预存款 - 骑行费】不足以支付管理费时，
+
将剩余金额全部收取为管理费
+
+ + +
{{ stat.orderManageFee | fix2 | dv }}
 - +
-
车损费
+
+ 车损费 + +
+
当商户进行还车审核时填写的车损费
+
当【预存款 - 骑行费】不足以支付车损费时，
+
将剩余金额全部收取为车损费
+
+ + +
{{ stat.orderDeductionFee | fix2 | dv }}
 - + +
+
+
+ 结算金额 + +
+
结算金额 = 骑行费 + 调度费 + 管理费 + 车损费
+
仅当订单结束后，结算金额才会更新
+
结算金额不会超过预存款（支付金额）
+
+ + +
+
{{ stat.orderActualTotalAmount | fix2 | dv }}
+
+ + +
+
+
+ 支付金额 + +
+
支付金额包含预存款，是当天支付的金额，而非结算金额
+
+ + +
+
{{ stat.orderPayAmount | fix2 | dv }}
+
+ +
-
自动退款
+
自动退款 + +
+
订单结束后将自动退款，若退款失败，则需要人工退款
+
+ + +
{{ stat.orderAutoRefundAmount | fix2 | dv }}
 - +
-
人工退款
+
人工退款 + +
+
人工退款是管理员手动操作的退款金额
+
+ + +
{{ stat.orderAdminRefundAmount | fix2 | dv }}
 @@ -155,7 +292,9 @@ export default { StatKeys.ORDER_DEDUCTION_FEE, StatKeys.ORDER_DISPATCH_FEE, StatKeys.ORDER_MANAGE_FEE, - StatKeys.ORDER_REFUND_AMOUNT + StatKeys.ORDER_REFUND_AMOUNT, + StatKeys.ORDER_PAY_AMOUNT, + StatKeys.ORDER_FINISHED_PAY_AMOUNT, ] }, stat: { @@ -213,25 +352,23 @@ export default { position: relative; width: 100%; display: flex; - gap: 16px; - margin-bottom: 16px; + gap: 8px; + padding: 18px 0; .income-card { flex: 1; display: flex; align-items: center; - gap: 12px; - background: #fff; + gap: 8px; border-radius: 8px; - padding: 16px 20px; .icon-bg { position: relative; - width: 48px; - height: 48px; + width: 40px; + height: 40px; border-radius: 50%; font-size: 24px; color: #fff; text-align: center; - line-height: 48px; + line-height: 40px; } .stat-info { flex: 1; @@ -241,8 +378,7 @@ export default { margin-bottom: 4px; } .stat-value { - font-size: 24px; - font-weight: bold; + font-size: 20px; color: #222; } } @@ -268,11 +404,12 @@ export default { .stat-info { flex: 1; .mini-label { - font-size: 14px; + font-size: 12px; color: #888; } .mini-value { - font-size: 20px; + margin-top: 2px; + font-size: 16px; color: #222; } } diff --git a/src/views/bst/index/components/PlatformIncomeDailyStat.vue b/src/views/bst/index/components/PlatformIncomeDailyStat.vue index 5eec251..7216aef 100644 --- a/src/views/bst/index/components/PlatformIncomeDailyStat.vue +++ b/src/views/bst/index/components/PlatformIncomeDailyStat.vue @@ -90,19 +90,17 @@ export default { const dates = this.dailyIncome.map(item => item.date); const bonusAmounts = this.dailyIncome.map(item => item.bonusAmount || 0); const bonusRefundAmounts = this.dailyIncome.map(item => item.bonusRefundAmount || 0); - const bonusActualAmounts = this.dailyIncome.map(item => { - const bonus = item.bonusAmount || 0; - const refund = item.bonusRefundAmount || 0; - return bonus - refund; - }); + const bonusActualAmounts = this.dailyIncome.map(item => item.bonusActualAmount || 0); const withdrawServiceCharges = this.dailyIncome.map(item => item.withdrawServiceCharge || 0); + const totalIncomes = this.dailyIncome.map(item => item.totalIncome || 0); const option = { color: [ '#67C23A', // 订单服务费实收 - 绿色 '#409EFF', // 订单服务费 - 蓝色 - '#F56C6C', // 订单服务费退款 - 红色 - '#E6A23C' // 提现服务费 - 橙色 + '#909399', // 订单服务费退款 - 灰色 + '#E6A23C', // 提现服务费 - 橙色 + '#F56C6C', // 总收益 - 红色 ], tooltip: { trigger: 'axis', @@ -128,7 +126,7 @@ export default { } }, legend: { - data: ['订单服务费实收', '订单服务费', '订单服务费退款', '提现服务费'], + data: ['订单服务费实收', '订单服务费', '订单服务费退款', '提现服务费', '总收益'], bottom: 0, left: 'center', textStyle: { @@ -138,7 +136,8 @@ export default { '订单服务费实收': true, '订单服务费': false, '订单服务费退款': false, - '提现服务费': true + '提现服务费': true, + '总收益': true } }, grid: { @@ -295,6 +294,21 @@ export default { lineStyle: { width: 2 } + }, + { + name: '总收益', + type: 'line', + data: totalIncomes, + smooth: true, + symbol: 'circle', + symbolSize: 6, + lineStyle: { + width: 3, + type: 'solid' + }, + itemStyle: { + borderWidth: 2 + } } ] };