feat: 完善分销中心与团队明细接口,增强商户与帖子交互细节
这个提交包含在:
@@ -186,7 +186,10 @@ class Post extends V1
|
||||
if ($plan === 'single') {
|
||||
// 单条付费 = 付费发布标准(免费发布条数用完后即按此计费);会员按折扣率计价
|
||||
$amount = $unitPrice;
|
||||
$payType = trim((string)$this->input('payType', ''));
|
||||
$payType = trim((string)$this->input('payType', 'wxpay'));
|
||||
if ($payType === '') {
|
||||
$payType = 'wxpay';
|
||||
}
|
||||
if ($amount > 0 && !in_array($payType, ['wxpay', 'balance'], true)) {
|
||||
$this->fail('支付方式不支持');
|
||||
}
|
||||
@@ -505,7 +508,7 @@ class Post extends V1
|
||||
'freeQuotaLeft' => $free['unlimited'] ? -1 : $free['left'],
|
||||
'freeUnlimited' => $free['unlimited'],
|
||||
'quotaExpireAt' => $quotaExpire > 0 ? $this->iso($quotaExpire) : '',
|
||||
'isMember' => (int)$ext['is_member'] === 1 && ($memberExpire === 0 || $memberExpire > $now),
|
||||
'isMember' => (int)$ext['is_member'] === 1 && !empty($memberExpire) && $memberExpire > $now,
|
||||
'memberExpireAt' => $memberExpire > 0 ? $this->iso($memberExpire) : '',
|
||||
]);
|
||||
}
|
||||
@@ -854,7 +857,7 @@ class Post extends V1
|
||||
if ($me) {
|
||||
$ext = $this->ext($me['id']);
|
||||
$isMember = (int)$ext['is_member'] === 1
|
||||
&& (empty($ext['member_expiretime']) || (int)$ext['member_expiretime'] > $now);
|
||||
&& !empty($ext['member_expiretime']) && (int)$ext['member_expiretime'] > $now;
|
||||
$isOwner = (int)$post['user_id'] === (int)$me['id'];
|
||||
$paid = (bool)Db::name('fc_pay_view')
|
||||
->where('user_id', $me['id'])
|
||||
@@ -974,18 +977,33 @@ class Post extends V1
|
||||
$this->fail('信息不存在', 404);
|
||||
}
|
||||
|
||||
$phone = (string)$post['phone'];
|
||||
$wechat = $post['wechat'] !== '' ? (string)$post['wechat'] : ('tongcheng_' . $id);
|
||||
$contactName = (string)(isset($post['contact']) ? $post['contact'] : '');
|
||||
|
||||
$contact = [
|
||||
'phone' => (string)$post['phone'],
|
||||
'wechat' => $post['wechat'] !== '' ? (string)$post['wechat'] : ('tongcheng_' . $id),
|
||||
'name' => $contactName,
|
||||
'phone' => $phone,
|
||||
'wechat' => $wechat,
|
||||
];
|
||||
|
||||
// 已解锁直接返回
|
||||
// 已解锁直接返回(严格返回纯净扁平字段,杜绝 JSON 嵌套导致前端格式错乱)
|
||||
$exist = Db::name('fc_pay_view')
|
||||
->where('user_id', $user['id'])
|
||||
->where('post_id', $id)
|
||||
->find();
|
||||
if ($exist) {
|
||||
$this->ok(['unlocked' => true, 'contact' => $contact]);
|
||||
$today = date('Y-m-d');
|
||||
$usedToday = ((string)$ext['free_view_date'] === $today) ? (int)$ext['free_view_used'] : 0;
|
||||
$this->ok([
|
||||
'unlocked' => true,
|
||||
'phone' => $phone,
|
||||
'contact' => $phone,
|
||||
'contactName' => $contactName,
|
||||
'wechat' => $wechat,
|
||||
'contactInfo' => $contact,
|
||||
'freeViewLeft' => $isMember ? max(0, $quota - $usedToday) : 0,
|
||||
]);
|
||||
}
|
||||
|
||||
$amount = round((float)$this->cfg('fee.payView', 2), 2);
|
||||
@@ -993,7 +1011,7 @@ class Post extends V1
|
||||
|
||||
$ext = $this->ext($user['id']);
|
||||
$isMember = (int)$ext['is_member'] === 1
|
||||
&& (!$ext['member_expiretime'] || $ext['member_expiretime'] > $now);
|
||||
&& !empty($ext['member_expiretime']) && (int)$ext['member_expiretime'] > $now;
|
||||
$quota = $this->memberFreeViewQuota();
|
||||
|
||||
$orderId = 0;
|
||||
@@ -1070,7 +1088,11 @@ class Post extends V1
|
||||
|
||||
$this->ok([
|
||||
'unlocked' => true,
|
||||
'contact' => $contact,
|
||||
'phone' => $phone,
|
||||
'contact' => $phone,
|
||||
'contactName' => $contactName,
|
||||
'wechat' => $wechat,
|
||||
'contactInfo' => $contact,
|
||||
'freeViewLeft' => $isMember ? max(0, $quota - $usedNow) : 0,
|
||||
'usedFree' => isset($usedFree) ? $usedFree : false,
|
||||
]);
|
||||
@@ -1362,7 +1384,7 @@ class Post extends V1
|
||||
{
|
||||
$now = time();
|
||||
$isMember = (int)$ext['is_member'] === 1
|
||||
&& (empty($ext['member_expiretime']) || (int)$ext['member_expiretime'] > $now);
|
||||
&& !empty($ext['member_expiretime']) && (int)$ext['member_expiretime'] > $now;
|
||||
if (!$isMember) {
|
||||
return 1.0;
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户