Merge branch 'master' of iqiyoo:zhuishuyun_wap

app/Http/Routes/Wap/WapRoutes.php

@@ -22,7 +22,7 @@ Route::group(['domain'=>env('PAY_WAP_DOMAIN'),'namespace'=>'App\Http\Controllers
     Route::get('monthpay/getH5RedirectUrl','Pay\MonthOrderController@getH5RedirectUrl');
     Route::get('monthpay/getWechatRedirectUrl','Pay\MonthOrderController@getWechatRedirectUrl');
     Route::any('monthpay/signcallback','Pay\MonthOrderController@signCallBack');
-    Route::any('monthpay/ordercallback','Pay\MonthOrderController@orderCallBack');
+    Route::post('monthpay/ordercallback','Pay\MonthOrderController@orderCallBack');
 
 });
 Route::group(['domain'=>env('OFFICIAL_AUTH_FOMAIN'),'namespace'=>'App\Http\Controllers\Wap'],function(){

app/Libs/Helpers.php

@@ -626,6 +626,7 @@ function generateMonthOrderUrl($user_id){
     $ip = _getIp();
     $sign = _sign(compact('app_id','app_secret','plan_id','user_id','ip'),$key.$key);
     $sign = strtoupper($sign);
-    $url = 'http://pap.manyuedu.org/?'.http_build_query(compact('app_id','app_secret','plan_id','user_id','ip','sign'));
+    $return_web = 1;
+    $url = 'http://pap.manyuedu.org/?'.http_build_query(compact('app_id','app_secret','plan_id','user_id','ip','sign','return_web'));
     return $url;
 }