From 0d10181c7d444081e7bce9bcdf6a3ef5d49da3e9 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 21 Apr 2022 13:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/view/default/config.json |  2 +-
 app/service/BuyService.php         | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/index/view/default/config.json b/app/index/view/default/config.json
index d74be8c1e..ba29fd0cd 100755
--- a/app/index/view/default/config.json
+++ b/app/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.2.6",
+	"ver":"2.2.7",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/app/service/BuyService.php b/app/service/BuyService.php
index 641c043c0..fd9a1aa96 100755
--- a/app/service/BuyService.php
+++ b/app/service/BuyService.php
@@ -229,11 +229,22 @@ class BuyService
             return DataReturn($ret, -1);
         }
 
-        // 获取购物车数据
+        // 基础参数
         $where = (!empty($params['where']) && is_array($params['where'])) ? $params['where'] : [];
-        $where['c.user_id'] = $params['user']['id'];
-
+        $where[] = ['c.user_id', '=', $params['user']['id']];
         $field = 'c.*, g.inventory_unit, g.is_shelves, g.is_delete_time, g.buy_min_number, g.buy_max_number, g.model, g.site_type';
+
+        // 购物车列表读取前钩子
+        $hook_name = 'plugins_service_cart_goods_list_begin';
+        MyEventTrigger($hook_name, [
+            'hook_name'     => $hook_name,
+            'is_backend'    => true,
+            'params'        => &$params,
+            'where'         => &$where,
+            'field'         => &$field,
+        ]);
+
+        // 获取购物车数据
         $data = Db::name('Cart')->alias('c')->leftJoin('goods g', 'g.id=c.goods_id')->where($where)->field($field)->order('c.id desc')->select()->toArray();
 
         // 数据处理
@@ -640,9 +651,9 @@ class BuyService
 
         // 获取购物车数据
         $params['where'] = [
-            'g.is_delete_time'  => 0,
-            'g.is_shelves'      => 1,
-            'c.id'              => explode(',', $params['ids']),
+            ['g.is_delete_time', '=', 0],
+            ['g.is_shelves', '=', 1],
+            ['c.id', 'in', explode(',', $params['ids'])],
         ];
         return self::CartList($params);
     }