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';
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户