Browse Source

Merge branch 'horseman'

# Conflicts:
#	config/routes.php
master
Lemon 5 years ago
parent
commit
0fbfd4f0a4
  1. 12
      config/routes.php

12
config/routes.php

@ -99,12 +99,6 @@ Router::addGroup('/v3/', function () {
Router::post('goods/getTags', 'App\Controller\v3\GoodsController@getTags');
Router::post('home/market', 'App\Controller\v3\HomeController@marketInfo');
Router::post('location/addrSuggestion', 'App\Controller\v3\LocationController@addrSuggestion');
Router::post('horseman/getOrderList', 'App\Controller\v3\HorsemanController@getOrderList');
Router::post('horseman/getHorsemanCoordinate', 'App\Controller\v3\HorsemanController@getHorsemanCoordinate');
Router::post('horseman/getOrderCoordinate', 'App\Controller\v3\HorsemanController@getOrderCoordinate');
Router::post('horseman/setHorsemanCoordinate', 'App\Controller\v3\HorsemanController@setHorsemanCoordinate');
Router::post('horseman/getOrderInfo', 'App\Controller\v3\HorsemanController@getOrderInfo');
Router::post('horseman/orderComplete', 'App\Controller\v3\HorsemanController@orderComplete');
Router::post('userAddress/deliveryDistance', 'App\Controller\v3\UserAddressController@deliveryDistance');
},['middleware' => [\App\Middleware\Auth\ApiMiddleware::class]]);
@ -175,6 +169,12 @@ Router::addGroup('/v3/', function () {
Router::post('store/updateIsRest', 'App\Controller\v3\StoreController@updateIsRest');
Router::post('coupon/getAvailableListByNewUser', 'App\Controller\v3\CouponController@getAvailableListByNewUser');
Router::post('coupon/receive', 'App\Controller\v3\CouponController@receive');
Router::post('horseman/getOrderList', 'App\Controller\v3\HorsemanController@getOrderList');
Router::post('horseman/getHorsemanCoordinate', 'App\Controller\v3\HorsemanController@getHorsemanCoordinate');
Router::post('horseman/getOrderCoordinate', 'App\Controller\v3\HorsemanController@getOrderCoordinate');
Router::post('horseman/setHorsemanCoordinate', 'App\Controller\v3\HorsemanController@setHorsemanCoordinate');
Router::post('horseman/getOrderInfo', 'App\Controller\v3\HorsemanController@getOrderInfo');
Router::post('horseman/orderComplete', 'App\Controller\v3\HorsemanController@orderComplete');
},['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]);
// 微信支付回调

Loading…
Cancel
Save