mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新详情

Browse Source
This commit is contained in:
shengchanzhe 2023-12-15 16:58:02 +08:00
parent 7d0d16b01d
commit 307699bca0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controller/api/store/order/StoreOrderOther.php
View File

@ -23,7 +23,6 @@ use app\validate\api\UserReceiptValidate;
use crmeb\basic\BaseController; use crmeb\basic\BaseController;
use app\common\repositories\store\order\StoreCartRepository; use app\common\repositories\store\order\StoreCartRepository;
use app\common\repositories\store\order\StoreGroupOrderRepository; 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\store\order\StoreOtherOrderRepository;
use app\common\repositories\user\UserAddressRepository; use app\common\repositories\user\UserAddressRepository;
use think\exception\ValidateException; use think\exception\ValidateException;
@ -51,7 +50,7 @@ class StoreOrderOther extends BaseController
* @param App $app * @param App $app
* @param StoreOrderRepository $repository * @param StoreOrderRepository $repository
*/ */
public function __construct(App $app, StoreOrderRepository $repository) public function __construct(App $app, StoreOtherOrderRepository $repository)
{ {
parent::__construct($app); parent::__construct($app);
$this->repository = $repository; $this->repository = $repository;
@ -222,12 +221,12 @@ class StoreOrderOther extends BaseController
{ {
//TODO 佣金结算,佣金退回,物流查询 //TODO 佣金结算,佣金退回,物流查询
$type = $this->request->param('type'); $type = $this->request->param('type');
if (!in_array($type, StoreOrderRepository::PAY_TYPE)) if (!in_array($type, StoreOtherOrderRepository::PAY_TYPE))
return app('json')->fail('请选择正确的支付方式'); return app('json')->fail('请选择正确的支付方式');
$groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id, false); $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id, false);
if (!$groupOrder) if (!$groupOrder)
return app('json')->fail('订单不存在或已支付'); 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()) { if ($groupOrder['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY && !$groupOrder->orderList[0]->allowCreditPay()) {
return app('json')->fail('请等待商家确认订单'); return app('json')->fail('请等待商家确认订单');
} }

1
route/api.php
View File

@ -127,6 +127,7 @@ Route::group('api/', function () {
//其他订单 //其他订单
Route::group('other_order', function () { Route::group('other_order', function () {
Route::get('list', '/lst_other'); Route::get('list', '/lst_other');
Route::get('detail/:id', '/detail');
Route::post('create', '/otherOrder'); //创建其他订单 Route::post('create', '/otherOrder'); //创建其他订单
Route::get('number', '/number'); Route::get('number', '/number');