diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 3d907fed..a0bda7be 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -75,7 +75,7 @@ class StoreOrder extends BaseController return app('json')->success($orderInfo); } - public function v2CreateOrder(StoreCartRepository $cartRepository, StoreOrderCreateRepository $orderCreateRepository) + public function v2CreateOrder(StoreCartRepository $cartRepository, StoreOrderCreateRepository $orderCreateRepository,StoreCartDgRepository $StoreCartDgRepository,StoreOrderCreateDgRepository $StoreOrderCreateDgRepository) { $cartId = (array)$this->request->param('cart_id', []); $addressId = (int)$this->request->param('address_id'); @@ -87,7 +87,7 @@ class StoreOrder extends BaseController $mark = (array)$this->request->param('mark', []); $payType = $this->request->param('pay_type'); $post = (array)$this->request->param('post'); - + $is_dg = $this->request->param('is_dg',0); $isPc = $payType === 'pc'; if ($isPc) { $payType = 'balance'; @@ -103,8 +103,15 @@ class StoreOrder extends BaseController } $uid = $this->request->uid(); - if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid))) - return app('json')->fail('数据无效'); +// if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid))) +// return app('json')->fail('数据无效'); + if($is_dg){ + if (!($count = count($cartId)) || $count != count($StoreCartDgRepository->validIntersection($cartId, $uid))) + return app('json')->fail('数据无效'); + }else{ + if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid))) + return app('json')->fail('数据无效'); + } // if (!$addressId) // return app('json')->fail('请选择地址');