代购接口修改1

This commit is contained in:
彭桃 2023-02-08 10:11:15 +08:00
parent 9cb4e6c70e
commit edbeb1cf0f
2 changed files with 1354 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@ 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\StoreOrderRepository;
use app\common\repositories\store\order\StoreOrderCreateDgRepository;
use crmeb\services\ExpressService;
use crmeb\services\LockService;
use think\App;
@ -52,7 +53,7 @@ class StoreOrder extends BaseController
$this->repository = $repository;
}
public function v2CheckOrder(StoreCartRepository $cartRepository,StoreCartDgRepository $StoreCartDgRepository, StoreOrderCreateRepository $orderCreateRepository)
public function v2CheckOrder(StoreCartRepository $cartRepository,StoreCartDgRepository $StoreCartDgRepository, StoreOrderCreateRepository $orderCreateRepository,StoreOrderCreateDgRepository $StoreOrderCreateDgRepository)
{
$cartId = (array)$this->request->param('cart_id', []);
$addressId = (int)$this->request->param('address_id');
@ -65,12 +66,12 @@ class StoreOrder extends BaseController
if($is_dg){
if (!($count = count($cartId)) || $count != count($StoreCartDgRepository->validIntersection($cartId, $uid)))
return app('json')->fail('数据无效');
$orderInfo = $StoreOrderCreateDgRepository->v2CartIdByOrderInfo($user, $cartId, $takes, $couponIds, $useIntegral, $addressId);
}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);
}