feat: 新增分销分佣结算、商家认证及草稿管理功能,优化界面与版本更新
这个提交包含在:
@@ -348,17 +348,36 @@ class V1 extends Api
|
||||
$ext = $this->ext($user['id']);
|
||||
$isMember = (int)$ext['is_member'] === 1
|
||||
&& (!$ext['member_expiretime'] || $ext['member_expiretime'] > time());
|
||||
// 查询商家认证状态与商铺资料
|
||||
$merchant = Db::name('fc_merchant')->where('user_id', $user['id'])->find();
|
||||
$isMerchant = $merchant && (int)$merchant['audit_status'] === 1 && $merchant['shop_status'] === 'normal';
|
||||
$merchantStatus = $merchant ? (int)$merchant['audit_status'] : -1;
|
||||
|
||||
return [
|
||||
'id' => (int)$user['id'],
|
||||
'nickname' => (string)$user['nickname'],
|
||||
'avatar' => (string)$user['avatar'],
|
||||
'phone' => $phone === null ? (string)$user['mobile'] : $phone,
|
||||
'userType' => (int)$ext['user_type'],
|
||||
'userType' => $isMerchant ? 2 : (int)$ext['user_type'],
|
||||
'isMember' => $isMember,
|
||||
'memberLevel' => $isMember ? (string)$ext['member_level'] : '',
|
||||
'memberExpireAt' => $ext['member_expiretime'] ? $this->iso($ext['member_expiretime']) : null,
|
||||
'balance' => (float)$user['money'],
|
||||
'realnameStatus' => (int)$ext['realname_status'],
|
||||
'isMerchant' => (bool)$isMerchant,
|
||||
'merchantStatus' => $merchantStatus,
|
||||
'merchant' => $merchant ? [
|
||||
'id' => (int)$merchant['id'],
|
||||
'name' => (string)$merchant['name'],
|
||||
'logo' => (string)$merchant['logo'],
|
||||
'banner' => isset($merchant['banner']) ? (string)$merchant['banner'] : '',
|
||||
'notice' => isset($merchant['notice']) ? (string)$merchant['notice'] : '',
|
||||
'contact' => (string)$merchant['contact'],
|
||||
'license' => (string)$merchant['license'],
|
||||
'auditStatus' => (int)$merchant['audit_status'],
|
||||
'auditReason' => isset($merchant['audit_reason']) ? (string)$merchant['audit_reason'] : '',
|
||||
'shopStatus' => (string)$merchant['shop_status'],
|
||||
] : null,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户