Merge branch 'master' of iqiyoo:zhuishuyun_wap

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

@@ -28,6 +28,13 @@ class XiyueController extends Controller
                     'is_new'=>1,
                     'register_ip'=>''
                 ]);
+            DB::table('xiyue_zsy_users')->insert([
+                'uid'=>$user->id,
+                'xiyue_uid'=>0,
+                'openid'=>$openid,
+                'created_at'=>date('Y-m-d H:i:s'),
+                'updated_at'=>date('Y-m-d H:i:s')
+            ]);
         }
         YearOrderService::save_year_order([
             'uid'=>$user->id,
@@ -40,8 +47,8 @@ class XiyueController extends Controller
     }
 
     public function getUserBalance(Request $request){
-        $openid = $request->get('openid');
-        $sign = $request->get('sign');
+        $openid = $request->post('openid');
+        $sign = $request->post('sign');
         $mySign = _sign(compact('openid'),'8T5MJy4FsJoZspq8');
         if($sign != $mySign){
             return response()->error('PARAM_ERROR');

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

@@ -2068,9 +2068,10 @@ class OrdersController extends Controller
 
     private function notifyXiyue($uid,$price,$type='recharge'){
         $xiyue_user = DB::table('xiyue_zsy_users')->where('uid',$uid)->select('openid')->first();
-        if($xiyue_user){
+        $xiyue_host = env('XIYUE_HOST');
+        if($xiyue_user && $xiyue_host){
             $client = new Client(['timeout' => 5]);
-            $url = env('XIYUE_HOST').'/order/success';
+            $url = $xiyue_host.'/order/success';
             $param = ['openid'=>$xiyue_user->openid,'price'=>$price];
             $param['sign'] = _sign($param,'8T5MJy4FsJoZspq8');
             try{

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

@@ -2289,8 +2289,8 @@ class WelcomeController extends BaseController
         if($this->distribution_channel_id == 6985){
             return [
                 'is_xiyue_user'=>1,
-                'xiyue_index_page'=>'https://site5.leyuee.com',
-                'xiyue_pay_page'=>'https://site5.leyuee.com',
+                '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',
                 'xiyue_pay_focus_img'=>'https://cdn-novel.iycdm.com/h5/xiyue/xiyue_pay_focus_img.png',
             ];

app/Http/Routes/Wap/WapRoutes.php

@@ -24,7 +24,7 @@ Route::group(['domain'=>env('PAY_WAP_DOMAIN'),'namespace'=>'App\Http\Controllers
     Route::any('monthpay/signcallback','Pay\MonthOrderController@signCallBack');
     Route::post('monthpay/ordercallback','Pay\MonthOrderController@orderCallBack');
     Route::post('xiyue/paynotify','Other\XiyueController@xiyuePayNotity');
-    Route::get('xiyue/getuserbalance','Other\XiyueController@getUserBalance');
+    Route::post('xiyue/getuserbalance','Other\XiyueController@getUserBalance');
     Route::post('xiyue/consume','Other\XiyueController@xiyueConsume');
 
 });