From 9c14ff201451cf524b7434e9be6624e8609ffee3 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Fri, 9 Oct 2020 18:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E9=83=A8=E5=88=86=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/OrderOnlineService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php
index 31d11d4..1e8706c 100644
--- a/app/Service/v3/Implementations/OrderOnlineService.php
+++ b/app/Service/v3/Implementations/OrderOnlineService.php
@@ -197,6 +197,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
             $dataOrderGoods = []; # 订单商品
             $storeTypeIds = []; # 订单中的商户类型，用于校验红包
             $activityGoodsIds = []; # 活动商品IDs
+            $shopcartIds = [];
 
             foreach ($storeList as $key => &$storeItem) {
 
@@ -217,6 +218,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
 
                 // 用户购物车数据
                 $cartIds = explode(',', $storeItem->cart_ids);
+                $shopcartIds = array_merge($shopcartIds, $cartIds);
                 $carts = ShoppingCart::query()->whereIn('id', $cartIds)->where(['market_id' => $marketId, 'user_id' => $userId])->get();
                 foreach ($carts as $k => &$cart) {
                     // 查个商品,做商品有效的判断检查
@@ -412,7 +414,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
             }
 
             // 清除购物车
-            $this->shopCartUpdateService->doClear($userId, $marketId);
+            $this->shopCartUpdateService->doClear($userId, $marketId, $shopcartIds);
 
             // 记录badge
             $this->badgeService->doByOrder($userId, array_values(array_column($dataChildren, 'store_id')), $orderMain->global_order_id, OrderState::UNPAID);