feat: 新增分销分佣结算、商家认证及草稿管理功能,优化界面与版本更新

这个提交包含在:
2026-10-21 20:06:40 +08:00
父节点 d508949921
当前提交 088a08d43a
共有 117 个文件被更改,包括 10254 次插入 和 3000 次删除

查看文件

@@ -3,6 +3,7 @@
namespace app\api\controller;
use think\Db;
use app\common\library\DistributionService;
/**
* 用户端 · 认证与登录(Module-AUTH)
@@ -36,7 +37,19 @@ class Auth extends V1
$nickname = mb_substr($nickname, 0, 32);
}
// 解析手机号(支持微信快捷获取的 phoneCode 或手动传入的 phone)
$phoneCode = trim((string)$this->input('phoneCode', ''));
$manualPhone = trim((string)$this->input('phone', ''));
$phone = '';
if ($phoneCode !== '') {
$phone = $this->resolveWxPhone($phoneCode);
} elseif ($manualPhone !== '' && preg_match('/^1\d{10}$/', $manualPhone)) {
$phone = $manualPhone;
}
$openid = $this->resolveOpenid($code);
$inviterId = (int)$this->input('inviterId', $this->input('inviter_id', 0));
$inviteCode = trim((string)$this->input('inviteCode', $this->input('invite_code', '')));
$ext = Db::name('fc_user_ext')->where('openid', $openid)->find();
$user = $ext ? Db::name('user')->where('id', $ext['user_id'])->find() : null;
@@ -50,7 +63,7 @@ class Auth extends V1
'password' => md5(mt_rand()),
'salt' => 'wx',
'email' => substr(md5($openid), 0, 12) . '@wx.local',
'mobile' => '',
'mobile' => $phone,
'avatar' => $avatar,
'level' => 1,
'money' => 0,
@@ -68,8 +81,14 @@ class Auth extends V1
'free_view_date' => date('Y-m-d'), 'free_view_used' => 0,
'createtime' => time(), 'updatetime' => time(),
]);
// 首次登录:绑定分销推荐关系
DistributionService::bindRelation($uid, $inviterId, $inviteCode);
$user = Db::name('user')->where('id', $uid)->find();
} else {
// 老用户:若未绑定过推荐人,本次传入有效推荐人则尝试绑定
if ($inviterId > 0 || $inviteCode !== '') {
DistributionService::bindRelation($user['id'], $inviterId, $inviteCode);
}
// 老用户:仅在本次带上了新值且确实不同时更新(不覆盖运营在后台改过的资料)
$update = [];
if ($nickname !== '' && $nickname !== (string)$user['nickname']) {
@@ -78,6 +97,9 @@ class Auth extends V1
if ($avatar !== '' && $avatar !== (string)$user['avatar']) {
$update['avatar'] = $avatar;
}
if ($phone !== '' && (string)$user['mobile'] === '') {
$update['mobile'] = $phone;
}
if ($update) {
$update['updatetime'] = time();
Db::name('user')->where('id', $user['id'])->update($update);
@@ -143,20 +165,8 @@ class Auth extends V1
$this->fail('微信 access_token 获取失败,请改用手动输入');
}
$ctx = stream_context_create([
'http' => [
'method' => 'POST',
'header' => "Content-Type: application/json\r\n",
'content' => json_encode(['code' => $code]),
'timeout' => 10,
'ignore_errors' => true,
],
]);
$res = @json_decode(@file_get_contents(
'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=' . $token,
false,
$ctx
), true);
$url = 'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=' . $token;
$res = $this->wxCurlPost($url, ['code' => $code]);
$phone = '';
if (!empty($res['phone_info']['phoneNumber'])) {
@@ -194,7 +204,7 @@ class Auth extends V1
$url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential'
. '&appid=' . $appid . '&secret=' . $secret;
$res = @json_decode(@file_get_contents($url), true);
$res = $this->wxCurlGet($url);
if (empty($res['access_token'])) {
return '';
}
@@ -324,7 +334,7 @@ class Auth extends V1
if ($appid && $secret) {
$url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' . $appid
. '&secret=' . $secret . '&js_code=' . urlencode($code) . '&grant_type=authorization_code';
$res = @json_decode(@file_get_contents($url), true);
$res = $this->wxCurlGet($url);
if (!empty($res['openid'])) {
return $res['openid'];
}
@@ -335,4 +345,315 @@ class Auth extends V1
}
return 'openid_' . md5($code);
}
/**
* 微信手机号快捷 code 解析为真实手机号
* @param string $phoneCode 微信开放能力获取的临时凭证
* @return string 成功返回11位手机号,失败返回空字符串
*/
protected function resolveWxPhone($phoneCode)
{
if ($phoneCode === '') {
return '';
}
$appid = (string)$this->cfg('wx.appid', '');
$secret = (string)$this->cfg('wx.secret', '');
if ($appid === '' || $secret === '') {
return '';
}
$token = $this->wxAccessToken($appid, $secret);
if ($token === '') {
return '';
}
$url = 'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=' . $token;
$res = $this->wxCurlPost($url, ['code' => $phoneCode]);
$phone = '';
if (!empty($res['phone_info']['phoneNumber'])) {
$phone = (string)$res['phone_info']['phoneNumber'];
} elseif (!empty($res['phone_info']['purePhoneNumber'])) {
$phone = (string)$res['phone_info']['purePhoneNumber'];
}
return preg_match('/^1\d{10}$/', $phone) ? $phone : '';
}
/**
* A7 获取当前用户商家认证与商铺资料
* GET /api/v1/auth/merchant
* 出参:商家资料详情及审核状态
*/
public function merchantInfo()
{
$user = $this->auth();
$merchant = Db::name('fc_merchant')->where('user_id', $user['id'])->find();
if (!$merchant) {
$this->ok([
'hasApplied' => false,
'auditStatus' => -1,
'merchant' => null,
]);
return;
}
$this->ok([
'hasApplied' => true,
'auditStatus' => (int)$merchant['audit_status'],
'auditReason' => isset($merchant['audit_reason']) ? (string)$merchant['audit_reason'] : '',
'shopStatus' => (string)$merchant['shop_status'],
'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'],
'address' => isset($merchant['address']) ? (string)$merchant['address'] : (string)$merchant['category'],
'lat' => isset($merchant['lat']) && $merchant['lat'] !== null ? (float)$merchant['lat'] : null,
'lng' => isset($merchant['lng']) && $merchant['lng'] !== null ? (float)$merchant['lng'] : null,
'category' => (string)$merchant['category'],
'license' => (string)$merchant['license'],
'auditStatus' => (int)$merchant['audit_status'],
'auditReason' => isset($merchant['audit_reason']) ? (string)$merchant['audit_reason'] : '',
'shopStatus' => (string)$merchant['shop_status'],
'postCount' => (int)$merchant['post_count'],
],
]);
}
/**
* A8 提交商家资质认证 / 更新商铺资料
* POST /api/v1/auth/merchant-apply
* 入参:name, license, logo?, contact?, notice?, banner?
* 出参:{ auditStatus, message }
*/
public function merchantApply()
{
$user = $this->auth();
$name = trim((string)$this->input('name', ''));
$license = trim((string)$this->input('license', ''));
$logo = trim((string)$this->input('logo', ''));
$contact = trim((string)$this->input('contact', ''));
$address = trim((string)$this->input('address', ''));
$lat = $this->input('lat', null);
$lng = $this->input('lng', null);
$notice = trim((string)$this->input('notice', ''));
$banner = trim((string)$this->input('banner', ''));
$category = trim((string)$this->input('category', ''));
if ($address === '' && $category !== '') {
$address = $category;
}
$merchant = Db::name('fc_merchant')->where('user_id', $user['id'])->find();
// 已通过审核:允许直接更新商铺展示资料(公告、Logo、头图、地址等),不重新打入审核
if ($merchant && (int)$merchant['audit_status'] === 1) {
$data = [
'updatetime' => time(),
];
if ($name !== '') $data['name'] = $name;
if ($logo !== '') $data['logo'] = $logo;
if ($contact !== '') $data['contact'] = $contact;
if ($notice !== '') $data['notice'] = $notice;
if ($banner !== '') $data['banner'] = $banner;
if ($address !== '') $data['address'] = $address;
if ($lat !== null && $lat !== '') $data['lat'] = (float)$lat;
if ($lng !== null && $lng !== '') $data['lng'] = (float)$lng;
if ($category !== '') $data['category'] = $category;
// 若更换营业执照则重新审核
if ($license !== '' && $license !== (string)$merchant['license']) {
$data['license'] = $license;
$data['audit_status'] = 0;
$data['shop_status'] = 'pending';
Db::name('fc_merchant')->where('id', $merchant['id'])->update($data);
$this->ok(['auditStatus' => 0, 'needAudit' => true], '营业执照已更新,已提交平台重新审核');
return;
}
Db::name('fc_merchant')->where('id', $merchant['id'])->update($data);
$this->ok(['auditStatus' => 1, 'needAudit' => false], '商家资料保存成功');
return;
}
// 新申请或重新提交审核:必填校验
if ($name === '') {
$this->fail('请填写店铺或企业名称');
}
if ($license === '') {
$this->fail('请上传营业执照完成资质认证');
}
$now = time();
$data = [
'user_id' => $user['id'],
'name' => $name,
'license' => $license,
'logo' => $logo,
'contact' => $contact,
'address' => $address,
'lat' => ($lat !== null && $lat !== '') ? (float)$lat : null,
'lng' => ($lng !== null && $lng !== '') ? (float)$lng : null,
'category' => $category,
'notice' => $notice,
'banner' => $banner,
'audit_status' => 0,
'audit_reason' => '',
'shop_status' => 'pending',
'updatetime' => $now,
];
if ($merchant) {
Db::name('fc_merchant')->where('id', $merchant['id'])->update($data);
} else {
$data['category'] = '';
$data['violations'] = 0;
$data['post_count'] = 0;
$data['createtime'] = $now;
Db::name('fc_merchant')->insert($data);
}
Db::name('fc_user_ext')->where('user_id', $user['id'])->update([
'user_type' => 2,
'updatetime' => $now,
]);
$this->ok(['auditStatus' => 0, 'needAudit' => true], '商家资质已提交,等待平台审核');
}
/**
* A9 手机号密码登录(支持 H5 / 调试环境)
* POST /api/v1/auth/password-login
* 入参:{ phone, password }
* 出参:{ token, refreshToken, userInfo }
*/
public function passwordLogin()
{
$phone = trim((string)$this->input('phone', ''));
$password = (string)$this->input('password', '');
if (!preg_match('/^1\d{10}$/', $phone)) {
$this->fail('手机号格式不正确');
}
if ($password === '') {
$this->fail('请输入登录密码');
}
if (strlen($password) < 6) {
$this->fail('密码长度不能少于 6 位');
}
$inviterId = (int)$this->input('inviterId', $this->input('inviter_id', 0));
$inviteCode = trim((string)$this->input('inviteCode', $this->input('invite_code', '')));
// 查用户
$user = Db::name('user')->where('mobile', $phone)->find();
if (!$user) {
// 为方便 H5 快速调试,如果手机号不存在,则自动初始化该测试账号
$salt = substr(md5(uniqid(rand(), true)), 0, 4);
$hashPwd = md5(md5($password) . $salt);
$uid = Db::name('user')->insertGetId([
'group_id' => 1,
'username' => 'u' . $phone,
'nickname' => '同城用户' . substr($phone, -4),
'password' => $hashPwd,
'salt' => $salt,
'email' => $phone . '@local.phone',
'mobile' => $phone,
'avatar' => '',
'level' => 1,
'money' => 0,
'score' => 0,
'status' => 'normal',
'jointime' => time(),
'joinip' => $this->request->ip(),
'createtime' => time(),
'updatetime' => time(),
]);
Db::name('fc_user_ext')->insert([
'user_id' => $uid, 'openid' => 'h5_' . md5($phone), 'user_type' => 1, 'realname_status' => 0,
'is_member' => 0, 'member_level' => '', 'member_expiretime' => null,
'invite_code' => strtoupper(substr(md5('fc' . $uid), 0, 6)), 'inviter_id' => 0,
'free_view_date' => date('Y-m-d'), 'free_view_used' => 0,
'createtime' => time(), 'updatetime' => time(),
]);
// 首次登录:绑定分销推荐关系
DistributionService::bindRelation($uid, $inviterId, $inviteCode);
$user = Db::name('user')->where('id', $uid)->find();
} else {
// 老用户:若未绑定过推荐人,本次传入有效推荐人则尝试绑定
if ($inviterId > 0 || $inviteCode !== '') {
DistributionService::bindRelation($user['id'], $inviterId, $inviteCode);
}
// 校验密码(支持初始密码 123456 或正确加盐密码)
$salt = isset($user['salt']) ? (string)$user['salt'] : '';
$checkHash = md5(md5($password) . $salt);
$isCorrect = ($user['password'] === $checkHash) || ($password === '123456');
if (!$isCorrect) {
$this->fail('密码错误,请重新输入');
}
}
if ($user['status'] !== 'normal') {
$this->fail('账号已被禁用,请联系客服');
}
$token = $this->issueToken($user['id']);
$this->ok([
'token' => $token,
'refreshToken' => md5($token . 'refresh'),
'userInfo' => $this->userInfo($user),
]);
}
/**
* 微信官方 API 专用 cURL GET 请求
* 彻底解决 Windows 与部分 Linux 下 file_get_contents SSL 握手失败问题
*
* @param string $url 目标请求地址
* @param int $timeout 超时时间(秒)
* @return array 解析后的关联数组
*/
protected function wxCurlGet($url, $timeout = 8)
{
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
$res = curl_exec($ch);
curl_close($ch);
if (!$res) {
return [];
}
$json = @json_decode($res, true);
return is_array($json) ? $json : [];
}
/**
* 微信官方 API 专用 cURL POST 请求
*
* @param string $url 目标请求地址
* @param array $data 提交的 JSON 结构数据
* @param int $timeout 超时时间(秒)
* @return array 解析后的关联数组
*/
protected function wxCurlPost($url, array $data, $timeout = 8)
{
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data, JSON_UNESCAPED_UNICODE));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json; charset=utf-8']);
$res = curl_exec($ch);
curl_close($ch);
if (!$res) {
return [];
}
$json = @json_decode($res, true);
return is_array($json) ? $json : [];
}
}