feat(merchant): 商家关联账号绑定与数据同步
- 新增 fa_merchant_member 关联账号表,主账号可绑定/解绑已注册用户 - 关联账号可切换商家端,订单、账单、开票、批量归属按主账号+关联账号聚合 - 商家工作台新增关联账号列表、绑定弹层、解除入口与个人订单统计 - 关联账号在商家入驻页显示只读企业资料与同步说明 - 我的页面区分主账号/关联商家身份;修复 merchant 角色本地存储 - 绑定/解绑仅主账号可操作,关联账号操作返回 403 - 新增 schema_phase7.sql 迁移脚本
这个提交包含在:
@@ -92,7 +92,9 @@ class Auth extends Base
|
||||
];
|
||||
}
|
||||
|
||||
$merchant = Db::name('merchant')->where('user_id', $uid)->find();
|
||||
$merchantRel = $this->merchantOf($uid);
|
||||
$merchant = $merchantRel ? $merchantRel['merchant'] : null;
|
||||
$merchantRole = $merchantRel ? $merchantRel['role'] : null;
|
||||
$merchantInfo = null;
|
||||
if ($merchant) {
|
||||
$merchantInfo = [
|
||||
@@ -101,6 +103,8 @@ class Auth extends Base
|
||||
'verify_status' => $merchant['verify_status'],
|
||||
'audit_msg' => $merchant['audit_msg'],
|
||||
'settle_type' => $merchant['settle_type'],
|
||||
'role' => $merchantRole,
|
||||
'is_owner' => $merchantRole === 'owner',
|
||||
'can_order' => $merchant['verify_status'] === 'pass',
|
||||
];
|
||||
}
|
||||
@@ -179,7 +183,8 @@ class Auth extends Base
|
||||
}
|
||||
|
||||
if ($role === 'merchant') {
|
||||
$merchant = Db::name('merchant')->where('user_id', $this->uid())->find();
|
||||
$merchantRel = $this->merchantOf($this->uid());
|
||||
$merchant = $merchantRel ? $merchantRel['merchant'] : null;
|
||||
if (!$merchant) {
|
||||
$this->error('请先完成商家入驻', ['need_apply' => 1], 2001);
|
||||
}
|
||||
@@ -200,4 +205,24 @@ class Auth extends Base
|
||||
|
||||
$this->success('切换成功', ['role' => $role, 'redirect' => $redirect]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 当前用户的商家归属:主账号 / 关联账号
|
||||
* 返回 ['merchant' => 商家行, 'role' => owner|member]
|
||||
*/
|
||||
protected function merchantOf($uid)
|
||||
{
|
||||
$merchant = Db::name('merchant')->where('user_id', $uid)->find();
|
||||
if ($merchant) {
|
||||
return ['merchant' => $merchant, 'role' => 'owner'];
|
||||
}
|
||||
$bind = Db::name('merchant_member')->where('user_id', $uid)->find();
|
||||
if ($bind) {
|
||||
$merchant = Db::name('merchant')->where('id', (int)$bind['merchant_id'])->find();
|
||||
if ($merchant) {
|
||||
return ['merchant' => $merchant, 'role' => 'member'];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户