diff --git a/app/controller/api/store/order/StoreOrderOther.php b/app/controller/api/store/order/StoreOrderOther.php index 2dc3fc78..052d53e8 100644 --- a/app/controller/api/store/order/StoreOrderOther.php +++ b/app/controller/api/store/order/StoreOrderOther.php @@ -23,7 +23,6 @@ use app\validate\api\UserReceiptValidate; use crmeb\basic\BaseController; use app\common\repositories\store\order\StoreCartRepository; use app\common\repositories\store\order\StoreGroupOrderRepository; -use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreOtherOrderRepository; use app\common\repositories\user\UserAddressRepository; use think\exception\ValidateException; @@ -51,7 +50,7 @@ class StoreOrderOther extends BaseController * @param App $app * @param StoreOrderRepository $repository */ - public function __construct(App $app, StoreOrderRepository $repository) + public function __construct(App $app, StoreOtherOrderRepository $repository) { parent::__construct($app); $this->repository = $repository; @@ -222,12 +221,12 @@ class StoreOrderOther extends BaseController { //TODO 佣金结算,佣金退回,物流查询 $type = $this->request->param('type'); - if (!in_array($type, StoreOrderRepository::PAY_TYPE)) + if (!in_array($type, StoreOtherOrderRepository::PAY_TYPE)) return app('json')->fail('请选择正确的支付方式'); $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id, false); if (!$groupOrder) return app('json')->fail('订单不存在或已支付'); - $this->repository->changePayType($groupOrder, array_search($type, StoreOrderRepository::PAY_TYPE)); + $this->repository->changePayType($groupOrder, array_search($type, StoreOtherOrderRepository::PAY_TYPE)); if ($groupOrder['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY && !$groupOrder->orderList[0]->allowCreditPay()) { return app('json')->fail('请等待商家确认订单'); } diff --git a/route/api.php b/route/api.php index 0a0655c6..8adc0fbb 100644 --- a/route/api.php +++ b/route/api.php @@ -127,6 +127,7 @@ Route::group('api/', function () { //其他订单 Route::group('other_order', function () { Route::get('list', '/lst_other'); + Route::get('detail/:id', '/detail'); Route::post('create', '/otherOrder'); //创建其他订单 Route::get('number', '/number');