feat(dmepa): 全局统一规范DMEPA命名并优化游客与品酒师身份显示
这个提交包含在:
@@ -9,7 +9,7 @@ use app\admin\model\shopro\partner\Reward as RewardModel;
|
||||
use app\admin\model\shopro\commission\Agent as AgentModel;
|
||||
|
||||
/**
|
||||
* 日结:马豆 / 馆县均分 / 券释放
|
||||
* 日结:dmepa / 馆县均分 / 券释放
|
||||
*/
|
||||
class DailySettleService
|
||||
{
|
||||
@@ -56,7 +56,7 @@ class DailySettleService
|
||||
}
|
||||
|
||||
/**
|
||||
* 临时分钟级调度:执行未结算订单的马豆分红,并释放一期兑换券
|
||||
* 临时分钟级调度:执行未结算订单的dmepa分红,并释放一期兑换券
|
||||
*/
|
||||
public function runMinute()
|
||||
{
|
||||
@@ -79,7 +79,7 @@ class DailySettleService
|
||||
// 1. 兑换券 1 分钟释放一次
|
||||
$voucherTotal = (new VoucherService())->releaseMinute();
|
||||
|
||||
// 2. 马豆 1 分钟结算一次(提取已支付但尚未结算马豆的合格订单)
|
||||
// 2. dmepa 1 分钟结算一次(提取已支付但尚未结算dmepa的合格订单)
|
||||
$allQualifiedOrders = $rateService->qualifiedOrderQuery()->field('o.id,o.pay_fee,o.user_id,o.ext,o.paid_time')->select();
|
||||
$unsettledOrders = [];
|
||||
$madowGmv = 0;
|
||||
@@ -106,7 +106,7 @@ class DailySettleService
|
||||
|
||||
$madowRes = (new MadowService())->shareMinute($madowGmv, $tasterIds, $settledOrderIds);
|
||||
|
||||
// 标记订单已结算马豆
|
||||
// 标记订单已结算dmepa
|
||||
foreach ($unsettledOrders as $o) {
|
||||
$freshExt = \think\Db::name('shopro_order')->where('id', $o['id'])->value('ext');
|
||||
$ext = is_array($freshExt) ? $freshExt : (json_decode($freshExt ?? '', true) ?: []);
|
||||
@@ -208,7 +208,7 @@ class DailySettleService
|
||||
->where('status', 1)
|
||||
->sum('amount');
|
||||
|
||||
// 当日累计发放马豆总额
|
||||
// 当日累计发放dmepa总额
|
||||
$todayMadowPool = (float) \think\Db::name('shopro_partner_reward')
|
||||
->whereBetween('createtime', [$todayStart, $todayEnd])
|
||||
->where('reward_type', 'madow_share')
|
||||
@@ -570,7 +570,7 @@ class DailySettleService
|
||||
$orderCountN = $rateService->countN();
|
||||
$rate = $rateService->calcRate($orderCountN);
|
||||
|
||||
// 马豆池 (1:1 GMV)
|
||||
// dmepa池 (1:1 GMV)
|
||||
$madowPool = (float) $gmv;
|
||||
$madowEach = $tasterCount > 0 ? (function_exists('bcdiv') ? bcdiv((string) $madowPool, (string) $tasterCount, 8) : number_format($madowPool / $tasterCount, 8, '.', '')) : '0.00000000';
|
||||
|
||||
|
||||
@@ -9,11 +9,52 @@ use app\admin\model\shopro\commission\Agent as AgentModel;
|
||||
*/
|
||||
class IdentityService
|
||||
{
|
||||
public static function build($agent)
|
||||
public static function hasPurchased($userId, $user = null)
|
||||
{
|
||||
$userId = intval($userId);
|
||||
if ($userId <= 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 1. 如果传入了 user 对象且 total_consume > 0,快速命中
|
||||
if ($user) {
|
||||
$consume = floatval(is_array($user) ? ($user['total_consume'] ?? 0) : ($user->total_consume ?? 0));
|
||||
if ($consume > 0) {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
// 若未传入 user 对象,轻量获取 user 表的 total_consume 尝试命中
|
||||
try {
|
||||
$userConsume = \think\Db::name('user')->where('id', $userId)->value('total_consume');
|
||||
if (floatval($userConsume) > 0) {
|
||||
return true;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
// 容错继续
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 查询有效已支付订单(排除全额退款完成的订单)
|
||||
try {
|
||||
$hasOrder = \think\Db::name('shopro_order')
|
||||
->where('user_id', $userId)
|
||||
->whereIn('status', ['paid', 'completed'])
|
||||
->where('apply_refund_status', '<>', 2)
|
||||
->whereNull('deletetime')
|
||||
->count() > 0;
|
||||
return $hasOrder;
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static function build($agent, $user = null)
|
||||
{
|
||||
$empty = [
|
||||
'identities' => [],
|
||||
'identity_text' => '',
|
||||
'identities' => ['guest'],
|
||||
'identity_text' => '游客',
|
||||
'is_guest' => true,
|
||||
'has_purchased' => false,
|
||||
'is_partner' => false,
|
||||
'is_advanced' => false,
|
||||
'maker_level_name' => '',
|
||||
@@ -23,24 +64,33 @@ class IdentityService
|
||||
if (!$agent) {
|
||||
return $empty;
|
||||
}
|
||||
$userId = intval(is_array($agent) ? ($agent['user_id'] ?? 0) : ($agent->user_id ?? 0));
|
||||
$level = intval(is_array($agent) ? ($agent['level'] ?? 0) : ($agent->level ?? 0));
|
||||
$isVenue = intval(is_array($agent) ? ($agent['is_venue'] ?? 0) : ($agent->is_venue ?? 0));
|
||||
$isCounty = intval(is_array($agent) ? ($agent['is_county'] ?? 0) : ($agent->is_county ?? 0));
|
||||
$isPartner = intval(is_array($agent) ? ($agent['is_partner'] ?? 0) : ($agent->is_partner ?? 0));
|
||||
|
||||
$roleNames = PartnerConfig::roleNames();
|
||||
$tasterName = $roleNames['taster'];
|
||||
$makerBaseName = $roleNames['maker'];
|
||||
$venueName = $roleNames['venue'];
|
||||
$countyName = $roleNames['county'];
|
||||
$partnerName = $roleNames['partner'];
|
||||
$tasterName = $roleNames['taster'] ?? '品酒师';
|
||||
$makerBaseName = $roleNames['maker'] ?? '创客';
|
||||
$venueName = $roleNames['venue'] ?? '酒道馆';
|
||||
$countyName = $roleNames['county'] ?? '区县';
|
||||
$partnerName = $roleNames['partner'] ?? '合伙股东';
|
||||
|
||||
$isAdvanced = ($level >= 2) || ($isVenue == 1) || ($isCounty == 1) || ($isPartner == 1);
|
||||
$hasPurchased = $userId > 0 ? self::hasPurchased($userId, $user ?: (is_array($agent) ? ($agent['user'] ?? null) : ($agent->user ?? null))) : false;
|
||||
$isGuest = ($level == 1 && !$hasPurchased && !$isAdvanced);
|
||||
|
||||
$identities = [];
|
||||
$parts = [];
|
||||
$makerLevelName = '';
|
||||
|
||||
if ($level == 1) {
|
||||
$identities[] = 'taster';
|
||||
if ($hasPurchased) {
|
||||
$identities[] = 'taster';
|
||||
} elseif (!$isAdvanced) {
|
||||
$identities[] = 'guest';
|
||||
}
|
||||
} elseif ($level >= 2) {
|
||||
$identities[] = 'maker';
|
||||
$makerLevelName = $makerBaseName . 'V' . ($level - 1);
|
||||
@@ -59,16 +109,16 @@ class IdentityService
|
||||
$parts[] = $partnerName;
|
||||
}
|
||||
|
||||
// 若无进阶角色身份且等级为1,则身份为基础品酒师/自定义基础名称
|
||||
// 若无进阶角色身份且等级为1,根据是否买单显示品酒师或游客
|
||||
if (empty($parts) && $level == 1) {
|
||||
$parts[] = $tasterName;
|
||||
$parts[] = $hasPurchased ? $tasterName : '游客';
|
||||
}
|
||||
|
||||
$isAdvanced = ($level >= 2) || ($isVenue == 1) || ($isCounty == 1) || ($isPartner == 1);
|
||||
|
||||
return [
|
||||
'identities' => $identities,
|
||||
'identity_text' => implode(' · ', $parts),
|
||||
'identity_text' => implode(' · ', $parts) ?: ($isGuest ? '游客' : ''),
|
||||
'is_guest' => $isGuest,
|
||||
'has_purchased' => $hasPurchased,
|
||||
'is_partner' => (bool) $isPartner,
|
||||
'is_advanced' => $isAdvanced,
|
||||
'maker_level_name' => $makerLevelName,
|
||||
@@ -85,7 +135,7 @@ class IdentityService
|
||||
public static function formatMadow($value)
|
||||
{
|
||||
$floatVal = (float) $value;
|
||||
// 当存在小于 1 豆且大于 0 的微量马豆时,自适应保留有效小数(最多4位),避免直接抹零显示为 0 豆
|
||||
// 当存在小于 1 豆且大于 0 的微量dmepa时,自适应保留有效小数(最多4位),避免直接抹零显示为 0 豆
|
||||
if ($floatVal > 0 && $floatVal < 1) {
|
||||
return rtrim(rtrim(number_format($floatVal, 4, '.', ''), '0'), '.');
|
||||
}
|
||||
@@ -107,12 +157,12 @@ class IdentityService
|
||||
return $trimmed !== '' ? $trimmed : '0';
|
||||
}
|
||||
|
||||
public static function attachAgent($agent, $rate = null)
|
||||
public static function attachAgent($agent, $rate = null, $user = null)
|
||||
{
|
||||
if (!$agent) {
|
||||
return null;
|
||||
}
|
||||
$identity = self::build($agent);
|
||||
$identity = self::build($agent, $user);
|
||||
$madow = is_array($agent) ? ($agent['madow'] ?? 0) : ($agent->madow ?? 0);
|
||||
$released = is_array($agent) ? ($agent['voucher_released'] ?? 0) : ($agent->voucher_released ?? 0);
|
||||
$used = is_array($agent) ? ($agent['voucher_used'] ?? 0) : ($agent->voucher_used ?? 0);
|
||||
@@ -185,14 +235,16 @@ class IdentityService
|
||||
]);
|
||||
}
|
||||
|
||||
public static function attachProfile($agent, $rate = null)
|
||||
public static function attachProfile($agent, $rate = null, $user = null)
|
||||
{
|
||||
if (!$agent) {
|
||||
$baseRate = PartnerConfig::get('partner_madow_base_rate', '0.00000075');
|
||||
$roleNames = PartnerConfig::roleNames();
|
||||
return [
|
||||
'identity_text' => '',
|
||||
'identities' => [],
|
||||
'identity_text' => '游客',
|
||||
'identities' => ['guest'],
|
||||
'is_guest' => true,
|
||||
'has_purchased' => false,
|
||||
'is_partner' => false,
|
||||
'is_advanced' => false,
|
||||
'maker_level_name' => '',
|
||||
@@ -215,11 +267,13 @@ class IdentityService
|
||||
'partner_mode' => PartnerConfig::isPartnerMode(),
|
||||
];
|
||||
}
|
||||
$full = self::attachAgent($agent, $rate);
|
||||
$full = self::attachAgent($agent, $rate, $user);
|
||||
$roleNames = $full['role_names'] ?? PartnerConfig::roleNames();
|
||||
return [
|
||||
'identity_text' => $full['identity_text'],
|
||||
'identities' => $full['identities'],
|
||||
'is_guest' => $full['is_guest'] ?? false,
|
||||
'has_purchased' => $full['has_purchased'] ?? false,
|
||||
'is_partner' => $full['is_partner'],
|
||||
'is_advanced' => $full['is_advanced'] ?? false,
|
||||
'maker_level_name' => $full['maker_level_name'],
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace addons\shopro\service\partner;
|
||||
use app\admin\model\shopro\commission\Agent as AgentModel;
|
||||
|
||||
/**
|
||||
* 马豆日结 1:1 GMV 均分
|
||||
* dmepa日结 1:1 GMV 均分
|
||||
*/
|
||||
class MadowService
|
||||
{
|
||||
@@ -27,7 +27,7 @@ class MadowService
|
||||
'madow' => $pool,
|
||||
'base_amount' => $pool,
|
||||
'settle_date' => $settleDate,
|
||||
'ext' => ['formula' => "分母为0,马豆池 {$pool} 进平台", 'skip_reason' => ''],
|
||||
'ext' => ['formula' => "分母为0,dmepa池 {$pool} 进平台", 'skip_reason' => ''],
|
||||
'status' => 1,
|
||||
]);
|
||||
return ['pool' => $pool, 'count' => 0, 'each' => 0];
|
||||
@@ -83,7 +83,7 @@ class MadowService
|
||||
}
|
||||
|
||||
/**
|
||||
* 临时分钟级马豆结算均分
|
||||
* 临时分钟级dmepa结算均分
|
||||
*/
|
||||
public function shareMinute($gmv, $userIds, $orderIds = [])
|
||||
{
|
||||
@@ -107,7 +107,7 @@ class MadowService
|
||||
'madow' => $pool,
|
||||
'base_amount' => $pool,
|
||||
'settle_date' => null,
|
||||
'ext' => ['formula' => "分母为0,马豆池 {$pool} 进平台", 'orders' => $orderIds],
|
||||
'ext' => ['formula' => "分母为0,dmepa池 {$pool} 进平台", 'orders' => $orderIds],
|
||||
'status' => 1,
|
||||
]);
|
||||
return ['pool' => $pool, 'count' => 0, 'each' => 0];
|
||||
|
||||
@@ -49,6 +49,123 @@ class PartnerConfig
|
||||
return intval($show) ? 1 : 0;
|
||||
}
|
||||
|
||||
public static function isMadowWithdrawEnabled()
|
||||
{
|
||||
$enable = self::get('partner_madow_withdraw_enable', 1);
|
||||
if ($enable === null || $enable === '') {
|
||||
return 1;
|
||||
}
|
||||
return intval($enable) ? 1 : 0;
|
||||
}
|
||||
|
||||
public static function madowWithdrawMin()
|
||||
{
|
||||
$min = self::get('partner_madow_withdraw_min', 1);
|
||||
if ($min === null || $min === '' || !is_numeric($min)) {
|
||||
return 1.0;
|
||||
}
|
||||
return max(0.0, floatval($min));
|
||||
}
|
||||
|
||||
public static function madowRuleTitle()
|
||||
{
|
||||
$title = trim((string) self::get('partner_madow_rule_title', '市值与增值规则')) ?: '市值与增值规则';
|
||||
return str_replace('马币', '', $title);
|
||||
}
|
||||
|
||||
public static function madowRules()
|
||||
{
|
||||
$defaultRules = [
|
||||
[
|
||||
'title' => 'DMEPA获取与核算',
|
||||
'desc' => '平台合伙人与创客达成考核或完成订单后,系统将于次日 00:30 起统一参与每日DMEPA加权核算并自动分发。',
|
||||
],
|
||||
[
|
||||
'title' => '市值动态增值',
|
||||
'desc' => '市值随全平台订单增加而上浮增值。全网完成订单总量越多,DMEPA单价所对应的市值越高,共享生态红利。',
|
||||
],
|
||||
[
|
||||
'title' => '价值说明与权益',
|
||||
'desc' => '市值仅作为平台数字生态资产价值参考展示,不可直接兑换现金提现。具体权益按平台股东与合伙人章程执行。',
|
||||
],
|
||||
];
|
||||
$rules = self::get('partner_madow_rules', $defaultRules);
|
||||
$normalized = self::normalizeRules($rules, $defaultRules);
|
||||
foreach ($normalized as &$rule) {
|
||||
if (isset($rule['title'])) {
|
||||
$rule['title'] = str_replace('马币', '', $rule['title']);
|
||||
}
|
||||
if (isset($rule['desc'])) {
|
||||
$rule['desc'] = str_replace('马币', '', $rule['desc']);
|
||||
}
|
||||
}
|
||||
unset($rule);
|
||||
return $normalized;
|
||||
}
|
||||
|
||||
public static function voucherRuleTitle()
|
||||
{
|
||||
return trim((string) self::get('partner_voucher_rule_title', '兑换券释放与使用规则')) ?: '兑换券释放与使用规则';
|
||||
}
|
||||
|
||||
public static function voucherRules()
|
||||
{
|
||||
$defaultRules = [
|
||||
[
|
||||
'title' => '赠送与释放天数',
|
||||
'desc' => '会员在平台完成符合条件的商城订单后,系统将按订单金额(默认 1.5 倍)生成兑换券计划,分 365 天按日线性释放。',
|
||||
],
|
||||
[
|
||||
'title' => '每日自动到账',
|
||||
'desc' => '系统将于次日 00:30 起统一执行日结核算,按期释放的兑换券将自动计入您的「可用兑换券」账户,无需手动领取。',
|
||||
],
|
||||
[
|
||||
'title' => '全场购物直接抵扣',
|
||||
'desc' => '可用兑换券可在平台商城下单结算时作为现金抵扣使用,尊享优惠抵扣权益。',
|
||||
],
|
||||
];
|
||||
$rules = self::get('partner_voucher_rules', $defaultRules);
|
||||
return self::normalizeRules($rules, $defaultRules);
|
||||
}
|
||||
|
||||
private static function normalizeRules($rules, array $defaultRules)
|
||||
{
|
||||
if (is_string($rules)) {
|
||||
$decoded = json_decode($rules, true);
|
||||
if (is_array($decoded)) {
|
||||
$rules = $decoded;
|
||||
} else {
|
||||
$lines = array_filter(array_map('trim', explode("\n", $rules)));
|
||||
$parsed = [];
|
||||
foreach ($lines as $line) {
|
||||
$parts = preg_split('/[::]/u', $line, 2);
|
||||
if (count($parts) === 2) {
|
||||
$parsed[] = ['title' => trim($parts[0]), 'desc' => trim($parts[1])];
|
||||
} else {
|
||||
$parsed[] = ['title' => '', 'desc' => $line];
|
||||
}
|
||||
}
|
||||
$rules = !empty($parsed) ? $parsed : $defaultRules;
|
||||
}
|
||||
}
|
||||
if (!is_array($rules) || empty($rules)) {
|
||||
return $defaultRules;
|
||||
}
|
||||
$result = [];
|
||||
foreach ($rules as $item) {
|
||||
if (is_array($item)) {
|
||||
$title = isset($item['title']) ? trim((string) $item['title']) : '';
|
||||
$desc = isset($item['desc']) ? trim((string) $item['desc']) : '';
|
||||
if ($title !== '' || $desc !== '') {
|
||||
$result[] = ['title' => $title, 'desc' => $desc];
|
||||
}
|
||||
} elseif (is_string($item) && trim($item) !== '') {
|
||||
$result[] = ['title' => '', 'desc' => trim($item)];
|
||||
}
|
||||
}
|
||||
return !empty($result) ? $result : $defaultRules;
|
||||
}
|
||||
|
||||
public static function activeDays()
|
||||
{
|
||||
$days = intval(self::get('partner_active_days', 30));
|
||||
@@ -120,8 +237,10 @@ class PartnerConfig
|
||||
'county_peer' => $countyAgentShort . '平级奖',
|
||||
'venue_share' => $venue . '加权奖',
|
||||
'county_share' => $countyShort . '加权奖',
|
||||
'madow_share' => '每日贡献马豆',
|
||||
'admin_madow' => '管理员调整马豆',
|
||||
'madow_share' => '每日贡献dmepa',
|
||||
'madow_withdraw' => 'dmepa提现扣除',
|
||||
'madow_withdraw_refund' => 'dmepa提现退还',
|
||||
'admin_madow' => '管理员调整dmepa',
|
||||
'voucher_grant' => '消费补贴发放',
|
||||
'voucher_release' => '消费补贴到账',
|
||||
'voucher_consume' => '消费券抵扣',
|
||||
|
||||
@@ -7,7 +7,7 @@ use app\admin\model\shopro\order\Order as OrderModel;
|
||||
use app\admin\model\shopro\commission\CommissionGoods;
|
||||
|
||||
/**
|
||||
* 马豆汇率:rate = base * floor(N / n)
|
||||
* dmepa汇率:rate = base * floor(N / n)
|
||||
*/
|
||||
class RateService
|
||||
{
|
||||
@@ -31,7 +31,7 @@ class RateService
|
||||
}
|
||||
|
||||
/**
|
||||
* 主动清除当前马豆汇率缓存(订单支付、退款或后台调整时调用)
|
||||
* 主动清除当前dmepa汇率缓存(订单支付、退款或后台调整时调用)
|
||||
*/
|
||||
public static function clearCache()
|
||||
{
|
||||
|
||||
在新工单中引用
屏蔽一个用户