门店休息

biz-hd/admin/classes/AdminClass.php

@@ -35,9 +35,15 @@ class AdminClass extends BaseClass
         $shopId = $shop->id ?? 0;
         $mobile = $initData['mobile'] ?? 0;
         $adminId = $initData['adminId'] ?? 0;
-        AdminRoleClass::addAdminRole(['roleName' => '员工', 'mainId' => $mainId, 'auth' => '']);
-        $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '店长', 'num' => 1, 'mainId' => $mainId, 'auth' => '*']);
-        $roleId = $roleReturn['id'];
+        $hasRole = AdminRoleClass::getByCondition(['mainId' => $mainId], true);
+        if (empty($hasRole)) {
+            AdminRoleClass::addAdminRole(['roleName' => '员工', 'mainId' => $mainId, 'auth' => '']);
+            $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '店长', 'num' => 1, 'mainId' => $mainId, 'auth' => '*']);
+            $roleId = $roleReturn['id'];
+        } else {
+            $roleId = $hasRole->id ?? 0;
+        }
+
         $admin = \biz\admin\classes\AdminClass::getById($adminId, true);
         if (empty($admin)) {
             util::fail('没有找到管理员信息');
@@ -45,7 +51,7 @@ class AdminClass extends BaseClass
         $admin->openShop = 3;
         $admin->currentShopId = $shopId;
         $admin->save();
-		//避免出现同样的员工
+        //批发端已经生成员工，避免出现重复的员工
         $staff = ShopAdminClass::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
         if (empty($staff)) {
             $avatar = $admin->avatar;

biz/ghs/classes/GhsClass.php

@@ -160,8 +160,8 @@ class GhsClass extends BaseClass
         if (empty($list)) {
             return $list;
         }
-        $shopIds = array_column($list, 'shopId');
-        $shopInfo = ShopClass::getByIds($shopIds, null, 'id');
+        $ids = array_column($list, 'shopId');
+        $shopInfo = ShopClass::getByIds($ids, null, 'id');
         foreach ($list as $key => $val) {
             $avatar = $val['avatar'] ?? '';
             $list[$key]['avatar'] = imgUtil::groupImg($avatar);
@@ -177,6 +177,9 @@ class GhsClass extends BaseClass
             $list[$key]['tjFlAmount'] = $tjFlAmount;
             $list[$key]['miniKilo'] = $shopInfo[$currentShopId]['miniKilo'] ?? 0;
             $list[$key]['kiloFee'] = $shopInfo[$currentShopId]['kiloFee'] ?? 0;
+            $isOpen = ShopClass::isOpen($shopInfo[$currentShopId]);
+            //营业状态
+            $list[$key]['isOpen'] = $isOpen;
         }
         return $list;
     }

biz/shop/classes/ShopClass.php

@@ -27,6 +27,26 @@ class ShopClass extends BaseClass
 
     public static $baseFile = '\biz\shop\models\Shop';
 
+    //营业状态
+    public static function isOpen($shop)
+    {
+        if (isset($shop['open']) == false || $shop['open'] == 0) {
+            return 0;
+        }
+        $openStartTime = $shop['openStartTime'] ?? '';
+        if (empty($openStartTime)) {
+            return 1;
+        }
+        $openEndTime = $shop['openEndTime'] ?? '';
+        $start = strtotime(date("Y-m-d") . ' ' . $openStartTime);
+        $end = strtotime(date("Y-m-d") . ' ' . $openEndTime);
+        $time = time();
+        if ($time > $start && $time < $end) {
+            return 1;
+        }
+        return 0;
+    }
+
     //获取图片信息 ssh 2021.3.14
     public static function getShopInfo($id)
     {