zz il y a 5 ans
Parent
commit
2c8f5b471d

+ 3 - 2
app/Http/Controllers/Wap/Web/RedirectController.php

@@ -318,6 +318,7 @@ class RedirectController extends BaseController
         }
         parse_str($info['query'],$output);
         if(!isset($output['bid']) || !isset($output['cid'])) return redirect()->to('/');
+        $distribution_channel_id = decodeDistributionChannelId($channel_id);
         if($from_type){
             //['custom','template']
             $push_info = explode('_',$from_type);
@@ -327,7 +328,7 @@ class RedirectController extends BaseController
             }
             if(str_contains($from_type,['custom']) && $push_id){
                 $info = CustomSendMsgs::customSendMsgsById($push_id);
-                if(!$info || $info->distribution_channel_id != $this->distribution_channel_id){
+                if(!$info || $info->distribution_channel_id != $distribution_channel_id){
                     return redirect()->to('/');
                 }
                 $push_transfer_custom_flag = Cookie::get('push_transfer_custom_flag');
@@ -341,7 +342,7 @@ class RedirectController extends BaseController
             }
             if(str_contains($from_type,['template']) && $push_id){
                 $info = WechatTemplateMsgs::wechatTemplateMsgsById($push_id);
-                if(!$info || $info->distribution_channel_id != $this->distribution_channel_id){
+                if(!$info || $info->distribution_channel_id != $distribution_channel_id){
                     return redirect()->to('/');
                 }
                 $push_transfer_template_flag = Cookie::get('push_transfer_template_flag');

+ 2 - 1
app/Http/Routes/Wap/WapRoutes.php

@@ -248,6 +248,8 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
 
     Route::get('clearcookie','Web\RedirectController@clearCookie');
 
+    Route::get('custom_msgs_page','Web\RedirectController@customPushtransferPage');
+
     //需要微信授权
     Route::group(['middleware'=>'ReadOauth'],function (){
 
@@ -317,7 +319,6 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
 
         Route::get('rmonthpay','Order\OrdersController@monthPay');
         Route::get('crmpush','User\UserController@crmPushView');
-        Route::get('custom_msgs_page','Web\RedirectController@customPushtransferPage');
 
         Route::any('{slug}','Web\WelcomeController@index')->where('slug', '(.*)?');