落地合伙股东收益体系,并纳入 sheep 用户端源码。

Co-authored-by: Cursor <cursoragent@cursor.com>
这个提交包含在:
chen
2026-09-17 07:47:35 +08:00
父节点 7747dfaa82
当前提交 251d62296e
共有 595 个文件被更改,包括 90234 次插入 和 105 次删除

查看文件

@@ -51,6 +51,11 @@ class Config extends Common
'name' => 'shopro/config/commission',
'status' => $this->auth->check('shopro/config/commission')
],
[
'label' => '合伙股东',
'name' => 'shopro/config/partner',
'status' => $this->auth->check('shopro/config/commission')
],
[
'label' => '支付配置',
'name' => 'shopro/pay_config',
@@ -181,6 +186,92 @@ class Config extends Common
$this->success('操作成功', null, $configs);
}
/**
* 合伙股东规则
*/
public function partner()
{
$keys = [
'partner_mode', 'partner_enable', 'partner_count_type', 'partner_active_days',
'partner_chain_max_depth', 'partner_push3_amounts', 'partner_madow_mode',
'partner_madow_base_rate', 'partner_madow_step_orders', 'partner_voucher_times',
'partner_voucher_days', 'partner_maker_bonus', 'partner_maker_peer_rate',
'partner_maker_overtaken_rate', 'partner_team_total', 'partner_venue_split',
'partner_county_full', 'partner_venue_share_per_order', 'partner_county_share_per_order',
'partner_venue_peer_rate', 'partner_county_peer_rate',
];
if ('GET' === $this->request->method()) {
$all = ShoproConfig::getConfigs('shop.commission', false) ?: [];
$configs = [];
foreach ($keys as $key) {
$configs[$key] = $all[$key] ?? null;
}
$defaults = [
'partner_mode' => 1,
'partner_enable' => 1,
'partner_count_type' => 'order',
'partner_active_days' => 30,
'partner_chain_max_depth' => 50,
'partner_push3_amounts' => [398, 400, 600],
'partner_madow_mode' => 'madow',
'partner_madow_base_rate' => '0.00000075',
'partner_madow_step_orders' => 1,
'partner_voucher_times' => 1.5,
'partner_voucher_days' => 365,
'partner_maker_bonus' => ['2' => 20, '3' => 40, '4' => 60, '5' => 80, '6' => 100, '7' => 120],
'partner_maker_peer_rate' => 0.10,
'partner_maker_overtaken_rate' => 0.05,
'partner_team_total' => 100,
'partner_venue_split' => 50,
'partner_county_full' => 100,
'partner_venue_share_per_order' => 100,
'partner_county_share_per_order' => 50,
'partner_venue_peer_rate' => 0.10,
'partner_county_peer_rate' => 0.10,
];
foreach ($defaults as $key => $value) {
if ($configs[$key] === null || $configs[$key] === '') {
$configs[$key] = $value;
}
}
} elseif ('POST' === $this->request->method()) {
check_env('commission');
$params = $this->request->param();
$save = [];
foreach ($keys as $key) {
if (array_key_exists($key, $params)) {
$save[$key] = $params[$key];
}
}
if (isset($save['partner_active_days']) && intval($save['partner_active_days']) < 1) {
$this->error('领取窗口天数须 ≥ 1');
}
if (!empty($save['partner_maker_bonus']) && is_array($save['partner_maker_bonus'])) {
$prev = null;
foreach ([2, 3, 4, 5, 6, 7] as $lv) {
$val = isset($save['partner_maker_bonus'][$lv])
? (float) $save['partner_maker_bonus'][$lv]
: (isset($save['partner_maker_bonus'][(string) $lv]) ? (float) $save['partner_maker_bonus'][(string) $lv] : null);
if ($val === null) {
continue;
}
if ($prev !== null && $val < $prev) {
$this->error('创客 V1–V6 单笔基数必须递增');
}
$prev = $val;
}
}
if (isset($save['partner_team_total'], $save['partner_venue_split'])
&& (float) $save['partner_venue_split'] > (float) $save['partner_team_total']) {
$this->error('酒道馆份额不能大于团队拆分总额');
}
$configs = ShoproConfig::setConfigs('shop.commission', $save);
$this->success('规则已更新,仅对之后的新订单生效。', null, $configs);
return;
}
$this->success('操作成功', null, $configs);
}
/**
* 订单配置

查看文件

@@ -12,7 +12,7 @@ use think\Db;
class Agent extends Common
{
protected $noNeedRight = ['select'];
protected $noNeedRight = ['select', 'identity'];
protected $model = null;
@@ -52,6 +52,28 @@ class Agent extends Common
$this->error(__('No Results were found'));
}
$amounts = \addons\shopro\service\partner\PartnerConfig::push3Amounts();
$seq = intval($detail->direct_order_seq ?? 0);
$next = $amounts[$seq % count($amounts)] ?? 398;
$last = intval($detail->last_self_order_time ?? 0);
$days = \addons\shopro\service\partner\PartnerConfig::activeDays();
$ago = $last ? intval(floor((time() - $last) / 86400)) : null;
$cash = \app\admin\model\shopro\partner\Reward::where('user_id', $id)
->where('status', 1)
->where('amount', '>', 0)
->sum('amount');
$detail->next_push3_amount = number_format((float) $next, 2, '.', '');
$detail->next_push3_text = '第 ' . ($seq + 1) . ' 单将返 ' . $detail->next_push3_amount;
$detail->last_self_order_text = $last ? date('Y-m-d H:i:s', $last) : '从未下单';
$detail->active_status_text = !empty($detail->active_30d)
? '正常领取'
: ('已暂停' . ($ago !== null ? '(距今 ' . $ago . ' 天)' : ''));
$detail->partner_cash_income = number_format((float) $cash, 2, '.', '');
$detail->partner_mode = \addons\shopro\service\partner\PartnerConfig::isPartnerMode() ? 1 : 0;
$rate = (new \addons\shopro\service\partner\RateService())->currentRate();
$detail->madow_value = \addons\shopro\service\partner\IdentityService::formatMoney((float) ($detail->madow ?? 0) * (float) $rate);
$this->success('分销商详情', null, $detail);
}
@@ -98,7 +120,7 @@ class Agent extends Common
*/
public function edit($id = null)
{
$params = $this->request->only(['status', 'upgrade_lock', 'level_status', 'level', 'apply_info']);
$params = $this->request->only(['status', 'upgrade_lock', 'level_status', 'level', 'apply_info', 'is_venue', 'is_county', 'county_code']);
$result = Db::transaction(function () use ($id, $params) {
$row = $this->model->with(['user', 'level_info', 'level_status_info', 'upgrade_level'])->where('user_id', $id)->find();
@@ -117,6 +139,14 @@ class Agent extends Common
case 'level': // 修改等级
return $this->changeLevel($row, $value);
break;
case 'is_venue':
case 'is_county':
case 'county_code':
$result = $row->save([$field => $value]);
if ($result) {
LogModel::add($row->user_id, 'agent', ['type' => 'identity', 'field' => $field, 'value' => $value]);
}
return $result;
default:
return $row->save([$field => $value]);
}
@@ -129,6 +159,91 @@ class Agent extends Common
}
}
/**
* 开通 / 调整身份(弹窗一次提交)
*/
public function identity($id = null)
{
if (!$this->auth->check('shopro/commission/agent/edit')) {
$this->error(__('You have no permission'));
}
$params = $this->request->only(['level', 'is_venue', 'is_county', 'county_code', 'upgrade_lock', 'remark']);
if ($id === null || $id === '') {
$this->error('请选择用户');
}
$level = intval($params['level'] ?? 0);
if ($level < 1 || $level > 7) {
$this->error('请选择品酒师或创客等级');
}
$isVenue = intval($params['is_venue'] ?? 0) ? 1 : 0;
$isCounty = intval($params['is_county'] ?? 0) ? 1 : 0;
$countyCode = trim((string) ($params['county_code'] ?? ''));
if ($isCounty && $countyCode === '') {
$this->error('开通区县代理时请选择区县');
}
if (!$isCounty) {
$countyCode = '';
}
$upgradeLock = array_key_exists('upgrade_lock', $params) ? intval($params['upgrade_lock']) : null;
$remark = trim((string) ($params['remark'] ?? ''));
$result = Db::transaction(function () use ($id, $level, $isVenue, $isCounty, $countyCode, $upgradeLock, $remark) {
$service = new AgentService(intval($id));
if (!$service->user) {
$this->error('未找到该用户');
}
if (!$service->agent) {
$service->createNewAgent('user');
$service = new AgentService(intval($id));
}
$row = $service->agent;
if (!$row) {
$this->error('未能生成分销身份');
}
$before = \addons\shopro\service\partner\IdentityService::build($row);
$levelModel = LevelModel::find($level);
if (!$levelModel) {
$this->error('未找到该等级');
}
$save = [
'level' => $level,
'is_venue' => $isVenue,
'is_county' => $isCounty,
'county_code' => $countyCode,
];
if ($upgradeLock !== null) {
$save['upgrade_lock'] = $upgradeLock ? 1 : 0;
}
$row->save($save);
$after = \addons\shopro\service\partner\IdentityService::build($row);
$logRemark = $remark !== ''
? $remark
: sprintf('将「%s」从 %s 调整为 %s。已入账收益不追溯。', $service->user->nickname ?: $id, $before['identity_text'] ?: '未开通', $after['identity_text'] ?: '-');
LogModel::add($row->user_id, 'agent', [
'type' => 'identity',
'field' => 'bundle',
'value' => $after['identity_text'],
'before' => $before['identity_text'],
], null, $logRemark);
LogModel::add($row->user_id, 'agent', ['type' => 'level', 'level' => $levelModel]);
(new AgentService($row->user_id))->createAsyncAgentUpgrade();
return [
'identity_text' => $after['identity_text'],
'level' => $level,
'is_venue' => $isVenue,
'is_county' => $isCounty,
'county_code' => $countyCode,
];
});
$this->success('身份已更新', null, $result);
}
// 修改状态
private function changeStatus($row, $value)

查看文件

@@ -180,9 +180,140 @@ class Order extends Common
// 处理未支付订单 item status_code
$order = $order->setOrderItemStatusByOrder($order);
$order->partner_split = $this->buildPartnerSplit($order);
$this->success('获取成功', null, $order);
}
/**
* 合伙股东分成明细:即时奖列人;均分只汇总人数/人均
*/
protected function buildPartnerSplit($order)
{
$orderId = intval($order->id ?? 0);
$shareTypes = ['venue_share', 'county_share', 'madow_share'];
$items = [];
$totalCash = 0;
$rows = \app\admin\model\shopro\partner\Reward::with(['user'])
->where('order_id', $orderId)
->order('id', 'asc')
->select();
foreach ($rows as $row) {
$type = (string) ($row->reward_type ?? '');
if (in_array($type, $shareTypes, true)) {
continue;
}
$amount = round((float) $row->amount, 2);
$madow = (float) ($row->madow ?? 0);
if (intval($row->status) === 1 && $amount > 0) {
$totalCash = round($totalCash + $amount, 2);
}
$items[] = [
'display' => 'user',
'id' => intval($row->id),
'reward_type' => $type,
'reward_type_text' => $row->reward_type_text,
'role_text' => $row->role_text ?? '',
'user_id' => intval($row->user_id),
'user' => $row->user,
'amount' => number_format($amount, 2, '.', ''),
'madow' => \addons\shopro\service\partner\IdentityService::formatMadow($madow),
'status' => intval($row->status),
'status_text' => $row->status_text,
'formula' => $row->formula,
'skip_reason_text' => $row->skip_reason_text,
];
}
$settleDate = null;
$paidRaw = $order->getData('paid_time') ?? ($order['paid_time'] ?? null);
if ($paidRaw) {
$paidTs = is_numeric($paidRaw) ? intval($paidRaw) : strtotime((string) $paidRaw);
if ($paidTs > 0) {
$settleDate = date('Y-m-d', $paidTs);
}
}
if ($settleDate) {
foreach ($shareTypes as $type) {
$shareRows = \app\admin\model\shopro\partner\Reward::where('settle_date', $settleDate)
->where('reward_type', $type)
->where('status', 1)
->where('user_id', '>', 0)
->select();
$userCount = count($shareRows);
if ($userCount <= 0) {
// 分母为 0 进平台的记录
$platform = \app\admin\model\shopro\partner\Reward::where('settle_date', $settleDate)
->where('reward_type', $type)
->where('status', 1)
->where('user_id', 0)
->find();
if (!$platform) {
continue;
}
$items[] = [
'display' => 'share',
'reward_type' => $type,
'reward_type_text' => \addons\shopro\service\partner\PartnerConfig::rewardTypeText($type),
'user_count' => 0,
'each_amount' => '0.00',
'each_madow' => '0.00000000',
'total_amount' => number_format((float) $platform->amount, 2, '.', ''),
'total_madow' => \addons\shopro\service\partner\IdentityService::formatMadow($platform->madow ?? 0),
'settle_date' => $settleDate,
'status_text' => '已入账',
'unit' => $type === 'madow_share' ? '马豆' : '元',
'formula' => $platform->formula,
'tip' => '付款日日结均分:当日无人参与,奖池进平台',
];
continue;
}
$totalAmount = 0;
$totalMadow = 0;
foreach ($shareRows as $sr) {
$totalAmount = round($totalAmount + (float) $sr->amount, 2);
$totalMadow = function_exists('bcadd')
? (float) bcadd((string) $totalMadow, (string) ($sr->madow ?? 0), 8)
: ($totalMadow + (float) ($sr->madow ?? 0));
}
$first = $shareRows[0];
$eachAmount = number_format((float) $first->amount, 2, '.', '');
$eachMadow = \addons\shopro\service\partner\IdentityService::formatMadow($first->madow ?? 0);
$ext = is_array($first->ext) ? $first->ext : [];
if (!empty($ext['share_user_count'])) {
$userCount = intval($ext['share_user_count']);
}
$items[] = [
'display' => 'share',
'reward_type' => $type,
'reward_type_text' => \addons\shopro\service\partner\PartnerConfig::rewardTypeText($type),
'user_count' => $userCount,
'each_amount' => $eachAmount,
'each_madow' => $eachMadow,
'total_amount' => number_format($totalAmount, 2, '.', ''),
'total_madow' => \addons\shopro\service\partner\IdentityService::formatMadow($totalMadow),
'settle_date' => $settleDate,
'status_text' => '已入账',
'unit' => $type === 'madow_share' ? '马豆' : '元',
'formula' => $first->formula,
'tip' => '付款日日结均分(不列出参与用户名单)',
];
}
}
return [
'items' => $items,
'total_cash' => number_format($totalCash, 2, '.', ''),
'settle_date' => $settleDate,
'has_data' => count($items) > 0,
];
}
/**
* 批量发货渲染模板

查看文件

@@ -0,0 +1,75 @@
<?php
namespace app\admin\controller\shopro\partner;
use app\admin\controller\shopro\Common;
use app\admin\model\shopro\partner\DailyReport;
use addons\shopro\service\partner\DailySettleService;
class Daily extends Common
{
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new DailyReport();
}
public function index()
{
if (!$this->request->isAjax()) {
return $this->view->fetch();
}
$list = $this->model->sheepFilter()->order('settle_date', 'desc')->paginate($this->request->param('list_rows', 10));
$today = date('Y-m-d');
$yesterday = date('Y-m-d', strtotime('-1 day'));
$days = \addons\shopro\service\partner\PartnerConfig::activeDays();
$since = time() - $days * 86400;
$result = $list->toArray();
$cashTypes = \addons\shopro\service\partner\PartnerConfig::instantTypes();
$cashTypes = array_merge($cashTypes, ['venue_share', 'county_share']);
$sumCash = function ($date) use ($cashTypes) {
return (float) \app\admin\model\shopro\partner\Reward::where('settle_date', $date)
->where('status', 1)
->whereIn('reward_type', $cashTypes)
->sum('amount');
};
$todayCash = $sumCash($today);
// 即时奖无 settle_date,按入账日合计
$todayStart = strtotime($today . ' 00:00:00');
$todayEnd = $todayStart + 86400 - 1;
$yStart = strtotime($yesterday . ' 00:00:00');
$yEnd = $yStart + 86400 - 1;
$instantToday = (float) \app\admin\model\shopro\partner\Reward::where('status', 1)
->whereNull('settle_date')
->whereBetween('createtime', [$todayStart, $todayEnd])
->whereIn('reward_type', \addons\shopro\service\partner\PartnerConfig::instantTypes())
->sum('amount');
$instantYesterday = (float) \app\admin\model\shopro\partner\Reward::where('status', 1)
->whereNull('settle_date')
->whereBetween('createtime', [$yStart, $yEnd])
->whereIn('reward_type', \addons\shopro\service\partner\PartnerConfig::instantTypes())
->sum('amount');
$result['kpi'] = [
'today' => DailyReport::where('settle_date', $today)->find(),
'yesterday' => DailyReport::where('settle_date', $yesterday)->find(),
'today_cash' => number_format($todayCash + $instantToday, 2, '.', ''),
'yesterday_cash' => number_format($sumCash($yesterday) + $instantYesterday, 2, '.', ''),
'inactive_count' => \app\admin\model\shopro\commission\Agent::where(function ($q) use ($since) {
$q->whereNull('last_self_order_time')->whereOr('last_self_order_time', '<', $since);
})->count(),
];
$this->success('获取成功', null, $result);
}
public function rerun()
{
$date = $this->request->param('settle_date');
if (!$date) {
$this->error('请选择日期');
}
$report = (new DailySettleService())->run($date, true);
$this->success('重跑完成', null, $report);
}
}

查看文件

@@ -0,0 +1,170 @@
<?php
namespace app\admin\controller\shopro\partner;
use app\admin\controller\shopro\Common;
use app\admin\model\shopro\partner\Reward as RewardModel;
use addons\shopro\service\Wallet;
use addons\shopro\service\partner\PartnerConfig;
use addons\shopro\service\partner\PartnerRewardService;
use think\Db;
class Reward extends Common
{
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new RewardModel();
}
public function index()
{
if (!$this->request->isAjax()) {
$exportConfig = (new \addons\shopro\library\Export())->getConfig();
$this->assignconfig("save_type", $exportConfig['save_type'] ?? 'download');
$this->assignconfig("rewardTypeMap", PartnerConfig::rewardTypeMap());
return $this->view->fetch();
}
$showSkip = $this->request->param('show_skip', 0);
$query = $this->model->sheepFilter()->with(['buyer', 'user', 'order']);
if (!$showSkip) {
$query->where(function ($q) {
$q->where('amount', '>', 0)->whereOr('madow', '>', 0);
});
}
$list = $query->paginate($this->request->param('list_rows', 10));
$this->success('获取成功', null, $list);
}
public function export()
{
$cellTitles = [
'id' => 'Id',
'createtime' => '入账时间',
'user_nickname' => '受益人',
'buyer_nickname' => '买家',
'order_id' => '订单',
'reward_type_text' => '奖项',
'role_text' => '角色',
'amount' => '金额',
'madow' => '马豆',
'base_amount' => '基数',
'status_text' => '状态',
'formula' => '公式',
];
$total = $this->model->sheepFilter()->count();
if ($total <= 0) {
$this->error('导出数据为空');
}
$export = new \addons\shopro\library\Export();
$params = [
'file_name' => '合伙股东收益流水',
'cell_titles' => $cellTitles,
'total' => $total,
'is_sub_cell' => false,
];
$totalAmount = 0;
$totalMadow = 0;
$result = $export->export($params, function ($pages) use (&$totalAmount, &$totalMadow, $total) {
$datas = $this->model->sheepFilter()->with(['buyer', 'user', 'order'])
->limit((($pages['page'] - 1) * $pages['list_rows']), $pages['list_rows'])
->select();
$newDatas = [];
foreach ($datas as $reward) {
$newDatas[] = [
'id' => $reward['id'],
'createtime' => $reward['createtime'],
'user_nickname' => $reward['user']['nickname'] ?? '-',
'buyer_nickname' => $reward['buyer']['nickname'] ?? '-',
'order_id' => $reward['order']['order_sn'] ?? $reward['order_id'],
'reward_type_text' => $reward['reward_type_text'],
'role_text' => $reward['role_text'] ?? $reward['role'],
'amount' => $reward['amount'],
'madow' => $reward['madow'],
'base_amount' => $reward['base_amount'],
'status_text' => $reward['status_text'],
'formula' => $reward['formula'],
];
}
$totalAmount += array_sum(array_column($newDatas, 'amount'));
$totalMadow += array_sum(array_column($newDatas, 'madow'));
if ($pages['is_last_page']) {
$newDatas[] = ['id' => "总数:{$total};金额:{$totalAmount};马豆:{$totalMadow}"];
}
return $newDatas;
});
$this->success('导出成功', null, $result);
}
public function reissue()
{
$params = $this->request->only(['user_id', 'reward_type', 'amount', 'order_id', 'memo']);
if (empty($params['user_id']) || empty($params['reward_type']) || empty($params['memo'])) {
$this->error('用户、奖项、备注必填');
}
$amount = round((float) ($params['amount'] ?? 0), 2);
if ($amount == 0) {
$this->error('请输入金额');
}
Db::transaction(function () use ($params, $amount) {
$row = PartnerRewardService::write([
'order_id' => intval($params['order_id'] ?? 0) ?: -time(),
'user_id' => intval($params['user_id']),
'buyer_id' => 0,
'role' => 'system',
'reward_type' => 'manual_' . $params['reward_type'],
'amount' => $amount,
'base_amount' => $amount,
'ext' => ['formula' => '手工补发', 'memo' => $params['memo'], 'manual' => 1],
'status' => 1,
]);
Wallet::change($params['user_id'], 'commission', $amount, 'reward_income', [
'partner_reward_id' => $row->id ?? 0,
'manual' => 1,
], $params['memo']);
});
$this->success('补发成功');
}
public function back()
{
$id = $this->request->param('id');
$memo = trim((string) $this->request->param('memo', ''));
if ($memo === '') {
$this->error('请填写退回原因');
}
$row = $this->model->where('id', $id)->find();
if (!$row) {
$this->error('记录不存在');
}
if ($row->status != 1 || $row->settle_date) {
$this->error('仅已入账的即时奖可退回');
}
Db::transaction(function () use ($row, $memo) {
if ((float) $row->amount > 0 && $row->user_id > 0) {
Wallet::change($row->user_id, 'commission', -$row->amount, 'reward_back', [
'partner_reward_id' => $row->id,
], $memo);
}
$ext = is_array($row->ext) ? $row->ext : (json_decode($row->ext ?: '{}', true) ?: []);
$ext['back_memo'] = $memo;
$row->ext = $ext;
$row->status = -2;
$row->save();
});
$this->success('已退回');
}
public function backOrder()
{
$orderId = intval($this->request->param('order_id'));
if ($orderId <= 0) {
$this->error('请选择订单');
}
(new PartnerRewardService())->refund($orderId);
$this->success('整单已退回');
}
}

查看文件

@@ -0,0 +1,98 @@
<?php
namespace app\admin\controller\shopro\partner;
use app\admin\controller\shopro\Common;
use app\admin\model\shopro\partner\VoucherPlan;
use addons\shopro\service\partner\VoucherService;
class Voucher extends Common
{
protected $noNeedRight = ['logs'];
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new VoucherPlan();
}
public function index()
{
if (!$this->request->isAjax()) {
return $this->view->fetch();
}
$list = $this->model->sheepFilter()->with(['user', 'order'])->order('id', 'desc')->paginate($this->request->param('list_rows', 10));
$userIds = [];
foreach ($list as $row) {
$userIds[] = intval($row->user_id);
}
$agents = [];
if ($userIds) {
$rows = \app\admin\model\shopro\commission\Agent::whereIn('user_id', $userIds)
->field('user_id,voucher_used,voucher_released')
->select();
foreach ($rows as $agent) {
$agents[$agent['user_id']] = $agent;
}
}
foreach ($list as $row) {
$agent = $agents[$row->user_id] ?? [];
$used = (float) ($agent['voucher_used'] ?? 0);
$released = (float) ($agent['voucher_released'] ?? 0);
$row->voucher_used = number_format($used, 2, '.', '');
$row->voucher_available = number_format(max(0, $released - $used), 2, '.', '');
}
$this->success('获取成功', null, $list);
}
public function close()
{
$id = $this->request->param('id');
$plan = $this->model->where('id', $id)->find();
if (!$plan) {
$this->error('计划不存在');
}
(new VoucherService())->closeByOrder($plan->order_id);
$this->success('已关闭');
}
/**
* 按日释放日志
*/
public function logs()
{
$id = intval($this->request->param('id'));
$plan = $this->model->where('id', $id)->find();
if (!$plan) {
$this->error('计划不存在');
}
$list = \app\admin\model\shopro\partner\Reward::where('user_id', $plan->user_id)
->where('reward_type', 'voucher_release')
->order('settle_date', 'desc')
->order('id', 'desc')
->limit(200)
->select();
$rows = [];
foreach ($list as $item) {
$ext = is_array($item->ext) ? $item->ext : (json_decode($item->ext ?: '{}', true) ?: []);
$planIds = $ext['plan_ids'] ?? [];
if (!$planIds && !empty($ext['plan_id'])) {
$planIds = [$ext['plan_id']];
}
$planIds = array_map('intval', (array) $planIds);
if ($planIds && !in_array(intval($plan->id), $planIds, true)) {
continue;
}
$rows[] = [
'id' => $item->id,
'settle_date' => $item->settle_date,
'amount' => $item->amount,
'status_text' => $item->status_text,
'formula' => $item->formula,
'createtime' => $item->createtime,
];
}
$this->success('ok', null, ['plan' => $plan, 'logs' => $rows]);
}
}

查看文件

@@ -49,8 +49,12 @@ class User extends Common
if (!$user) {
$this->error(__('No Results were found'));
}
$agent = \addons\shopro\service\partner\IdentityService::findAgent($id);
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent);
$data = array_merge($user->toArray(), $partner);
$data['has_agent'] = (bool) $agent;
$this->success('获取成功', null, $user);
$this->success('获取成功', null, $data);
}
/**

查看文件

@@ -19,7 +19,14 @@ class Agent extends Common
];
protected $append = [
'status_text',
'pending_reward'
'pending_reward',
'identity_text',
'identities',
'is_partner',
'maker_level_name',
'voucher_available',
'active_30d',
'madow_value',
];
// 分销商状态 AGENT_STATUS
@@ -71,6 +78,44 @@ class Agent extends Common
return number_format($amount, 2, '.', '');
}
public function getIdentityTextAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['identity_text'];
}
public function getIdentitiesAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['identities'];
}
public function getIsPartnerAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['is_partner'];
}
public function getMakerLevelNameAttr($value, $data)
{
return \addons\shopro\service\partner\IdentityService::build($data)['maker_level_name'];
}
public function getVoucherAvailableAttr($value, $data)
{
$released = (float) ($data['voucher_released'] ?? 0);
$used = (float) ($data['voucher_used'] ?? 0);
return number_format(max(0, $released - $used), 2, '.', '');
}
public function getActive_30dAttr($value, $data)
{
return (new \addons\shopro\service\partner\ActiveService())->isActive($data);
}
public function getMadowValueAttr($value, $data)
{
$rate = (new \addons\shopro\service\partner\RateService())->currentRate();
return \addons\shopro\service\partner\IdentityService::formatMoney((float) ($data['madow'] ?? 0) * (float) $rate);
}
public function levelStatusInfo()
{
return $this->belongsTo(Level::class, 'level_status', 'level');

查看文件

@@ -91,6 +91,11 @@ class Log extends Common
case 'apply_info':
$remark = '您的分销商资料信息已更新';
break;
case 'identity':
$fieldMap = ['is_venue' => '酒道馆', 'is_county' => '区县代理', 'county_code' => '区县编码'];
$name = $fieldMap[$ext['field'] ?? ''] ?? ($ext['field'] ?? '身份');
$remark = "您的{$name}已更新";
break;
}
return $remark ?? "";
}
@@ -180,6 +185,7 @@ class Log extends Common
'reward' => '佣金',
'share' => '推荐',
'bind' => '绑定',
'identity' => '身份',
];
}

查看文件

@@ -0,0 +1,23 @@
<?php
namespace app\admin\model\shopro\partner;
use app\admin\model\shopro\Common;
class DailyReport extends Common
{
protected $name = 'shopro_partner_daily_report';
protected $append = [
'status_text',
];
public function statusList()
{
return [
0 => '失败',
1 => '成功',
2 => '重跑中',
];
}
}

查看文件

@@ -0,0 +1,12 @@
<?php
namespace app\admin\model\shopro\partner;
use app\admin\model\shopro\Common;
class RateLog extends Common
{
protected $name = 'shopro_partner_rate_log';
protected $updateTime = false;
}

查看文件

@@ -0,0 +1,103 @@
<?php
namespace app\admin\model\shopro\partner;
use app\admin\model\shopro\Common;
use app\admin\model\shopro\user\User as UserModel;
use app\admin\model\shopro\order\Order as OrderModel;
use addons\shopro\service\partner\PartnerConfig;
class Reward extends Common
{
protected $name = 'shopro_partner_reward';
protected $type = [
'ext' => 'json',
];
protected $append = [
'status_text',
'reward_type_text',
'role_text',
'skip_reason',
'skip_reason_text',
'formula',
];
public function statusList()
{
return [
-2 => '已退回',
-1 => '已取消',
0 => '待入账',
1 => '已入账',
];
}
public function rewardTypeList()
{
return PartnerConfig::rewardTypeMap();
}
public function roleList()
{
return [
'taster' => '品酒师',
'maker' => '创客',
'venue' => '酒道馆',
'county' => '区县',
'system' => '平台',
];
}
public function getRewardTypeTextAttr($value, $data)
{
return PartnerConfig::rewardTypeText($data['reward_type'] ?? '');
}
public function getRoleTextAttr($value, $data)
{
$role = $data['role'] ?? '';
$list = $this->roleList();
return $list[$role] ?? $role;
}
public function getSkipReasonAttr($value, $data)
{
$ext = $data['ext'] ?? [];
if (is_string($ext)) {
$ext = json_decode($ext, true) ?: [];
}
return $ext['skip_reason'] ?? '';
}
public function getSkipReasonTextAttr($value, $data)
{
$reason = $this->getSkipReasonAttr(null, $data);
return $reason ? PartnerConfig::skipReasonText($reason) : '';
}
public function getFormulaAttr($value, $data)
{
$ext = $data['ext'] ?? [];
if (is_string($ext)) {
$ext = json_decode($ext, true) ?: [];
}
return $ext['formula'] ?? '';
}
public function buyer()
{
return $this->belongsTo(UserModel::class, 'buyer_id', 'id')->field('id, nickname, avatar, mobile');
}
public function user()
{
return $this->belongsTo(UserModel::class, 'user_id', 'id')->field('id, nickname, avatar, mobile');
}
public function order()
{
return $this->belongsTo(OrderModel::class, 'order_id', 'id');
}
}

查看文件

@@ -0,0 +1,44 @@
<?php
namespace app\admin\model\shopro\partner;
use app\admin\model\shopro\Common;
use app\admin\model\shopro\user\User as UserModel;
use app\admin\model\shopro\order\Order as OrderModel;
class VoucherPlan extends Common
{
protected $name = 'shopro_partner_voucher_plan';
protected $updateTime = false;
protected $append = [
'status_text',
'available',
];
public function statusList()
{
return [
0 => '已关闭',
1 => '释放中',
2 => '已完成',
];
}
public function getAvailableAttr($value, $data)
{
$released = (float) ($data['released_amount'] ?? 0);
return number_format($released, 2, '.', '');
}
public function user()
{
return $this->belongsTo(UserModel::class, 'user_id', 'id')->field('id, nickname, avatar, mobile');
}
public function order()
{
return $this->belongsTo(OrderModel::class, 'order_id', 'id');
}
}

查看文件

@@ -49,7 +49,17 @@ class WalletLog extends Common
'withdraw_error' => '提现失败-返还佣金',
'reward_income' => '佣金-收益',
'reward_back' => '佣金-退还',
'transfer_to_money' => '佣金-转出到余额'
'transfer_to_money' => '佣金-转出到余额',
'push3' => '推三返一',
'maker_diff' => '创客极差奖',
'maker_peer' => '创客平级奖',
'maker_overtaken' => '创客超越奖',
'team_venue' => '酒道馆团队奖',
'team_county' => '区县团队奖',
'venue_peer' => '酒道馆平级奖',
'county_peer' => '区县平级奖',
'venue_share' => '酒道馆平台均分',
'county_share' => '区县平台均分'
]
];

查看文件

@@ -211,7 +211,10 @@
<el-button class="ml-2" type="primary" link @click="onChangeParentUser">更换
</el-button>
</el-form-item>
<el-form-item label="佣金比例:">
<el-form-item v-if="state.data.partner_mode" label="佣金比例:">
<div class="tip">已切换为合伙股东固定金额,旧百分比不再生效。</div>
</el-form-item>
<el-form-item v-else label="佣金比例:">
<div class="commission-item">
<div class="title">一级(自购)</div>
<div>
@@ -250,6 +253,51 @@
</el-switch>
{/if}
</el-form-item>
<el-form-item label="酒道馆:">
{{ state.data.is_venue ? '是' : '否' }}
</el-form-item>
<el-form-item label="区县代理:">
{{ state.data.is_county ? '是' : '否' }}{{ state.data.county_code ? '(' + state.data.county_code + ')' : '' }}
</el-form-item>
<el-form-item>
{if $auth->check('shopro/commission/agent/edit')}
<el-button type="primary" @click="onOpenIdentity">开通 / 调整身份</el-button>
{/if}
</el-form-item>
<el-form-item label="身份组合:">
{{ state.data.identity_text || '-' }}
</el-form-item>
<el-form-item label="活跃状态:">
{{ state.data.active_status_text || (state.data.active_30d ? '正常领取' : '已暂停') }}
</el-form-item>
<el-form-item label="直推序号:">
第 {{ state.data.direct_order_seq || 0 }} 单,{{ state.data.next_push3_text || '' }}
</el-form-item>
<el-form-item label="最近自购:">
{{ state.data.last_self_order_text || '从未下单' }}
</el-form-item>
<el-form-item label="马豆:">
{{ state.data.madow || 0 }}(约合 ¥{{ state.data.madow_value || '0.00' }})
</el-form-item>
<el-form-item label="兑换券:">
总额 {{ state.data.voucher_total || 0 }} / 已释放 {{ state.data.voucher_released || 0 }} /
已使用 {{ state.data.voucher_used || 0 }} / 可用 {{ state.data.voucher_available || 0 }}
</el-form-item>
<el-form-item label="累计合伙股东现金:">
{{ state.data.partner_cash_income || '0.00' }}
</el-form-item>
<el-form-item>
<el-button type="primary" link
@click="Fast.api.open('shopro/partner/reward/index?user_id='+state.data.user_id, 'TA的收益流水')">
TA 的收益流水
</el-button>
{if $auth->check('shopro/partner/reward/reissue')}
<el-button type="primary" link
@click="Fast.api.open('shopro/partner/reward/index?user_id='+state.data.user_id+'&reissue=1', '手工补发')">
手工补发 / 扣回
</el-button>
{/if}
</el-form-item>
</el-form>
</div>
</el-col>
@@ -598,4 +646,37 @@
</el-scrollbar>
</el-main>
</el-container>
<el-dialog v-model="identity.visible" title="开通 / 调整身份" width="520px" destroy-on-close>
<el-form label-width="100px">
<el-form-item label="用户">{{ identity.form.nickname || state.data.user_id }}</el-form-item>
<el-form-item label="当前身份">{{ identity.form.before_text || '-' }}</el-form-item>
<el-form-item label="创客等级" required>
<el-select v-model="identity.form.level" style="width:100%">
<el-option v-for="item in identity.levels" :key="item.level" :label="item.name"
:value="item.level"></el-option>
</el-select>
</el-form-item>
<el-form-item label="酒道馆">
<el-switch v-model="identity.form.is_venue" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="区县代理">
<el-switch v-model="identity.form.is_county" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item v-if="identity.form.is_county" label="区县" required>
<el-cascader v-model="identity.form.area_arr" :options="identity.areaSelect" :props="{
value: 'id', label: 'name', children: 'children', checkStrictly: true, emitPath: true
}" clearable filterable style="width:100%" @change="onIdentityAreaChange"></el-cascader>
</el-form-item>
<el-form-item label="升级锁定">
<el-switch v-model="identity.form.upgrade_lock" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="identity.form.remark" type="textarea"></el-input>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="identity.visible=false">取消</el-button>
<el-button type="primary" :loading="identity.loading" @click="onSubmitIdentity">确定</el-button>
</template>
</el-dialog>
</div>

查看文件

@@ -4,6 +4,19 @@
.agent-index .status-text {
margin-right: 12px;
}
.agent-index .active-dot {
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
margin-right: 6px;
}
.agent-index .active-dot.is-on {
background: #52c41a;
}
.agent-index .active-dot.is-off {
background: #c0c4cc;
}
</style>
<div id="index" class="agent-index panel panel-default panel-intro" v-cloak>
@@ -44,6 +57,32 @@
<template v-else>{{ scope.row.level }}</template>
</template>
</el-table-column>
<el-table-column label="身份" min-width="180">
<template #default="scope">
<div>{{ scope.row.identity_text || '-' }}</div>
<div>
<el-tag v-if="scope.row.is_venue" size="small" type="success">酒道馆</el-tag>
<el-tag v-if="scope.row.is_county" size="small" type="warning">区县</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="30日活跃" min-width="100">
<template #default="scope">
<span class="sa-flex sa-col-center">
<i class="active-dot" :class="scope.row.active_30d ? 'is-on' : 'is-off'"></i>
{{ scope.row.active_30d ? '有自购' : '已暂停' }}
</span>
</template>
</el-table-column>
<el-table-column label="马豆" 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>
</template>
</el-table-column>
<el-table-column label="可用兑换券" min-width="110">
<template #default="scope"> {{ scope.row.voucher_available || 0 }} </template>
</el-table-column>
<el-table-column label="累计佣金" min-width="120">
<template #default="scope"> {{ scope.row.total_income }}元 </template>
</el-table-column>
@@ -71,7 +110,7 @@
</template>
</el-table-column>
<el-table-column prop="createtime" label="创建时间" width="172"></el-table-column>
<el-table-column label="操作" min-width="140" fixed="right">
<el-table-column label="操作" min-width="180" fixed="right">
<template #default="scope">
<div class="sa-flex">
<span class="mr-2" :style="{
@@ -82,6 +121,9 @@
{if $auth->check('shopro/commission/agent/detail')}
<el-button type="primary" link @click="onDetail(scope.row.user_id)">查看</el-button>
{/if}
{if $auth->check('shopro/commission/agent/edit')}
<el-button type="primary" link @click="onOpenIdentity(scope.row)">开通身份</el-button>
{/if}
</div>
</template>
</el-table-column>
@@ -201,4 +243,46 @@
</el-footer>
</el-container>
<sa-filter v-model="state.filter" @filter-change="onChangeFilter"></sa-filter>
<el-dialog v-model="identity.visible" title="开通 / 调整身份" width="520px" destroy-on-close>
<el-form label-width="100px">
<el-form-item label="用户">
{{ identity.form.nickname || identity.form.user_id }}
</el-form-item>
<el-form-item label="当前身份">
{{ identity.form.before_text || '-' }}
</el-form-item>
<el-form-item label="创客等级" required>
<el-select v-model="identity.form.level" placeholder="请选择" style="width:100%">
<el-option v-for="item in identity.levels" :key="item.level" :label="item.name"
:value="item.level"></el-option>
</el-select>
</el-form-item>
<el-form-item label="酒道馆">
<el-switch v-model="identity.form.is_venue" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="区县代理">
<el-switch v-model="identity.form.is_county" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item v-if="identity.form.is_county" label="区县" required>
<el-cascader v-model="identity.form.area_arr" :options="identity.areaSelect" :props="{
value: 'id',
label: 'name',
children: 'children',
checkStrictly: true,
emitPath: true,
}" clearable filterable style="width:100%" @change="onIdentityAreaChange"></el-cascader>
<div class="tip" style="margin-top:4px;color:#999;font-size:12px">编码:{{ identity.form.county_code || '-' }}</div>
</el-form-item>
<el-form-item label="升级锁定">
<el-switch v-model="identity.form.upgrade_lock" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="identity.form.remark" type="textarea" placeholder="如:2026-09 签约"></el-input>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="identity.visible=false">取消</el-button>
<el-button type="primary" :loading="identity.loading" @click="onSubmitIdentity">确定</el-button>
</template>
</el-dialog>
</div>

查看文件

@@ -35,7 +35,7 @@
<el-header class="sa-header">
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">分销商品</div>
<div class="left-name">分销 / 合伙股东计奖商品</div>
<sa-filter-condition v-model="state.filter" @filter-delete="onChangeFilter">
</sa-filter-condition>
</div>
@@ -91,7 +91,7 @@
{{ scope.row.commission_goods?.status_text || '未参与' }}
</span>
{if $auth->check('shopro/commission/goods/edit')}
<el-button type="primary" link @click="onEdit(scope.row.id)">设置佣金</el-button>
<el-button type="primary" link @click="onEdit(scope.row.id)">设置计奖</el-button>
{/if}
</div>
</template>

查看文件

@@ -71,7 +71,7 @@
<el-scrollbar height="100%">
<el-alert class="mb-4" type="warning">
<template #title>
新增或编辑等级后,请及时在分销商品中完善对应的佣金规则
等级 1 固定为品酒师,2–7 对应创客 V1–V6。合伙股东模式下百分比佣金不再生效,级差金额请到「分销设置 → 合伙股东」修改。
</template>
</el-alert>
<el-form :model="form.model" :rules="form.rules" ref="formRef" label-width="150px">

查看文件

@@ -6,9 +6,13 @@
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">分销商等级</div>
<div style="font-size:12px;color:#999;margin-top:4px">
等级 1 固定为品酒师;2–7 对应创客 V1–V6。百分比佣金在合伙股东模式下不使用。
</div>
</div>
<div class="sa-title-right">
<el-button class="sa-button-refresh" icon="RefreshRight" @click="getData"></el-button>
<el-button @click="onGotoPartnerConfig">去规则里改基数</el-button>
{if $auth->check('shopro/commission/level/add')}
<el-button icon="Plus" type="primary" @click="onAdd">添加</el-button>
{/if}
@@ -33,6 +37,12 @@
<el-table-column label="一级(自购)佣金比例" min-width="160">
<template #default="scope"> {{ scope.row.commission_rules?.commission_1 }}% </template>
</el-table-column>
<el-table-column label="极差基数" min-width="120">
<template #default="scope">
<span v-if="Number(scope.row.level) >= 2">¥{{ state.makerBonus[scope.row.level] || state.makerBonus[String(scope.row.level)] || '-' }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="二级佣金比例" min-width="120">
<template #default="scope"> {{ scope.row.commission_rules?.commission_2 }}% </template>
</el-table-column>

查看文件

@@ -864,6 +864,114 @@
</el-form-item>
</template>
<!-- 合伙股东 -->
<template v-if="state.tabActive == 'shopro/config/partner'">
<el-alert class="mb-4" type="warning" :closable="false"
title="规则已保存后仅对之后的新订单生效,已入账流水不追溯。不要把「分销层级」改成 0,否则用户端收益中心打不开。">
</el-alert>
<div class="sa-title is-line">总控</div>
<el-form-item label="启用合伙股东结算">
<el-radio-group v-model="form.model.partner_enable">
<el-radio :label="1">开启</el-radio>
<el-radio :label="0">关闭</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="关闭旧百分比分佣">
<div>
<el-radio-group v-model="form.model.partner_mode">
<el-radio :label="1">开启(跳过三级百分比)</el-radio>
<el-radio :label="0">关闭</el-radio>
</el-radio-group>
<div class="tip">partner_mode=1 时新单不再写百分比佣金</div>
</div>
</el-form-item>
<div class="sa-title is-line">计单 / 活跃</div>
<el-form-item label="合格订单口径">
<el-radio-group v-model="form.model.partner_count_type">
<el-radio label="order">订单头</el-radio>
<el-radio label="item">商品件数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="领取窗口天数">
<el-input class="sa-w-360" v-model="form.model.partner_active_days" type="number"></el-input>
</el-form-item>
<el-form-item label="关系链最大深度">
<el-input class="sa-w-360" v-model="form.model.partner_chain_max_depth" type="number"></el-input>
</el-form-item>
<div class="sa-title is-line">推三返一</div>
<el-form-item label="循环金额">
<div class="sa-flex" style="gap:8px">
<el-input class="sa-w-120" v-model="form.model.partner_push3_amounts[0]"></el-input>
<el-input class="sa-w-120" v-model="form.model.partner_push3_amounts[1]"></el-input>
<el-input class="sa-w-120" v-model="form.model.partner_push3_amounts[2]"></el-input>
</div>
<div class="tip">默认 398 / 400 / 600,三者之和建议等于主售价</div>
</el-form-item>
<div class="sa-title is-line">马豆</div>
<el-form-item label="发放模式">
<el-radio-group v-model="form.model.partner_madow_mode">
<el-radio label="madow">马豆</el-radio>
<el-radio label="cash">现金</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="基础汇率">
<el-input class="sa-w-360" v-model="form.model.partner_madow_base_rate"></el-input>
</el-form-item>
<el-form-item label="步进订单数 n">
<el-input class="sa-w-360" v-model="form.model.partner_madow_step_orders" type="number"></el-input>
</el-form-item>
<div class="sa-title is-line">兑换券</div>
<el-form-item label="倍数">
<el-input class="sa-w-360" v-model="form.model.partner_voucher_times"></el-input>
</el-form-item>
<el-form-item label="释放天数">
<el-input class="sa-w-360" v-model="form.model.partner_voucher_days" type="number"></el-input>
</el-form-item>
<div class="sa-title is-line">创客</div>
<el-form-item label="V1–V6 单笔基数">
<div class="sa-flex" style="gap:8px;flex-wrap:wrap">
<el-input class="sa-w-90" v-model="form.model.partner_maker_bonus[2]" placeholder="V1"></el-input>
<el-input class="sa-w-90" v-model="form.model.partner_maker_bonus[3]" placeholder="V2"></el-input>
<el-input class="sa-w-90" v-model="form.model.partner_maker_bonus[4]" placeholder="V3"></el-input>
<el-input class="sa-w-90" v-model="form.model.partner_maker_bonus[5]" placeholder="V4"></el-input>
<el-input class="sa-w-90" v-model="form.model.partner_maker_bonus[6]" placeholder="V5"></el-input>
<el-input class="sa-w-90" v-model="form.model.partner_maker_bonus[7]" placeholder="V6"></el-input>
</div>
</el-form-item>
<el-form-item label="平级比例">
<el-input class="sa-w-360" v-model="form.model.partner_maker_peer_rate">
<template #append>小数,如 0.10</template>
</el-input>
</el-form-item>
<el-form-item label="被超越比例">
<el-input class="sa-w-360" v-model="form.model.partner_maker_overtaken_rate">
<template #append>小数,如 0.05</template>
</el-input>
</el-form-item>
<div class="sa-title is-line">团队拆分 / 均分</div>
<el-form-item label="拆分总额">
<el-input class="sa-w-360" v-model="form.model.partner_team_total"></el-input>
</el-form-item>
<el-form-item label="酒道馆份额">
<el-input class="sa-w-360" v-model="form.model.partner_venue_split"></el-input>
</el-form-item>
<el-form-item label="无馆区县全额">
<el-input class="sa-w-360" v-model="form.model.partner_county_full"></el-input>
</el-form-item>
<el-form-item label="酒道馆每单奖池">
<el-input class="sa-w-360" v-model="form.model.partner_venue_share_per_order"></el-input>
</el-form-item>
<el-form-item label="区县每单奖池">
<el-input class="sa-w-360" v-model="form.model.partner_county_share_per_order"></el-input>
</el-form-item>
<el-form-item label="酒道馆平级比例">
<el-input class="sa-w-360" v-model="form.model.partner_venue_peer_rate"></el-input>
</el-form-item>
<el-form-item label="区县平级比例">
<el-input class="sa-w-360" v-model="form.model.partner_county_peer_rate"></el-input>
</el-form-item>
</template>
<!-- 商品配置 -->
<template v-if="state.tabActive == 'shopro/config/goods'">
<div class="sa-title is-line">库存预警配置</div>

查看文件

@@ -1,10 +1,21 @@
{include file="/shopro/common/script" /}
<style>
.order-detail .tip {
.order-detail .partner-split-content {
border-radius: 8px;
padding: var(--sa-padding);
background: var(--sa-table-header-bg);
margin-bottom: 16px;
}
.order-detail .partner-split-content .title {
line-height: 24px;
font-size: 16px;
color: var(--sa-title);
font-weight: 700;
margin-bottom: 12px;
}
.order-detail .order-content,
.order-detail .order-content {
border-radius: 8px;
@@ -820,6 +831,89 @@
</el-row>
</el-tab-pane>
</el-tabs>
<div class="partner-split-content order-content">
<div class="title sa-flex sa-row-between">
<span>合伙股东分成明细</span>
<span v-if="state.detail.partner_split?.total_cash" style="font-size:13px;font-weight:400;color:var(--sa-subfont)">
本单即时现金合计 ¥{{ state.detail.partner_split.total_cash }}
<template v-if="state.detail.partner_split.settle_date">
· 均分日 {{ state.detail.partner_split.settle_date }}
</template>
</span>
</div>
<el-table
v-if="state.detail.partner_split?.has_data"
class="sa-table"
:data="state.detail.partner_split.items"
stripe
>
<el-table-column label="收益种类" min-width="140">
<template #default="scope">
<div>{{ scope.row.reward_type_text || scope.row.reward_type }}</div>
<div v-if="scope.row.role_text" style="font-size:12px;color:#999">{{ scope.row.role_text }}</div>
</template>
</el-table-column>
<el-table-column label="受益人 / 参与概况" min-width="220">
<template #default="scope">
<template v-if="scope.row.display === 'share'">
<div>参与用户 {{ scope.row.user_count }} 人</div>
<div style="font-size:12px;color:#999">{{ scope.row.tip || '均分不列出名单' }}</div>
</template>
<template v-else>
<sa-user-profile
v-if="scope.row.user_id > 0"
:user="scope.row.user"
:id="scope.row.user_id"
></sa-user-profile>
<span v-else class="sa-color--info">平台 / 系统</span>
</template>
</template>
</el-table-column>
<el-table-column label="金额" min-width="160">
<template #default="scope">
<template v-if="scope.row.display === 'share'">
<div v-if="scope.row.unit === '马豆'">
每人 {{ scope.row.each_madow }} 马豆
</div>
<div v-else>
每人 ¥{{ scope.row.each_amount }}
</div>
<div style="font-size:12px;color:#999">
<template v-if="scope.row.unit === '马豆'">
合计 {{ scope.row.total_madow }} 马豆
</template>
<template v-else>
合计 ¥{{ scope.row.total_amount }}
</template>
</div>
</template>
<template v-else>
<span v-if="Number(scope.row.amount) > 0">¥{{ scope.row.amount }}</span>
<span v-else-if="Number(scope.row.madow) > 0">{{ scope.row.madow }} 马豆</span>
<span v-else>¥0.00</span>
</template>
</template>
</el-table-column>
<el-table-column label="状态" min-width="90">
<template #default="scope">
<span :class="`sa-color--${partnerStatusStyle[scope.row.status] || 'info'}`">
{{ scope.row.status_text || '-' }}
</span>
</template>
</el-table-column>
<el-table-column label="说明" min-width="220">
<template #default="scope">
<div>{{ scope.row.formula || '-' }}</div>
<div v-if="scope.row.skip_reason_text" class="sa-color--warning" style="font-size:12px">
{{ scope.row.skip_reason_text }}
</div>
</template>
</el-table-column>
</el-table>
<div v-else style="padding:16px 0;color:#999;font-size:13px">
暂无合伙股东分成记录(未计奖、未支付或尚未日结)
</div>
</div>
<div class="goods-content">
<el-tabs>
<el-tab-pane label="商品信息">

查看文件

@@ -0,0 +1,60 @@
{include file="/shopro/common/script" /}
<div id="index" class="reward-index panel panel-default panel-intro" v-cloak>
<el-container class="panel-block">
<el-header class="sa-header">
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">日结对账</div>
<div class="sa-flex" style="gap:16px;margin-top:8px;font-size:13px">
<span>昨日单数 {{ state.kpi.yesterday?.order_count || 0 }}</span>
<span>昨日GMV {{ state.kpi.yesterday?.gmv || '0.00' }}</span>
<span>昨日现金 {{ state.kpi.yesterday_cash || '0.00' }}</span>
<span>昨日马豆池 {{ state.kpi.yesterday?.madow_pool || '0' }}</span>
<span>今日单数 {{ state.kpi.today?.order_count || 0 }}</span>
<span>今日现金 {{ state.kpi.today_cash || '0.00' }}</span>
<span>暂停领取 {{ state.kpi.inactive_count || 0 }} 人</span>
</div>
</div>
<div class="sa-title-right">
<el-button class="sa-button-refresh" icon="RefreshRight" @click="getData"></el-button>
</div>
</div>
</el-header>
<el-main class="sa-main">
<el-table height="100%" class="sa-table" :data="state.data" stripe>
<el-table-column prop="settle_date" label="日期" width="120"></el-table-column>
<el-table-column prop="order_count" label="合格单数" min-width="90"></el-table-column>
<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="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>
<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="status_text" label="状态" min-width="80">
<template #default="scope">
<span :class="scope.row.status==1 ? 'sa-color--success' : 'sa-color--danger'">
{{ scope.row.status_text }}
</span>
</template>
</el-table-column>
<el-table-column prop="error_msg" label="失败原因" min-width="160"></el-table-column>
<el-table-column label="操作" min-width="140" fixed="right">
<template #default="scope">
<el-button type="primary" link @click="onDetail(scope.row)">明细</el-button>
{if $auth->check('shopro/partner/daily/rerun')}
<el-button type="warning" link @click="onRerun(scope.row)">重跑</el-button>
{/if}
</template>
</el-table-column>
</el-table>
</el-main>
<el-footer class="sa-footer sa-flex sa-row-right">
<sa-pagination v-model="pagination" @pagination-change="getData"></sa-pagination>
</el-footer>
</el-container>
</div>

查看文件

@@ -0,0 +1,97 @@
{include file="/shopro/common/script" /}
<div id="index" class="reward-index panel panel-default panel-intro" v-cloak>
<el-container class="panel-block">
<el-header class="sa-header">
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">收益流水</div>
<sa-filter-condition v-model="state.filter" @filter-delete="onChangeFilter">
</sa-filter-condition>
</div>
<div class="sa-title-right">
<el-button class="sa-button-refresh" icon="RefreshRight" @click="getData"></el-button>
<el-button class="sa-button-refresh" icon="Search" @click="onOpenFilter"></el-button>
{if $auth->check('shopro/partner/reward/export')}
<el-button :loading="exportLoading" :disabled="exportLoading" @click="onExport('export')">导出
</el-button>
{/if}
{if $auth->check('shopro/partner/reward/reissue')}
<el-button type="primary" @click="reissue.visible = true">手工补发</el-button>
{/if}
</div>
</div>
</el-header>
<el-main class="sa-main">
<el-table height="100%" class="sa-table" :data="state.data" stripe>
<el-table-column prop="id" label="ID" min-width="80"></el-table-column>
<el-table-column prop="createtime" label="入账时间" width="172"></el-table-column>
<el-table-column label="受益人" min-width="150">
<template #default="scope">
<sa-user-profile :user="scope.row.user" :id="scope.row.user_id"></sa-user-profile>
</template>
</el-table-column>
<el-table-column label="买家" min-width="150">
<template #default="scope">
<sa-user-profile :user="scope.row.buyer" :id="scope.row.buyer_id"></sa-user-profile>
</template>
</el-table-column>
<el-table-column label="订单" min-width="180">
<template #default="scope">
{{ scope.row.order?.order_sn || scope.row.order_id }}
</template>
</el-table-column>
<el-table-column prop="reward_type_text" label="奖项" min-width="120"></el-table-column>
<el-table-column prop="role_text" label="角色" min-width="80"></el-table-column>
<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"> {{ scope.row.madow }} </template>
</el-table-column>
<el-table-column prop="base_amount" label="基数" min-width="80"></el-table-column>
<el-table-column label="状态" min-width="80">
<template #default="scope">
<span :class="`sa-color--${state.statusStyle[scope.row.status]}`">
{{ scope.row.status_text }}
</span>
</template>
</el-table-column>
<el-table-column prop="formula" label="公式摘要" min-width="200"></el-table-column>
<el-table-column label="操作" min-width="120" fixed="right">
<template #default="scope">
<el-button type="primary" link @click="onViewExt(scope.row)">查看公式</el-button>
{if $auth->check('shopro/partner/reward/back')}
<el-button v-if="scope.row.status==1 && !scope.row.settle_date" type="danger" link
@click="onBack(scope.row)">退回</el-button>
{/if}
{if $auth->check('shopro/partner/reward/back')}
<el-button v-if="scope.row.order_id>0 && scope.row.status==1 && !scope.row.settle_date" type="danger" link
@click="onBackOrder(scope.row)">整单退回</el-button>
{/if}
</template>
</el-table-column>
</el-table>
</el-main>
<el-footer class="sa-footer sa-flex sa-row-right">
<sa-pagination v-model="pagination" @pagination-change="getData"></sa-pagination>
</el-footer>
</el-container>
<sa-filter v-model="state.filter" @filter-change="onChangeFilter"></sa-filter>
<el-dialog v-model="ext.visible" title="公式明细" width="520px">
<pre style="white-space:pre-wrap">{{ ext.text }}</pre>
</el-dialog>
<el-dialog v-model="reissue.visible" title="手工补发" width="480px">
<el-form label-width="90px">
<el-form-item label="用户ID"><el-input v-model="reissue.form.user_id"></el-input></el-form-item>
<el-form-item label="奖项"><el-input v-model="reissue.form.reward_type" placeholder="如 push3"></el-input></el-form-item>
<el-form-item label="金额"><el-input v-model="reissue.form.amount"></el-input></el-form-item>
<el-form-item label="订单ID"><el-input v-model="reissue.form.order_id"></el-input></el-form-item>
<el-form-item label="备注"><el-input v-model="reissue.form.memo" type="textarea"></el-input></el-form-item>
</el-form>
<template #footer>
<el-button @click="reissue.visible=false">取消</el-button>
<el-button type="primary" @click="onReissue">确定</el-button>
</template>
</el-dialog>
</div>

查看文件

@@ -0,0 +1,62 @@
{include file="/shopro/common/script" /}
<div id="index" class="reward-index panel panel-default panel-intro" v-cloak>
<el-container class="panel-block">
<el-header class="sa-header">
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">兑换券计划</div>
</div>
<div class="sa-title-right">
<el-button class="sa-button-refresh" icon="RefreshRight" @click="getData"></el-button>
</div>
</div>
</el-header>
<el-main class="sa-main">
<el-table height="100%" class="sa-table" :data="state.data" stripe>
<el-table-column prop="id" label="ID" width="80"></el-table-column>
<el-table-column label="用户" min-width="150">
<template #default="scope">
<sa-user-profile :user="scope.row.user" :id="scope.row.user_id"></sa-user-profile>
</template>
</el-table-column>
<el-table-column label="订单" min-width="180">
<template #default="scope">
{{ 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 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="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">
<template #default="scope">
<el-button type="primary" link @click="onLogs(scope.row)">释放日志</el-button>
<el-button v-if="scope.row.status==1" type="danger" link @click="onClose(scope.row)">关闭</el-button>
</template>
</el-table-column>
</el-table>
</el-main>
<el-footer class="sa-footer sa-flex sa-row-right">
<sa-pagination v-model="pagination" @pagination-change="getData"></sa-pagination>
</el-footer>
</el-container>
<el-dialog v-model="logs.visible" title="按日释放日志" width="640px">
<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="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>
</el-table>
<div v-if="!logs.rows.length" style="padding:20px;color:#999;text-align:center">暂无释放记录(次日 00:30 日结后产生)</div>
</el-dialog>
</div>

查看文件

@@ -188,6 +188,24 @@
<div class="left">佣金</div>
<div class="right">{{ state.detail.commission }}</div>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
<div class="left">身份</div>
<div class="right">{{ state.detail.identity_text || '尚未生成分销身份' }}</div>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
<div class="left">马豆</div>
<div class="right">{{ state.detail.madow || '0' }}</div>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
<div class="left">可用兑换券</div>
<div class="right sa-flex">
{{ state.detail.voucher_available || '0.00' }}
<el-button v-if="state.detail.has_agent" class="ml-2" type="primary" link
@click="Fast.api.open('shopro/commission/agent/detail/id/'+state.detail.id+'?id='+state.detail.id, '分销商详情')">
分销商详情
</el-button>
</div>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
<div class="left">余额</div>
<div class="right sa-flex">