Merge branch 'stabble' of iqiyoo:zhuishuyun_wap

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -1053,7 +1053,7 @@ class ChapterController extends BaseController
         if ($this->is_had_subscribe && in_array($this->distribution_channel_id, [2, 14, 211,4025,4147,691,123]) && $this->user) {//,4147,691,123,4025
             $this->chapter->is_show_share_button = 1;
         }
-        if($this->distribution_channel_id == 6985 && $this->domain == 'leyuee'){
+        /*if($this->distribution_channel_id == 6985 && $this->domain == 'leyuee'){
             $appid = 'wx126331d1732978b0';
             $appSecret = '76231c41c24d4363243866f5f9dee55f';
             $config = new ChapterShareWechatConfigService($appid,$appSecret);
@@ -1066,8 +1066,10 @@ class ChapterController extends BaseController
                 $this->en_bid,
                 $this->cid
             );
+            //$url = url()->full();
+            //$url = str_replace('http://','https://',$url);
             $this->chapter->share_config = $config->getJssdkConfig($url);
-        }
+        }*/
     }
 
     /**

app/Http/Controllers/Wap/Other/WeixinController.php

@@ -12,15 +12,15 @@ class WeixinController extends Controller
 
     public function jsSdkConfig(Request $request,$channel_id,$doamin)
     {
-        $base_url =   env('PROTOCOL').'://site'.$channel_id.'.'.$doamin.'.com/';
-        $path = $request->get('path');
+        //$base_url =   env('PROTOCOL').'://site'.$channel_id.'.'.$doamin.'.com/';
+        $url = $request->post('url');
         $appid = 'wx126331d1732978b0';
         $appSecret = '76231c41c24d4363243866f5f9dee55f';
         $config = new ChapterShareWechatConfigService($appid,$appSecret);
         //$config->setAccessToken('');
         $config->requestAccessToken();
         $config->requestJsApiTicket();
-        $url = $base_url.$path;
+        //$url = $base_url.$path;
         $data = $config->getJssdkConfig($url);
         return response()->success($data);
     }

app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -1632,9 +1632,9 @@ class OrdersController extends Controller
 
     protected function successPayPushMsg($uid, $product_info, $order_id)
     {
+        $force_sub_info = $this->getSubscribeV2($uid);
+        $data = UserService::getById($uid);
         try {
-            $force_sub_info = $this->getSubscribeV2($uid);
-            $data = UserService::getById($uid);
             if (!in_array($data->distribution_channel_id, [5, 123])) {
                 //return false;
             }
@@ -1692,7 +1692,7 @@ class OrdersController extends Controller
             Log::info('pay_success_push error');
             Log::info($e);
         }
-        $this->notifyXiyue($uid,$product_info->price);
+        $this->notifyXiyue($uid,$product_info->price,$data->distribution_channel_id,$data->openid);
         return true;
     }
 
@@ -2066,13 +2066,14 @@ class OrdersController extends Controller
         }catch (\Exception $e){}*/
     }
 
-    private function notifyXiyue($uid,$price,$type='recharge'){
-        $xiyue_user = DB::table('xiyue_zsy_users')->where('uid',$uid)->select('openid')->first();
+    private function notifyXiyue($uid,$price,$channel_id,$openid,$type='recharge'){
+        if($channel_id != 6985) return ;
+        //$xiyue_user = DB::table('xiyue_zsy_users')->where('uid',$uid)->select('openid')->first();
         $xiyue_host = env('XIYUE_HOST');
-        if($xiyue_user && $xiyue_host){
+        if( $xiyue_host){
             $client = new Client(['timeout' => 5]);
             $url = $xiyue_host.'/order/success';
-            $param = ['openid'=>$xiyue_user->openid,'price'=>$price];
+            $param = ['openid'=>$openid,'price'=>$price];
             $param['sign'] = _sign($param,'8T5MJy4FsJoZspq8');
             try{
                 $client->request('post',$url,['form_params'=>$param])->getBody()->getContents();

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -2322,6 +2322,7 @@ class WelcomeController extends BaseController
         if($this->distribution_channel_id == 6985){
             return [
                 'is_xiyue_user'=>1,
+                'debug'=>env('XI_YUE_SHARE_DEBUG',0),
                 'xiyue_index_page'=>'https://xiyue.aizhuishu.com/',
                 'xiyue_pay_page'=>'https://xiyue.aizhuishu.com/',
                 'xiyue_pay_unfocus_img'=>'https://cdn-novel.iycdm.com/h5/xiyue/xiyue_pay_unfocus_img.png',

app/Http/Routes/Wap/WapRoutes.php

@@ -229,7 +229,7 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
 
         Route::post('activity/huaweiLottery','Web\ActivityController@huaweiLottery');
 
-        Route::get('weixin/jsSdkConfig','Other\WeixinController@jsSdkConfig');
+        Route::post('weixin/jsSdkConfig','Other\WeixinController@jsSdkConfig');
 
     });
 

resources/views/wap/index.blade.php

@@ -9,7 +9,7 @@
     <script>window.VueRouter || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-router.min.js"><\/script>')</script>
     <script>(window.Vue && window.VueLazyload) || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-lazyload.js"><\/script>')</script>
     <title>{{$title}}</title>
-    <link href=https://cdn-novel.iycdm.com/static2019-9-2/css/app.dc94c40cf7306a03bcdb52a6cf301bd4.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-9-2/css/app.368e154a276084c492d68f175003b412.css rel=stylesheet>
 </head>
 <body>
 <div id=app></div>
@@ -32,8 +32,8 @@
     })();</script>
 <script id=options>window.options = {!! $options!!};</script>
 <script type=text/javascript
-        src=https://cdn-novel.iycdm.com/static2019-9-2/js/manifest.f675c86856cd6b7f51a5.js></script>
+        src=https://cdn-novel.iycdm.com/static2019-9-2/js/manifest.cf997389d7760848c150.js></script>
 <script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-9-2/js/vendor.67516a6a43f9adc48771.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-9-2/js/app.701d309a4104d5c0b12c.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-9-2/js/app.3928019ecaf4a9c389a8.js></script>
 </body>
 </html>