添加最近的门店

app-mall/controllers/BaseController.php

@@ -22,7 +22,7 @@ class BaseController extends PublicController
 
     public $validate = true;
     public $guestAccess = [];
-    public $userId = 0, $user, $shopId, $shop;
+    public $userId = 0, $user = null, $shopId, $shop;
     public $sjId, $sj, $sjExtend, $customId = 0, $custom = [], $mainId = 0, $main = [];
     public $isWx;
 

app-mall/controllers/CategoryController.php

@@ -4,6 +4,7 @@ namespace mall\controllers;
 
 use bizMall\goods\services\CategoryService;
 use bizMall\goods\services\GoodsCategoryService;
+use bizMall\user\classes\UserClass;
 use Yii;
 use yii\web\Controller;
 use common\components\util;
@@ -14,6 +15,9 @@ class CategoryController extends BaseController
     //获取分类 ssh 2019.12.2
     public function actionList()
     {
+        //添加最近访问的门店
+        UserClass::addRecentShop($this->shopId, $this->user);
+
         $return = CategoryService::getEnableList($this->mainId);
         util::success($return);
     }

app-mall/controllers/ItemController.php

@@ -5,11 +5,13 @@ namespace mall\controllers;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\product\services\ProductService;
+use bizMall\user\classes\UserClass;
 use common\components\util;
 use Yii;
 
 class ItemController extends BaseController
 {
+
     public function actionIndex()
     {
         $py = Yii::$app->request->get('py', '');
@@ -41,6 +43,9 @@ class ItemController extends BaseController
 
         $data = ProductService::assembleData($classIds, $itemInfoData, true);
 
+        //添加最近访问的门店
+        UserClass::addRecentShop($this->shopId, $this->user);
+
         util::success($data);
     }
 }

biz-mall/user/classes/UserClass.php

@@ -67,31 +67,30 @@ class UserClass extends BaseClass
                 $shopName = $val['shopName'] ?? '';
                 $sjName = $val['merchantName'] ?? '';
                 $default = $val['default'] ?? 0;
-                $showName = $sjName . ' ' . $shopName;
-                if ($default == 1) {
-                    $showName = $sjName;
-                }
+                $showName = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
                 $list[$key]['showName'] = $showName;
             }
         }
         return $list;
     }
 
-    //添加最近访问的门店 ssh 2021.4.10
-    public static function addRecentShop($lookShopId, $user)
+    //添加最近访问的门店 ssh 20220916
+    public static function addRecentShop($shopId, $user)
     {
-        if (empty($lookShopId)) {
+        if (empty($shopId)) {
+            return false;
+        }
+        if (isset($user) == false || empty($user)) {
             return false;
         }
-        $hasRecentShop = $user['recentShop'];
-        $userId = $user['id'];
-        $newShopIds = [];
-        if (!empty($hasRecentShop)) {
-            $newShopIds = json_decode($hasRecentShop, true);
+        $hasShopIds = isset($user->recentShop) && !empty($user->recentShop) ? json_decode($user->recentShop, true) : [];
+        if (in_array($shopId, $hasShopIds)) {
+            return false;
         }
-        $newShopIds = array_merge($newShopIds, [$lookShopId]);
+        $newShopIds = array_merge($hasShopIds, [$shopId]);
         $newShopIds = array_unique(array_filter($newShopIds));
-        self::updateById($userId, ['recentShop' => json_encode($newShopIds)]);
+        $user->recentShop = json_encode($newShopIds);
+        $user->save();
     }
 
     //组合客户基本和资产信息