From 0bd85eb418ea24e317fba7909ad99d80cc1a28ab Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Sat, 5 Sep 2020 17:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/OrderOnlineController.php | 52 ++++----------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php index 74ad680..e50f33a 100644 --- a/app/Controller/v3/OrderOnlineController.php +++ b/app/Controller/v3/OrderOnlineController.php @@ -8,6 +8,7 @@ use App\Exception\ErrorCodeException; use App\Request\v3\OrderOnlineDetailRequest; use App\Request\v3\OrderOnlineRequest; use App\Service\CouponServiceInterface; +use App\Service\v3\Interfaces\ShopCartServiceInterface; use Hyperf\Di\Annotation\Inject; use App\Service\v3\Interfaces\OrderOnlineServiceInterface; use App\Service\v3\Interfaces\UserBindTelServiceInterface; @@ -38,6 +39,12 @@ class OrderOnlineController extends BaseController */ protected $orderOnlineService; + /** + * @Inject + * @var ShopCartServiceInterface + */ + protected $shopCartService; + /* * 如果没有绑手机号去绑定页面 * 收货地址接口 @@ -69,50 +76,7 @@ class OrderOnlineController extends BaseController //返回预约送达时间 数组 $res['appointment_time'] = $this->appointmentTimeService->do(); // - $res['store_list'] = [ - [ - 'store_nmae' => '五金杂货铺', - 'price' => '100.00', - 'note' => '多放辣椒', - 'store_id' => 66, - 'goods_list' => - [ - [ - 'id' => 3971, - 'goods_id' => 1301, - 'name' => '半边手撕鸡', - 'num' => 4, - 'price' => '90.00', - 'total' => '360.00' - ] - ] - ], - [ - 'store_nmae' => '回味手撕鸡J009', - 'note' => '手撕鸡加辣', - 'store_price' => '720.00', - 'store_id' => 123, - 'goods_list' => - [ - [ - 'id' => 3971, - 'goods_id' => 1301, - 'name' => '半边手撕鸡', - 'num' => 4, - 'price' => '90.00', - 'total' => '360.00' - ], - [ - 'id' => 3971, - 'goods_id' => 1301, - 'name' => '半边手撕鸡', - 'num' => 4, - 'price' => '90.00', - 'total' => '360.00' - ] - ] - ], - ]; + $res['store_list'] = $this->shopCartService->do(); //获取用户优惠券 $res['coupon'] = $this->couponService->getUserAvailableCoupons('',$params['user_id'],'',2,'',''); //获取配送费