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

111

Browse Source
This commit is contained in:
彭桃 2023-02-07 17:49:44 +08:00
parent 33350a3b6b
commit 9cb4e6c70e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controller/api/store/order/StoreOrder.php
View File

@ -20,6 +20,7 @@ use app\common\repositories\store\order\StoreOrderReceiptRepository;
use app\validate\api\UserReceiptValidate; 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\StoreCartDgRepository;
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\StoreOrderRepository;
use crmeb\services\ExpressService; use crmeb\services\ExpressService;
@ -51,7 +52,7 @@ class StoreOrder extends BaseController
$this->repository = $repository; $this->repository = $repository;
} }
public function v2CheckOrder(StoreCartRepository $cartRepository, StoreOrderCreateRepository $orderCreateRepository) public function v2CheckOrder(StoreCartRepository $cartRepository,StoreCartDgRepository $StoreCartDgRepository, StoreOrderCreateRepository $orderCreateRepository)
{ {
$cartId = (array)$this->request->param('cart_id', []); $cartId = (array)$this->request->param('cart_id', []);
$addressId = (int)$this->request->param('address_id'); $addressId = (int)$this->request->param('address_id');
@ -59,9 +60,15 @@ class StoreOrder extends BaseController
$takes = (array)$this->request->param('takes', []); $takes = (array)$this->request->param('takes', []);
$useIntegral = (bool)$this->request->param('use_integral', false); $useIntegral = (bool)$this->request->param('use_integral', false);
$user = $this->request->userInfo(); $user = $this->request->userInfo();
$is_dg = $this->request->param('is_dg',0);
$uid = $user->uid; $uid = $user->uid;
if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid))) if($is_dg){
return app('json')->fail('数据无效'); 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('数据无效');
}
$orderInfo = $orderCreateRepository->v2CartIdByOrderInfo($user, $cartId, $takes, $couponIds, $useIntegral, $addressId); $orderInfo = $orderCreateRepository->v2CartIdByOrderInfo($user, $cartId, $takes, $couponIds, $useIntegral, $addressId);
return app('json')->success($orderInfo); return app('json')->success($orderInfo);