花店

app-ghs/controllers/AuthController.php

@@ -571,7 +571,7 @@ class AuthController extends PublicController
             util::fail('您没有权限哦');
         }
         if ($shopAdmin->status == 0) {
-            util::fail("您的账号已冻结");
+            util::fail("您的账号已被冻结");
         }
         $token = jwt::getNewToken($adminId);
         $shopAdminId = $shopAdmin->id ?? 0;

app-hd/controllers/AdminController.php

@@ -55,7 +55,7 @@ class AdminController extends BaseController
             util::fail('没有权限操作');
         }
         if (!empty($shopAdmin) && $shopAdmin->status == 0) {
-            util::fail("您的账号已冻结");
+            util::fail("您的账号已被冻结");
         }
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
         $shopAdmin->save();

app-hd/controllers/AuthController.php

@@ -92,7 +92,7 @@ class AuthController extends PublicController
             util::fail('没有权限操作');
         }
         if ($shopAdmin->status == 0) {
-            util::fail("您的账号已冻结");
+            util::fail("您的账号已被冻结");
         }
         $token = jwt::getNewToken($adminId);
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
@@ -171,7 +171,7 @@ class AuthController extends PublicController
             util::fail('没有权限操作');
         }
         if ($shopAdmin->status == 0) {
-            util::fail("您的账号已冻结");
+            util::fail("您的账号已被冻结");
         }
         if ($shopAdmin->delStatus == 1) {
             util::fail("您的账号已删除");
@@ -267,7 +267,7 @@ class AuthController extends PublicController
             util::fail('没有权限操作');
         }
         if ($shopAdmin->status == 0) {
-            util::fail("您的账号已冻结");
+            util::fail("您的账号已被冻结");
         }
         if ($shopAdmin->delStatus == 1) {
             util::fail("您的账号已删除");

app-mall/controllers/CategoryController.php

@@ -2,6 +2,7 @@
 
 namespace mall\controllers;
 
+use bizHd\custom\classes\CustomClass;
 use bizMall\goods\services\CategoryService;
 use bizMall\goods\services\GoodsCategoryService;
 use bizMall\user\classes\UserClass;
@@ -15,8 +16,8 @@ class CategoryController extends BaseController
     //获取分类 ssh 2019.12.2
     public function actionList()
     {
-        //添加最近访问的门店
-        UserClass::addRecentShop($this->shopId, $this->user);
+
+        CustomClass::buildRelation($this->shop, $this->user);
 
         $return = CategoryService::getEnableList($this->mainId);
         util::success($return);

app-mall/controllers/CustomController.php

@@ -9,11 +9,4 @@ use common\components\util;
 class CustomController extends BaseController
 {
 
-    public $guestAccess = ['init-custom'];
-
-    //生成客户信息 ssh 2021.5.1
-    public function actionInitCustom()
-    {
-    }
-
 }

app-mall/controllers/HdController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace mall\controllers;
+
+use bizHd\custom\classes\CustomClass;
+use bizHd\custom\classes\HdClass;
+use common\components\httpUtil;
+use common\components\util;
+
+class HdController extends BaseController
+{
+
+    public function actionList()
+    {
+        $where = [];
+        $where['ownShopId'] = $this->shopId;
+        $respond = HdClass::getHdList($where);
+
+        $showGlInfo = getenv('SHOW_GL_INFO');
+        $info = $showGlInfo === false ? 1 : $showGlInfo;
+        $respond['showGlInfo'] = $info;
+
+        util::success($respond);
+    }
+
+}

app-mall/controllers/ItemController.php

@@ -5,6 +5,7 @@ namespace mall\controllers;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\product\services\ProductService;
+use bizHd\custom\classes\CustomClass;
 use bizMall\user\classes\UserClass;
 use common\components\util;
 use Yii;
@@ -43,8 +44,7 @@ class ItemController extends BaseController
 
         $data = ProductService::assembleData($classIds, $itemInfoData, true);
 
-        //添加最近访问的门店
-        UserClass::addRecentShop($this->shopId, $this->user);
+        CustomClass::buildRelation($this->shop, $this->user);
 
         util::success($data);
     }

app-mall/controllers/ShopController.php

@@ -33,15 +33,6 @@ class ShopController extends BaseController
         util::success(['info' => $info]);
     }
 
-    //最新店铺 ssh 20220506
-    public function actionGetNewShop()
-    {
-        $list = UserClass::getRecentShop($this->user);
-        $showGlInfo = getenv('SHOW_GL_INFO');
-        $info = $showGlInfo === false ? 1 : $showGlInfo;
-        util::success(['list' => $list, 'showGlInfo' => $info]);
-    }
-
     //获取商家的默认门店 ssh 2019.12.6
     public function actionDetail()
     {

app-mall/controllers/UserController.php

@@ -23,10 +23,8 @@ class UserController extends BaseController
         $post = Yii::$app->request->post();
         $user = UserClass::replaceUser($post);
         if (isset($this->shop) && !empty($this->shop)) {
-            //增加商家的客户
-            CustomClass::replaceCustom($this->shop, $user);
-            //增加用户的门店
-            UserClass::addRecentShop($this->shop->id, $user);
+            //花店增加客户，散客增加门店
+            CustomClass::buildRelation($this->shop, $user);
         }
         $userId = $user->id ?? 0;
         $token = !empty($userId) ? jwt::getNewToken($userId) : '';

biz-ghs/admin/classes/AdminClass.php

@@ -46,23 +46,6 @@ class AdminClass extends BaseClass
         return $arr;
     }
 
-    //最近访问的门店 ssh 2021.3.1
-    public static function addRecentShop($lookShopId, $admin)
-    {
-        if (empty($lookShopId)) {
-            return false;
-        }
-        $hasRecentShop = $admin['recentShop'];
-        $adminId = $admin['id'];
-        $newShopIds = [];
-        if (!empty($hasRecentShop)) {
-            $newShopIds = json_decode($hasRecentShop, true);
-        }
-        $newShopIds = array_merge($newShopIds, [$lookShopId]);
-        $newShopIds = array_unique(array_filter($newShopIds));
-        self::updateById($adminId, ['recentShop' => json_encode($newShopIds)]);
-    }
-
     //开店时初始化员工和角色
     public static function initAdmin($initData, $mainId, $shop)
     {

biz-hd/custom/classes/CustomClass.php

@@ -126,30 +126,53 @@ class CustomClass extends BaseClass
     }
 
     //创建或获取客户信息 ssh 2021.3.19
-    public static function replaceCustom($shop, $user)
+    public static function buildRelation($shop, $user)
     {
         $userId = $user->id;
         $name = $user->name ?? '';
         $mobile = $user->mobile ?? '';
         $shopId = $shop->id ?? 0;
+        $hdAvatar = $shop->avatar ?? '';
         $sjId = $shop->sjId ?? 0;
-        $info = self::getByCondition(['shopId' => $shopId, 'userId' => $userId]);
-        if (!empty($info)) {
-            return $info;
+        $sjName = $shop->merchantName ?? '';
+        $shopName = $shop->shopName ?? '';
+        $hdMobile = $shop->mobile ?? '';
+        $hdName = $shop->default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $hdPy = stringUtil::py($hdName);
+        $custom = self::getByCondition(['shopId' => $shopId, 'userId' => $userId], true);
+        if (empty($custom)) {
+            $py = stringUtil::py($name);
+            $visitTime = date("Y-m-d H:i:s");
+            $data = [
+                'userId' => $userId,
+                'sjId' => $sjId,
+                'shopId' => $shopId,
+                'name' => $name,
+                'py' => $py,
+                'mobile' => $mobile,
+                'visitTime' => $visitTime,
+            ];
+            $custom = self::addCustom($data);
         }
-        $py = stringUtil::py($name);
-        $visitTime = date("Y-m-d H:i:s");
-        $data = [
-            'userId' => $userId,
-            'sjId' => $sjId,
-            'shopId' => $shopId,
-            'name' => $name,
-            'py' => $py,
-            'mobile' => $mobile,
-            'visitTime' => $visitTime,
-        ];
-        $info = self::addCustom($data);
-        return $info;
+        $customId = $custom->id ?? 0;
+        $hd = HdClass::getByCondition(['shopId' => $shopId, 'userId' => $userId], true);
+        if (empty($hd)) {
+            $hdData = [
+                'shopId' => $shopId,
+                'userId' => $userId,
+                'name' => $hdName,
+                'sjId' => $sjId,
+                'customId' => $customId,
+                'avatar' => $hdAvatar,
+                'py' => $hdPy,
+                'mobile' => $hdMobile,
+            ];
+            $hd = HdClass::addData($hdData);
+        }
+        $hdId = $hd->id ?? 0;
+        $custom->hdId = $hdId;
+        $custom->save();
+        return ['custom' => $custom, 'hd' => $hd];
     }
 
     //获取客户信息

biz-hd/custom/classes/HdClass.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace bizHd\custom\classes;
+
+use common\components\imgUtil;
+use common\components\util;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class HdClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\custom\models\Hd';
+
+    public static function addData($data)
+    {
+        return self::add($data, true);
+    }
+
+    public static function getHdList($where)
+    {
+        $data = self::getList('*', $where, 'inTurn DESC,addTime DESC');
+        $data['list'] = self::groupBaseInfo($data['list']);
+        return $data;
+    }
+
+    public static function groupBaseInfo($list)
+    {
+        if (empty($list)) {
+            return $list;
+        }
+        foreach ($list as $key => $val) {
+            $shortAvatar = $val['avatar'] ?? '';
+            $smallAvatar = imgUtil::groupImg($shortAvatar) . "?x-oss-process=image/resize,m_fill,h_130,w_130";
+            $list[$key]['shortAvatar'] = $shortAvatar;
+            $list[$key]['smallAvatar'] = $smallAvatar;
+        }
+        return $list;
+    }
+
+}

biz-hd/custom/models/Hd.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizHd\custom\models;
+use bizHd\base\models\Base;
+
+class Hd extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhHd';
+	}
+
+}

biz-hd/merchant/services/SjService.php

@@ -144,7 +144,8 @@ class SjService extends BaseService
 
         //生成保存默认客户
         $user = UserClass::replaceUser(['mobile' => $mobile]);
-        $custom = CustomClass::replaceCustom($shopInfo, $user);
+        $result = CustomClass::buildRelation($shopInfo, $user);
+        $custom = $result['custom'];
         $customId = $custom->id ?? 0;
         $shopInfo->defaultCustomId = $customId;
         $shopInfo->save();

biz-mall/user/classes/UserClass.php

@@ -4,6 +4,7 @@ namespace bizMall\user\classes;
 
 use biz\shop\classes\ShopClass;
 use bizHd\custom\classes\CustomClass;
+use bizHd\custom\classes\HdClass;
 use bizMall\merchant\classes\MerchantAssetClass;
 use bizMall\merchant\classes\MerchantClass;
 use bizMall\merchant\services\MerchantService;
@@ -56,54 +57,6 @@ class UserClass extends BaseClass
         'system' => ['id' => 5, 'name' => 'system'],
     ];
 
-    //最近访问的门店 ssh 20220916
-    public static function getRecentShop($user)
-    {
-        if (empty($user)) {
-            return [];
-        }
-        $recent = $user->recentShop;
-        $default = [36524];
-        if (getenv('YII_ENV') == 'production') {
-            $default = [2];
-        }
-        $ids = !empty($recent) ? json_decode($recent, true) : $default;
-        $list = ShopClass::getByIds($ids);
-        if (!empty($list)) {
-            foreach ($list as $key => $val) {
-                $shopName = $val['shopName'] ?? '';
-                $sjName = $val['merchantName'] ?? '';
-                $default = $val['default'] ?? 0;
-                $showName = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
-                $list[$key]['showName'] = $showName;
-                $shortAvatar = $val['avatar'] ?? '';
-                $smallAvatar = imgUtil::groupImg($shortAvatar) . "?x-oss-process=image/resize,m_fill,h_130,w_130";
-                $list[$key]['shortAvatar'] = $shortAvatar;
-                $list[$key]['smallAvatar'] = $smallAvatar;
-            }
-        }
-        return $list;
-    }
-
-    //添加最近访问的门店 ssh 20220916
-    public static function addRecentShop($shopId, $user)
-    {
-        if (empty($shopId)) {
-            return false;
-        }
-        if (isset($user) == false || empty($user)) {
-            return false;
-        }
-        $hasShopIds = isset($user->recentShop) && !empty($user->recentShop) ? json_decode($user->recentShop, true) : [];
-        if (in_array($shopId, $hasShopIds)) {
-            return false;
-        }
-        $newShopIds = array_merge($hasShopIds, [$shopId]);
-        $newShopIds = array_unique(array_filter($newShopIds));
-        $user->recentShop = json_encode($newShopIds);
-        $user->save();
-    }
-
     //组合客户基本和资产信息
     public static function groupUserBaseInfo($list)
     {