|
@@ -7,6 +7,7 @@ use App\Jobs\SendTexts;
|
|
use App\Modules\Activity\Services\ActivitySwitchService;
|
|
use App\Modules\Activity\Services\ActivitySwitchService;
|
|
use App\Modules\Channel\Services\ChannelActivitiesService;
|
|
use App\Modules\Channel\Services\ChannelActivitiesService;
|
|
use App\Modules\Channel\Services\ChannelService;
|
|
use App\Modules\Channel\Services\ChannelService;
|
|
|
|
+use App\Modules\OfficialAccount\Services\ForceSubscribeService;
|
|
use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
|
|
use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
|
|
use App\Modules\Subscribe\Services\OrderService;
|
|
use App\Modules\Subscribe\Services\OrderService;
|
|
use App\Modules\User\Services\UserService;
|
|
use App\Modules\User\Services\UserService;
|
|
@@ -373,14 +374,25 @@ class WelcomeController extends BaseController
|
|
private function getSiteTitle(Request $request)
|
|
private function getSiteTitle(Request $request)
|
|
{
|
|
{
|
|
$title = "追书云";
|
|
$title = "追书云";
|
|
|
|
+ $get_force_subscribe_name = false;
|
|
$subscribe = $request->cookie('force_subscribe_name');
|
|
$subscribe = $request->cookie('force_subscribe_name');
|
|
- if ($subscribe) {
|
|
|
|
- $title = $subscribe;
|
|
|
|
- } else {
|
|
|
|
|
|
+ if ($subscribe) return $subscribe;
|
|
|
|
+ //强关公众号名称
|
|
|
|
+ $force_subscribe = ForceSubscribeService::forceSubscribeUsersByUid(['uid' => $this->uid]);
|
|
|
|
+ if ($force_subscribe) {
|
|
|
|
+ $force_subscribe_official = OfficialAccountService::officialAccountByAppid(['appid' => $force_subscribe->appid]);
|
|
|
|
+ if ($force_subscribe_official) {
|
|
|
|
+ $title = $force_subscribe_official->nickname;
|
|
|
|
+ $get_force_subscribe_name = true;
|
|
|
|
+ Cookie::queue('force_subscribe_name', $title, 12 * 3600);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //可用公众号名称
|
|
|
|
+ if (!$get_force_subscribe_name) {
|
|
$res = OfficialAccountService::canUseOfficialAccountByChannelId(['distribution_channel_id' => $this->distribution_channel_id]);
|
|
$res = OfficialAccountService::canUseOfficialAccountByChannelId(['distribution_channel_id' => $this->distribution_channel_id]);
|
|
if ($res && isset($res->nickname) && !empty($res->nickname)) {
|
|
if ($res && isset($res->nickname) && !empty($res->nickname)) {
|
|
- Cookie::queue('force_subscribe_name', $res->nickname, 12 * 3600);
|
|
|
|
$title = $res->nickname;
|
|
$title = $res->nickname;
|
|
|
|
+ Cookie::queue('force_subscribe_name', $title, 12 * 3600);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return $title;
|
|
return $title;
|
|
@@ -613,7 +625,7 @@ class WelcomeController extends BaseController
|
|
}
|
|
}
|
|
//结束
|
|
//结束
|
|
if (time() > strtotime($activity_info->end_time)) {
|
|
if (time() > strtotime($activity_info->end_time)) {
|
|
- return view('pay.order.springactivity2019', ['url' => ['javascript:void(0)', 'javascript:void(0)'], 'code' => -2 ]);
|
|
|
|
|
|
+ return view('pay.order.springactivity2019', ['url' => ['javascript:void(0)', 'javascript:void(0)'], 'code' => -2]);
|
|
}
|
|
}
|
|
$product_ids = [4063, 4064];
|
|
$product_ids = [4063, 4064];
|
|
$url = [];
|
|
$url = [];
|