|
@@ -16,6 +16,7 @@ use App\Modules\User\Services\ForceSubscribeUserIService;
|
|
|
use App\Modules\User\Services\UserBindHkWelfareService;
|
|
|
use App\Modules\User\Services\UserDivisionCpcPropertyService;
|
|
|
use App\Modules\User\Services\UserDivisionPropertyService;
|
|
|
+use App\Modules\User\Services\UserMonthService;
|
|
|
use App\Modules\User\Services\UserService;
|
|
|
use Illuminate\Http\Request;
|
|
|
use App\Http\Controllers\Wap\BaseController;
|
|
@@ -189,7 +190,7 @@ class WelcomeController extends BaseController
|
|
|
|
|
|
//用户分割
|
|
|
$this->userPproperty($user->openid);
|
|
|
- $month_order_info = $this->monthOrderInfo();
|
|
|
+ $month_order_info = $this->monthOrderInfo($user->openid);
|
|
|
$options = json_encode([
|
|
|
'distribution_channel_id' => (int)$this->distribution_channel_id,
|
|
|
'send_order_id' => $send_order_id,
|
|
@@ -2187,17 +2188,19 @@ class WelcomeController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- private function monthOrderInfo(){
|
|
|
+ private function monthOrderInfo($openid){
|
|
|
$property = $this->property;
|
|
|
if (!$property) $property = 'low';
|
|
|
if (in_array($this->distribution_channel_id, explode(',', redisEnv('OPEN_ORDER_INNER_SITES')))
|
|
|
&& in_array($property, ['low', 'medium'])
|
|
|
) {
|
|
|
- return [
|
|
|
- 'price'=>'30元',
|
|
|
- 'text' => '30元包月 全站万本精彩小说免费看',
|
|
|
- 'link'=>generateMonthOrderUrl($this->uid)
|
|
|
- ];
|
|
|
+ if(!UserMonthService::isSignMonth($openid)){
|
|
|
+ return [
|
|
|
+ 'price'=>'30元',
|
|
|
+ 'text' => '30元包月 全站万本精彩小说免费看',
|
|
|
+ 'link'=>generateMonthOrderUrl($this->uid)
|
|
|
+ ];
|
|
|
+ }
|
|
|
}
|
|
|
return '';
|
|
|
}
|