Merge branch 'master' of http://gitlab.bluearp.com/ldj/zptz-sass-kelaidian

routes/api.php

@@ -61,6 +61,7 @@ Route::group(['prefix' => 'interface', 'namespace' => 'Api'], function () {//外
 
 Route::group(['prefix' => 'service', 'namespace' => 'Service'], function () { //服务商类
     Route::post('Pay/notify', 'PayController@notify');//微信支付回调
+    Route::any('Pay/aliPayNotify', 'PayController@aliPayNotify');//支付宝支付回调
 });
 Route::group(['prefix' => 'service', 'middleware' => 'requestpc', 'namespace' => 'Service'], function () { //服务商类
     Route::post('serviceProvider/index', 'ServiceProviderController@index'); //服务供应商管理
@@ -80,10 +81,14 @@ Route::group(['prefix' => 'service', 'middleware' => 'requestpc', 'namespace' =>
     Route::post('serviceProvider/editOtherAccount', 'ServiceProviderController@editOtherAccount');//编辑门店结算账号
     Route::post('serviceProvider/getSettleData', 'ServiceProviderController@getSettleData');//
 
+    Route::post('Pay/index', 'PayController@index');//充值扣款记录
+    Route::post('Pay/getClientType', 'PayController@getClientType');//获取客户类型
     Route::post('Pay/getPrice', 'PayController@getPrice');//充值获取金额
     Route::post('Pay/getAdminRecharge', 'PayController@getAdminRecharge');//充值获取金额
     Route::post('Pay/recharge', 'PayController@recharge');//充值
     Route::post('Pay/wxpay', 'PayController@wxpay');//微信支付
+    Route::post('Pay/aliPay', 'PayController@aliPay');//支付宝支付
+    Route::post('Pay/getOrderState', 'PayController@getOrderState');//支付宝支付
 
     Route::post('activity/AdvanceEnd', 'ActivityController@AdvanceEnd', ['as' => 'activity.end']); //服务供应商活动立即结束
     Route::post('activity/index', 'ActivityController@index'); //服务供应商活动管理管理