feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐

这个提交包含在:
chen
2026-09-19 11:49:57 +08:00
父节点 85947e43ae
当前提交 aca0d3c671
共有 83 个文件被更改,包括 4146 次插入 和 443 次删除

查看文件

@@ -11,7 +11,7 @@
<span>昨日 GMV <b>¥ {{ state.kpi.yesterday?.gmv || '0.00' }}</b></span>
<span>昨日现金总拨发 <b style="color:#f56c6c;">¥ {{ state.kpi.yesterday_cash || '0.00' }}</b></span>
<span>昨日综合拨比 <b :style="{color: (state.kpi.yesterday_payout_ratio_val > 70 ? '#e6a23c' : '#67c23a')}">{{ state.kpi.yesterday_payout_ratio || '0%' }}</b></span>
<span>兑换券待履约负债 <b style="color:#e6a23c;">¥ {{ state.kpi.voucher_debt || '0.00' }}</b></span>
<span>兑换券待履约存量 <b style="color:#e6a23c;">{{ state.kpi.voucher_debt || '0.00' }} 个</b></span>
<span>活跃馆/县 <b>{{ state.kpi.venue_active_count || 0 }}</b> 馆 / <b>{{ state.kpi.county_active_count || 0 }}</b> 县</span>
<span>今日累计现金 <b>¥ {{ state.kpi.today_cash || '0.00' }}</b></span>
<span style="color:#909399;">暂停领取 <b>{{ state.kpi.inactive_count || 0 }}</b> 人</span>
@@ -38,7 +38,7 @@
<el-table-column prop="venue_user_count" label="馆人数" min-width="80"></el-table-column>
<el-table-column prop="county_pool" label="区县奖池" min-width="110"></el-table-column>
<el-table-column prop="county_user_count" label="县人数" min-width="80"></el-table-column>
<el-table-column prop="voucher_release_total" label="券释放" min-width="100"></el-table-column>
<el-table-column prop="voucher_release_total" label="券释放(个)" min-width="105"></el-table-column>
<el-table-column prop="status_text" label="状态" min-width="80">
<template #default="scope">
<span :class="scope.row.status==1 ? 'sa-color--success' : 'sa-color--danger'">
@@ -112,7 +112,7 @@
<el-row :gutter="16" style="margin-bottom:16px;">
<el-col :span="8">
<div style="background:#f4f4f5;padding:12px;border-radius:6px;">
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">酒道馆加权奖励池</div>
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">酒道馆加权奖池</div>
<div style="font-size:12px;color:#606266;line-height:1.8;">
奖池总额:¥ <b>{{ previewDialog.result.venue?.pool }}</b><br>
合格人数:<b>{{ previewDialog.result.venue?.user_count }}</b> 人<br>
@@ -123,7 +123,7 @@
</el-col>
<el-col :span="8">
<div style="background:#f4f4f5;padding:12px;border-radius:6px;">
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">区县代理加权奖励池</div>
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">区县加权奖池</div>
<div style="font-size:12px;color:#606266;line-height:1.8;">
奖池总额:¥ <b>{{ previewDialog.result.county?.pool }}</b><br>
合格人数:<b>{{ previewDialog.result.county?.user_count }}</b> 人<br>
@@ -146,7 +146,7 @@
</el-row>
<div style="background:#fafafa;border:1px solid #ebeef5;padding:10px 14px;border-radius:4px;font-size:12px;color:#606266;">
<span>📅 兑换券释放预估:当日按计划释放兑换券总额约 <b>¥ {{ previewDialog.result.voucher?.release_estimate }}</b>(以365天逐日释放)。</span>
<span>📅 兑换券释放预估:当日按计划释放兑换券总额约 <b>{{ previewDialog.result.voucher?.release_estimate }} 个</b>(以365天逐日释放)。</span>
</div>
</div>
<template #footer>

查看文件

@@ -52,6 +52,16 @@
<el-table-column label="结算金额" min-width="90">
<template #default="scope"> {{ scope.row.amount }} </template>
</el-table-column>
<el-table-column label="入账账户" min-width="110">
<template #default="scope">
<el-tag
size="small"
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : (scope.row.wallet_type === 'commission' ? 'warning' : 'info'))"
>
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红马豆' : '消费补贴')) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="马豆" min-width="110">
<template #default="scope"> {{ scope.row.madow }} </template>
</el-table-column>
@@ -143,7 +153,7 @@
</el-row>
<div v-if="orderTreeDialog.data.voucher_plan" style="margin-top:12px;background:#fff;padding:8px 12px;border-radius:4px;border:1px dashed #dcdfe6;font-size:12px;color:#606266;">
<span style="font-weight:600;color:#303133;">1.5倍消费补贴履约计划:</span>
总额 ¥ {{ orderTreeDialog.data.voucher_plan.total_amount }},已释放 ¥ {{ orderTreeDialog.data.voucher_plan.released_amount }} (已释放 {{ orderTreeDialog.data.voucher_plan.released_days }}/365天),状态:{{ orderTreeDialog.data.voucher_plan.status_text }}
总额 {{ orderTreeDialog.data.voucher_plan.total_amount }} 个,已释放 {{ orderTreeDialog.data.voucher_plan.released_amount }} 个 (已释放 {{ orderTreeDialog.data.voucher_plan.released_days }}/365天),状态:{{ orderTreeDialog.data.voucher_plan.status_text }}
</div>
</div>
@@ -161,6 +171,16 @@
<span style="font-weight:600;color:#f56c6c;">¥ {{ scope.row.amount }}</span>
</template>
</el-table-column>
<el-table-column label="入账账户" width="100">
<template #default="scope">
<el-tag
size="small"
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : 'info')"
>
{{ scope.row.wallet_type_text || '商城余额' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="madow" label="马豆" width="100"></el-table-column>
<el-table-column prop="status_text" label="状态" width="80">
<template #default="scope">

查看文件

@@ -25,15 +25,15 @@
{{ scope.row.order?.order_sn || scope.row.order_id }}
</template>
</el-table-column>
<el-table-column prop="total_amount" label="总额" min-width="90"></el-table-column>
<el-table-column prop="daily_amount" label="每天释放" min-width="90"></el-table-column>
<el-table-column prop="total_amount" label="总额(个)" min-width="90"></el-table-column>
<el-table-column prop="daily_amount" label="每天释放(个)" min-width="105"></el-table-column>
<el-table-column label="进度" min-width="110">
<template #default="scope"> {{ scope.row.released_days }}/{{ scope.row.total_days }} </template>
</el-table-column>
<el-table-column prop="released_amount" label="已释放" min-width="90"></el-table-column>
<el-table-column prop="available" label="可用" min-width="90"></el-table-column>
<el-table-column prop="voucher_used" label="账户已使用" min-width="90"></el-table-column>
<el-table-column prop="voucher_available" label="账户可用" min-width="90"></el-table-column>
<el-table-column prop="released_amount" label="已释放(个)" min-width="90"></el-table-column>
<el-table-column prop="available" label="可用(个)" min-width="90"></el-table-column>
<el-table-column prop="voucher_used" label="账户已使用(个)" min-width="115"></el-table-column>
<el-table-column prop="voucher_available" label="账户可用(个)" min-width="110"></el-table-column>
<el-table-column prop="start_date" label="开始日" width="120"></el-table-column>
<el-table-column prop="status_text" label="状态" min-width="80"></el-table-column>
<el-table-column label="操作" min-width="140" fixed="right">
@@ -52,7 +52,7 @@
<div class="mb-2">计划 #{{ logs.plan?.id }} · 用户 {{ logs.plan?.user_id }} · 订单 {{ logs.plan?.order_id }}</div>
<el-table :data="logs.rows" stripe max-height="420">
<el-table-column prop="settle_date" label="日结日" width="120"></el-table-column>
<el-table-column prop="amount" label="释放金额" width="100"></el-table-column>
<el-table-column prop="amount" label="释放数量(个)" width="110"></el-table-column>
<el-table-column prop="status_text" label="状态" width="90"></el-table-column>
<el-table-column prop="formula" label="说明" min-width="160"></el-table-column>
<el-table-column prop="createtime" label="时间" width="172"></el-table-column>