wikiboss/Henglianshutong
1
0
派生 0
代码 工单 合并请求 Actions 软件包 项目 版本发布 百科 动态

feat(dmepa): 全局统一规范DMEPA命名并优化游客与品酒师身份显示

浏览代码
这个提交包含在：
chen
2026-09-19 15:41:39 +08:00
父节点 3868becc63
当前提交 fd8c1d09cc
共有 65 个文件被更改，包括 1068 次插入 和 390 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/admin/controller/shopro/Dashboard.php
查看文件

@@ -333,7 +333,7 @@ class Dashboard extends Common
'filter_type' => 'normal',
];
// 全平台全员合计行 (总马豆与总分佣与顶部大盘完全一致)
// 全平台全员合计行 (总dmepa与总分佣与顶部大盘完全一致)
$allTotalRow = [
'role_key' => 'all_total',
'role_name' => '全平台全员合计',

12
application/admin/controller/shopro/order/Order.php
查看文件

@@ -244,7 +244,7 @@ class Order extends Common
if ($type === 'voucher_grant') {
$amountText = number_format($baseAmount, 2, '.', '') . ' 个';
} elseif ($madow > 0) {
$amountText = \addons\shopro\service\partner\IdentityService::formatMadow($madow) . ' 马豆';
$amountText = \addons\shopro\service\partner\IdentityService::formatMadow($madow) . ' dmepa';
} elseif ($amount > 0) {
$amountText = '¥' . number_format($amount, 2, '.', '');
} else {
@@ -379,7 +379,7 @@ class Order extends Common
}
$platform = $platRows[0];
$amountText = $type === 'madow_share'
? \addons\shopro\service\partner\IdentityService::formatMadow($platMadow) . ' 马豆'
? \addons\shopro\service\partner\IdentityService::formatMadow($platMadow) . ' dmepa'
: '¥' . number_format($platAmount, 2, '.', '');
$items[] = [
@@ -402,7 +402,7 @@ class Order extends Common
'settle_date' => $settleDate,
'status' => 1,
'status_text' => '已入账',
'unit' => $type === 'madow_share' ? '马豆' : '元',
'unit' => $type === 'madow_share' ? 'dmepa' : '元',
'formula' => (string) ($platform->formula ?? ''),
'skip_reason_text' => '',
'tip' => '当日无人参与，奖池进平台',
@@ -429,13 +429,13 @@ class Order extends Common
'each_madow' => $eachMadow,
'total_amount' => number_format($totalAmount, 2, '.', ''),
'total_madow' => \addons\shopro\service\partner\IdentityService::formatMadow($totalMadow),
'amount_text' => $type === 'madow_share' ? ($eachMadow . ' 马豆/人') : ('¥' . $eachAmount . '/人'),
'amount_text' => $type === 'madow_share' ? ($eachMadow . ' dmepa/人') : ('¥' . $eachAmount . '/人'),
'wallet_type' => $type === 'madow_share' ? 'madow' : \addons\shopro\service\partner\PartnerConfig::rewardWalletType(),
'wallet_type_text' => $type === 'madow_share' ? '分红马豆' : (\addons\shopro\service\partner\PartnerConfig::rewardWalletType() === 'money' ? '商城余额' : '佣金钱包'),
'wallet_type_text' => $type === 'madow_share' ? '分红dmepa' : (\addons\shopro\service\partner\PartnerConfig::rewardWalletType() === 'money' ? '商城余额' : '佣金钱包'),
'settle_date' => $settleDate,
'status' => 1,
'status_text' => '已入账',
'unit' => $type === 'madow_share' ? '马豆' : '元',
'unit' => $type === 'madow_share' ? 'dmepa' : '元',
'formula' => (string) ($first->formula ?? ''),
'skip_reason_text' => '',
'tip' => '日结均分（不列出参与用户名单）',

4
application/admin/controller/shopro/partner/Reward.php
查看文件

@@ -51,7 +51,7 @@ class Reward extends Common
'role_text' => '受益身份',
'amount' => '结算金额',
'wallet_type_text' => '入账账户',
'madow' => '马豆',
'madow' => 'dmepa',
'base_amount' => '基数',
'status_text' => '状态',
'formula' => '测算摘要',
@@ -108,7 +108,7 @@ class Reward extends Common
'madow' => $formattedTotalMadow,
'base_amount' => '-',
'status_text' => '已汇总',
'formula' => "总现金: {$totalAmount}, 总马豆: {$formattedTotalMadow}",
'formula' => "总现金: {$totalAmount}, 总dmepa: {$formattedTotalMadow}",
];
}
return $newDatas;

14
application/admin/controller/shopro/user/User.php
查看文件

@@ -40,7 +40,7 @@ class User extends Common
$list = $paginator->items();
foreach ($list as &$user) {
$agent = $user->agent;
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent, $rate);
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent, $rate, $user);
foreach ($partner as $k => $v) {
$user->$k = $v;
}
@@ -110,7 +110,7 @@ class User extends Common
$this->error(__('No Results were found'));
}
$agent = \addons\shopro\service\partner\IdentityService::findAgent($id);
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent);
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent, null, $user);
$data = array_merge($user->toArray(), $partner);
$data['has_agent'] = (bool) $agent;
@@ -363,7 +363,7 @@ class User extends Common
return WalletService::change($userId, 'score', $amount, 'admin_recharge', [], $memo ?: '后台管理调整积分');
}
// 对于马豆 (madow) 与兑换券 (voucher)，属于合伙人二开资产体系
// 对于dmepa (madow) 与兑换券 (voucher)，属于合伙人二开资产体系
$agent = \app\admin\model\shopro\commission\Agent::where('user_id', $userId)->lock(true)->find();
if (!$agent) {
// 自动为用户初始化分销商记录，以便承载二开资产体系
@@ -392,13 +392,13 @@ class User extends Common
$role = !empty($identity['identities']) ? end($identity['identities']) : 'taster';
if ($type === 'madow') {
// 马豆充值或扣除 (8位小数精度)
// dmepa充值或扣除 (8位小数精度)
$currentMadow = (string) ($agent->madow ?? '0.00000000');
$amountMadow = function_exists('bcadd') ? bcadd((string) $amount, '0', 8) : number_format((float) $amount, 8, '.', '');
$afterMadow = function_exists('bcadd') ? bcadd($currentMadow, $amountMadow, 8) : ($currentMadow + $amountMadow);
if ((float) $afterMadow < 0) {
error_stop('当前持仓马豆不足，无法扣除');
error_stop('当前持仓dmepa不足，无法扣除');
}
$rate = (new \addons\shopro\service\partner\RateService())->currentRate();
@@ -417,8 +417,8 @@ class User extends Common
'rate' => $rate,
'settle_date' => null, // 设为 null，避免与每日均分的 uk_daily_user_type 发生索引冲突
'ext' => [
'formula' => ($amount > 0 ? '管理员充值马豆: +' : '管理员扣除马豆: ') . $amountMadow,
'memo' => $memo ?: ($amount > 0 ? '管理员充值马豆' : '管理员扣除马豆'),
'formula' => ($amount > 0 ? '管理员充值dmepa: +' : '管理员扣除dmepa: ') . $amountMadow,
'memo' => $memo ?: ($amount > 0 ? '管理员充值dmepa' : '管理员扣除dmepa'),
'operator' => $operDesc,
'before' => $currentMadow,
'after' => $afterMadow,

12
application/admin/model/shopro/commission/Agent.php
查看文件

@@ -22,6 +22,8 @@ class Agent extends Common
'pending_reward',
'identity_text',
'identities',
'is_guest',
'has_purchased',
'is_partner',
'is_advanced',
'maker_level_name',
@@ -91,6 +93,16 @@ class Agent extends Common
return \addons\shopro\service\partner\IdentityService::build($data)['identities'];
}
public function getIsGuestAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['is_guest'] ?? false;
}
public function getHasPurchasedAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['has_purchased'] ?? false;
}
public function getIsPartnerAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['is_partner'];

2
application/admin/model/shopro/partner/Reward.php
查看文件

@@ -122,7 +122,7 @@ class Reward extends Common
'money' => '商城余额',
'commission' => '佣金钱包',
'voucher' => '消费补贴券',
'madow' => '分红马豆',
'madow' => '分红dmepa',
'system' => '平台留存',
];
return $map[$type] ?? '商城余额';

4
application/admin/view/shopro/commission/agent/detail.html
查看文件

@@ -353,7 +353,7 @@
<el-form-item label="进阶团队分润:">
<strong>{{ state.data.partner_exclusive_cash || '0.00' }}</strong> 元
</el-form-item>
<el-form-item label="每日贡献马豆:">
<el-form-item label="每日贡献dmepa:">
{{ state.data.madow || 0 }}（约合 ¥{{ state.data.madow_value || '0.00' }}）
</el-form-item>
<el-form-item label="消费补贴兑换券:">
@@ -373,7 +373,7 @@
<el-tag size="small" type="info">免自购考核 (基础会员/{{ state.data.custom_role_names?.taster || '品酒师' }})</el-tag>
</el-form-item>
<el-form-item label="进阶权益:">
<span style="color: var(--sa-subfont);">升级{{ state.data.custom_role_names?.maker || '创客' }}或开通{{ (state.data.custom_role_names?.venue || '馆').substr(0, 1) }}/{{ (state.data.custom_role_names?.county || '县').substr(0, 1) }}/{{ (state.data.custom_role_names?.partner || '股东').substr(0, 2) }}后即可享有团队奖、级差奖与马豆分红</span>
<span style="color: var(--sa-subfont);">升级{{ state.data.custom_role_names?.maker || '创客' }}或开通{{ (state.data.custom_role_names?.venue || '馆').substr(0, 1) }}/{{ (state.data.custom_role_names?.county || '县').substr(0, 1) }}/{{ (state.data.custom_role_names?.partner || '股东').substr(0, 2) }}后即可享有团队奖、级差奖与dmepa分红</span>
</el-form-item>
</template>

2
application/admin/view/shopro/commission/agent/index.html
查看文件

@@ -80,7 +80,7 @@
</template>
</template>
</el-table-column>
<el-table-column label="马豆" min-width="130">
<el-table-column label="dmepa" min-width="130">
<template #default="scope">
<div>{{ scope.row.madow || 0 }}</div>
<div class="sa-color--info" style="font-size:12px">约合 ¥{{ scope.row.madow_value || '0.00' }}</div>

46
application/admin/view/shopro/dashboard/index.html
查看文件

@@ -381,21 +381,21 @@
</div>
</el-col>
<!-- 马豆积分池 -->
<!-- dmepa积分池 -->
<el-col :xs="24" :sm="12" :md="6" :lg="6" :xl="6">
<div class="wealth-kpi-card card">
<div class="sa-flex sa-row-between">
<span class="kpi-title">马豆积分总池</span>
<span class="kpi-title">dmepa积分总池</span>
<el-tooltip content="基于每日订单利润按规则均分释放，用于商城生态赋能，非现金回购" placement="top">
<el-tag size="small" type="success" effect="plain">日结均分</el-tag>
</el-tooltip>
</div>
<div class="kpi-main-num text-purple">
{{ state.madow.total_madow }} <span class="unit">豆</span>
{{ state.madow.total_madow }} <span class="unit">dmepa</span>
</div>
<div class="kpi-sub-row sa-flex sa-row-between">
<span>单价：<strong>{{ state.madow.current_rate }}</strong></span>
<span>每万豆价值：<strong class="text-purple">¥{{ state.madow.rate_per_wan }}</strong></span>
<span>每万dmepa价值：<strong class="text-purple">¥{{ state.madow.rate_per_wan }}</strong></span>
</div>
<div class="kpi-footer sa-flex sa-row-between">
<span>累计结算订单数：<strong>{{ state.madow.history_order_n }} 单</strong></span>
@@ -491,13 +491,13 @@
</div>
</el-col>
<!-- 马豆价值与汇率核算 -->
<!-- dmepa价值与汇率核算 -->
<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
<div class="finance-hub-card card">
<div class="sa-flex sa-row-between mb-2">
<div class="sa-flex">
<span class="network-badge mr-2" style="background: #722ed1;">豆</span>
<span class="font-bold text-dark" style="font-size: 14px;">马豆价值与汇率核算</span>
<span class="network-badge mr-2" style="background: #722ed1;">dmepa</span>
<span class="font-bold text-dark" style="font-size: 14px;">dmepa价值与汇率核算</span>
</div>
<el-tag size="small" type="success" effect="light">汇率动态增值</el-tag>
</div>
@@ -506,14 +506,14 @@
<span class="unit" style="font-size: 12px; font-weight: normal; color: var(--sa-subfont);">当前折合总价值</span>
</div>
<div class="finance-sub-metric sa-flex sa-row-between">
<span>① 全网持豆总量：</span>
<strong class="text-purple">{{ state.madow.total_madow }} 豆</strong>
<span>① 全网持仓总量：</span>
<strong class="text-purple">{{ state.madow.total_madow }} dmepa</strong>
</div>
<div class="finance-sub-metric sa-flex sa-row-between">
<span>② 当前汇率单价 (1豆)：</span>
<span>② 当前汇率单价 (1 dmepa)：</span>
<div>
<strong class="text-dark">¥{{ state.madow.current_rate }}</strong>
<span style="font-size: 11px; color: var(--sa-subfont); margin-left: 4px;">(每万豆约 ¥{{ state.madow.rate_per_wan }})</span>
<span style="font-size: 11px; color: var(--sa-subfont); margin-left: 4px;">(每万dmepa约 ¥{{ state.madow.rate_per_wan }})</span>
</div>
</div>
<div class="finance-sub-metric sa-flex sa-row-between">
@@ -551,12 +551,12 @@
</span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px;">
<span>持豆：<strong class="text-purple">{{ state.partner.role_stats?.taster?.madow_total || '0.00000000' }}</strong> 豆</span>
<span>持仓：<strong class="text-purple">{{ state.partner.role_stats?.taster?.madow_total || '0.00000000' }}</strong> dmepa</span>
<span>收益：<strong class="text-warning">¥{{ state.partner.role_stats?.taster?.reward_amount || '0.00' }}</strong> ({{ state.partner.role_stats?.taster?.reward_count || 0 }}笔)</span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px; margin-top: 6px;">
<span>30天活跃率：<strong class="text-success">{{ state.partner.role_stats?.taster?.active_rate || 0 }}%</strong> ({{ state.partner.role_stats?.taster?.active_count || 0 }}人)</span>
<span>马豆折合：<strong class="text-purple">¥{{ state.partner.role_stats?.taster?.madow_cny || '0.00' }}</strong></span>
<span>dmepa折合：<strong class="text-purple">¥{{ state.partner.role_stats?.taster?.madow_cny || '0.00' }}</strong></span>
</div>
<el-progress :percentage="state.partner.role_stats?.taster?.active_rate || 0" :stroke-width="5" :show-text="false" color="#52c41a" style="margin-top: 8px;"></el-progress>
</div>
@@ -575,11 +575,11 @@
</span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px;">
<span>持豆：<strong class="text-purple">{{ state.partner.role_stats?.maker_total?.madow_total || '0.00000000' }}</strong> 豆</span>
<span>持仓：<strong class="text-purple">{{ state.partner.role_stats?.maker_total?.madow_total || '0.00000000' }}</strong> dmepa</span>
<span>收益：<strong class="text-warning">¥{{ state.partner.role_stats?.maker_total?.reward_amount || '0.00' }}</strong> ({{ state.partner.role_stats?.maker_total?.reward_count || 0 }}笔)</span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px; margin-top: 6px;">
<span>马豆折合：<strong class="text-purple">¥{{ state.partner.role_stats?.maker_total?.madow_cny || '0.00' }}</strong></span>
<span>dmepa折合：<strong class="text-purple">¥{{ state.partner.role_stats?.maker_total?.madow_cny || '0.00' }}</strong></span>
<span>活跃率：<strong class="text-success">{{ state.partner.role_stats?.maker_total?.active_rate || 0 }}%</strong> ({{ state.partner.role_stats?.maker_total?.active_count || 0 }}人)</span>
</div>
<div class="sa-flex sa-flex-wrap" style="margin-top: 6px;">
@@ -604,10 +604,10 @@
</div>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px;">
<span>{{ state.partner.role_names?.venue || '酒道馆' }}：持豆 <strong class="text-purple">{{ state.partner.role_stats?.venue?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.venue?.reward_amount || '0.00' }}</strong></span>
<span>{{ state.partner.role_names?.venue || '酒道馆' }}：持仓 <strong class="text-purple">{{ state.partner.role_stats?.venue?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.venue?.reward_amount || '0.00' }}</strong></span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px; margin-top: 6px;">
<span>{{ state.partner.role_names?.county || '区县代理' }}：持豆 <strong class="text-purple">{{ state.partner.role_stats?.county?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.county?.reward_amount || '0.00' }}</strong></span>
<span>{{ state.partner.role_names?.county || '区县代理' }}：持仓 <strong class="text-purple">{{ state.partner.role_stats?.county?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.county?.reward_amount || '0.00' }}</strong></span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px; margin-top: 6px;">
<span>享团队级差分润 + 平台日结均分池</span>
@@ -625,7 +625,7 @@
<div>
<span class="font-bold text-dark" style="font-size: 15px;">全角色会员资产与收益分布明细表</span>
<span style="font-size: 12px; color: var(--sa-subfont); margin-left: 12px;">
清晰统计各角色会员的人数、持豆总量、折合价值、专属业务收益与发放笔数
清晰统计各角色会员的人数、持仓总量、折合价值、专属业务收益与发放笔数
</span>
</div>
<div class="sa-flex" style="margin-top: 4px;">
@@ -658,14 +658,14 @@
</template>
</el-table-column>
<el-table-column label="持豆总量 (马豆)" min-width="160" align="right">
<el-table-column label="持仓总量 (dmepa)" min-width="160" align="right">
<template #default="scope">
<span class="text-purple font-bold">{{ scope.row.madow_total }}</span>
<span style="font-size: 11px; color: var(--sa-subfont); margin-left: 2px;">豆</span>
<span style="font-size: 11px; color: var(--sa-subfont); margin-left: 2px;">dmepa</span>
</template>
</el-table-column>
<el-table-column label="马豆折合价值 (元)" min-width="150" align="right">
<el-table-column label="dmepa折合价值 (元)" min-width="150" align="right">
<template #default="scope">
<span class="font-bold text-purple">¥{{ scope.row.madow_cny }}</span>
<div v-if="scope.row.madow_cny === '0.00' && scope.row.madow_cny_raw > 0" style="font-size: 10px; color: #999;">
@@ -1005,7 +1005,7 @@
</div>
<div class="sa-flex sa-row-between mt-3 pt-2" style="border-top: 1px dashed var(--sa-space); font-size: 12px; color: var(--sa-subfont);">
<span>所选时段日结马豆发放：<strong class="text-purple">{{ chart.data.periodMadow }} 豆</strong></span>
<span>所选时段日结dmepa发放：<strong class="text-purple">{{ chart.data.periodMadow }} dmepa</strong></span>
<el-button type="primary" link size="small" @click="onOpenDaily">日结池明细</el-button>
</div>
</div>
@@ -1135,7 +1135,7 @@
<div>累计合格单数：<strong>{{ ranking.recentReport.order_count_n }} 单</strong></div>
</el-col>
<el-col :span="12">
<div>马豆均分池：<strong class="text-purple">{{ ranking.recentReport.madow_pool }} 豆</strong> ({{ ranking.recentReport.share_user_count }}人)</div>
<div>dmepa均分池：<strong class="text-purple">{{ ranking.recentReport.madow_pool }} dmepa</strong> ({{ ranking.recentReport.share_user_count }}人)</div>
<div>酒道馆奖励池：<strong class="text-warning">¥{{ ranking.recentReport.venue_pool }}</strong> ({{ ranking.recentReport.venue_user_count }}人)</div>
<div>区县代理奖励池：<strong class="text-warning">¥{{ ranking.recentReport.county_pool }}</strong> ({{ ranking.recentReport.county_user_count }}人)</div>
</el-col>

10
application/admin/view/shopro/order/order/detail.html
查看文件

@@ -929,11 +929,11 @@
<template #default="scope">
<template v-if="scope.row.display === 'share'">
<div style="font-weight: 600; color: var(--el-color-primary);">
{{ scope.row.amount_text || (scope.row.unit === '马豆' ? (scope.row.each_madow + ' 马豆/人') : ('¥' + scope.row.each_amount + '/人')) }}
{{ scope.row.amount_text || (scope.row.unit === 'dmepa' ? (scope.row.each_madow + ' dmepa/人') : ('¥' + scope.row.each_amount + '/人')) }}
</div>
<div style="font-size:12px;color:var(--sa-subfont)">
<template v-if="scope.row.unit === '马豆'">
奖池合计: {{ scope.row.total_madow }} 马豆
<template v-if="scope.row.unit === 'dmepa'">
奖池合计: {{ scope.row.total_madow }} dmepa
</template>
<template v-else>
奖池合计: ¥{{ scope.row.total_amount }}
@@ -948,7 +948,7 @@
¥{{ scope.row.amount }}
</div>
<div v-else-if="Number(scope.row.madow) > 0" style="font-weight: 600; color: #67c23a;">
{{ scope.row.madow }} 马豆
{{ scope.row.madow }} dmepa
</div>
<div v-else style="color: var(--sa-subfont);">
¥0.00
@@ -962,7 +962,7 @@
size="small"
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'commission' ? 'warning' : (scope.row.wallet_type === 'madow' ? 'primary' : 'info'))"
>
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红马豆' : '平台留存')) }}
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '平台留存')) }}
</el-tag>
</template>
</el-table-column>

10
application/admin/view/shopro/partner/daily/index.html
查看文件

@@ -32,8 +32,8 @@
<el-table-column prop="gmv" label="GMV" min-width="110"></el-table-column>
<el-table-column prop="order_count_n" label="汇率N" min-width="90"></el-table-column>
<el-table-column prop="rate" label="汇率" min-width="120"></el-table-column>
<el-table-column prop="madow_pool" label="马豆池" min-width="120"></el-table-column>
<el-table-column prop="share_user_count" label="马豆人数" min-width="90"></el-table-column>
<el-table-column prop="madow_pool" label="dmepa池" min-width="120"></el-table-column>
<el-table-column prop="share_user_count" label="dmepa人数" min-width="90"></el-table-column>
<el-table-column prop="venue_pool" label="酒道馆奖池" min-width="110"></el-table-column>
<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>
@@ -134,11 +134,11 @@
</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;">马豆贡献池 (1:1 GMV)</div>
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">dmepa贡献池 (1:1 GMV)</div>
<div style="font-size:12px;color:#606266;line-height:1.8;">
马豆总池：<b>{{ previewDialog.result.madow?.pool }}</b> 豆<br>
dmepa总池：<b>{{ previewDialog.result.madow?.pool }}</b> dmepa<br>
合格人数：<b>{{ previewDialog.result.madow?.user_count }}</b> 人<br>
人均马豆：<b>{{ previewDialog.result.madow?.each }}</b><br>
人均dmepa：<b>{{ previewDialog.result.madow?.each }}</b><br>
即时汇率：<b>{{ previewDialog.result.rate }}</b>
</div>
</div>

8
application/admin/view/shopro/partner/reward/index.html
查看文件

@@ -58,11 +58,11 @@
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 ? '分红马豆' : '消费补贴')) }}
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="马豆" min-width="110">
<el-table-column label="dmepa" min-width="110">
<template #default="scope"> {{ scope.row.madow }} </template>
</el-table-column>
<el-table-column prop="base_amount" label="基数" min-width="80"></el-table-column>
@@ -147,7 +147,7 @@
</div>
</el-col>
<el-col :span="8">
<div style="color:#909399;font-size:12px;">贡献马豆 (1:1 GMV)</div>
<div style="color:#909399;font-size:12px;">贡献dmepa (1:1 GMV)</div>
<div style="font-weight:bold;font-size:18px;color:#409eff;margin-top:2px;">{{ orderTreeDialog.data.summary?.total_madow || '0.00000000' }}</div>
</el-col>
</el-row>
@@ -181,7 +181,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column prop="madow" label="马豆" width="100"></el-table-column>
<el-table-column prop="madow" label="dmepa" width="100"></el-table-column>
<el-table-column prop="status_text" label="状态" width="80">
<template #default="scope">
<span :class="scope.row.status == 1 ? 'sa-color--success' : (scope.row.status == -2 ? 'sa-color--danger' : 'sa-color--info')">

14
application/admin/view/shopro/user/user/detail.html
查看文件

@@ -184,7 +184,7 @@
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="money">充值余额 (元)</el-dropdown-item>
<el-dropdown-item command="madow">充值马豆 (颗)</el-dropdown-item>
<el-dropdown-item command="madow">充值dmepa (颗)</el-dropdown-item>
<el-dropdown-item command="score">充值积分 (分)</el-dropdown-item>
<el-dropdown-item command="voucher">充值兑换券 (个)</el-dropdown-item>
</el-dropdown-menu>
@@ -434,11 +434,11 @@
</div>
</el-col>
<!-- 资产 2: 分红马豆 -->
<!-- 资产 2: 分红dmepa -->
<el-col :xs="24" :sm="12" :md="6">
<div class="asset-card-box">
<div class="asset-card-label sa-flex sa-row-between" style="display: flex; justify-content: space-between; align-items: center;">
<span>分红马豆</span>
<span>分红dmepa</span>
{if $auth->check('shopro/user/user/recharge')}
<el-button type="success" link size="small" @click="onRecharge('madow')">充值/扣除</el-button>
{/if}
@@ -544,11 +544,11 @@
<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 ? '分红马豆' : '消费补贴')) }}
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="madow" label="结算马豆" min-width="90"></el-table-column>
<el-table-column prop="madow" label="结算dmepa" min-width="90"></el-table-column>
<el-table-column label="买家" min-width="140">
<template #default="scope">
<sa-user-profile v-if="scope.row.buyer" :user="scope.row.buyer" :id="scope.row.buyer_id"></sa-user-profile>
@@ -746,9 +746,9 @@
<el-tag size="small">{{ formulaDialog.row.reward_type_text || formulaDialog.row.reward_type }}</el-tag>
</div>
<div class="mb-3">
<span style="font-weight: 600;">结算金额/马豆：</span>
<span style="font-weight: 600;">结算金额/dmepa：</span>
<b>¥{{ formulaDialog.row.amount }}</b>
<span v-if="formulaDialog.row.madow > 0" class="ml-2">({{ formulaDialog.row.madow }} 马豆)</span>
<span v-if="formulaDialog.row.madow > 0" class="ml-2">({{ formulaDialog.row.madow }} dmepa)</span>
</div>
<div class="mb-3" v-if="formulaDialog.row.ext?.skip_reason">
<span style="font-weight: 600; color: #e6a23c;">跳过/未发放原因：</span>

6
application/admin/view/shopro/user/user/index.html
查看文件

@@ -157,10 +157,10 @@
</template>
</el-table-column>
<el-table-column label="马豆与补贴券" min-width="170">
<el-table-column label="dmepa与补贴券" min-width="170">
<template #default="scope">
<div><span class="asset-sub">分红马豆:</span> {{ scope.row.madow || 0 }} 颗</div>
<div class="asset-sub">马豆估值: ¥{{ scope.row.madow_value || '0.00' }}</div>
<div><span class="asset-sub">分红dmepa:</span> {{ scope.row.madow || 0 }} 颗</div>
<div class="asset-sub">dmepa估值: ¥{{ scope.row.madow_value || '0.00' }}</div>
<div class="asset-sub">可用券: {{ scope.row.voucher_available || '0.00' }} 个</div>
</template>
</el-table-column>

4
application/admin/view/shopro/user/user/recharge.html
查看文件

@@ -28,7 +28,7 @@
</el-col>
<el-col :span="6">
<div style="background: #ffffff; padding: 8px 10px; border-radius: 6px; border: 1px solid #edf2f7; text-align: center;">
<div style="font-size: 11px; color: #64748b;">分红马豆</div>
<div style="font-size: 11px; color: #64748b;">分红dmepa</div>
<div style="font-size: 13px; font-weight: 600; color: #16a34a; margin-top: 2px;">{{ state.user.madow || '0' }} <span style="font-size: 10px;">颗</span></div>
</div>
</el-col>
@@ -52,7 +52,7 @@
<el-form-item label="充值资产类型" prop="type">
<el-radio-group v-model="form.model.type" @change="onTypeChange">
<el-radio-button label="money">余额 (元)</el-radio-button>
<el-radio-button label="madow">马豆 (颗)</el-radio-button>
<el-radio-button label="madow">dmepa (颗)</el-radio-button>
<el-radio-button label="score">积分 (分)</el-radio-button>
<el-radio-button label="voucher">兑换券 (个)</el-radio-button>
</el-radio-group>

2
application/extra/site.php
查看文件

@@ -4,7 +4,7 @@ return [
'name' => '恒链数通',
'beian' => '',
'cdnurl' => '',
'version' => '1.0.3',
'version' => '1.0.5',
'timezone' => 'Asia/Shanghai',
'forbiddenip' => '',
'languages' => [