Merge branch 'master' into dev

app-ghs/controllers/AdminController.php

@@ -373,7 +373,11 @@ class AdminController extends BaseController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($this->shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;

app-ghs/controllers/AuthController.php

@@ -190,7 +190,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;
@@ -321,7 +325,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;
@@ -597,7 +605,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;
@@ -707,7 +719,11 @@ class AuthController extends PublicController
 
         $ghsUpgrading = getenv('GHS_UPGRADING') == false ? 0 : getenv('GHS_UPGRADING');
         if ($ghsUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('GHS_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $lookAllShop = 0;

app-ghs/controllers/TestController.php

@@ -1478,7 +1478,13 @@ class TestController extends BaseController
         $simulateKey = 'simulate_admin_id';
         if ($id == 0) {
             Yii::$app->redis->executeCommand('DEL', [$simulateKey]);
-            util::stop('已将石少华账号清空');
+
+            $sql = 'UPDATE xhGhsDevice SET `status`=0 WHERE adminId=4;;';
+            Yii::$app->db->createCommand($sql)->execute();
+            $sql = 'UPDATE xhHdDevice SET `status`=0 WHERE adminId=4;';
+            Yii::$app->db->createCommand($sql)->execute();
+
+            util::stop('已将石少华账号清空，app通知也清空了。');
         }
         $admin = AdminClass::getById($id, true);
         if (empty($admin)) {

app-hd/controllers/AdminController.php

@@ -166,7 +166,11 @@ class AdminController extends BaseController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];

app-hd/controllers/ApplyController.php

@@ -260,7 +260,11 @@ class ApplyController extends BaseController
 
             $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
             if ($hdUpgrading == 1) {
-                util::fail('系统升级中，稍后再试');
+                $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+                $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+                if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                    util::fail('系统升级中，稍后再试');
+                }
             }
             $transaction->commit();
             //noticeUtil::push("花店 {$shopName} 手机号 {$mobile} 注册", '15280215347');

app-hd/controllers/AuthController.php

@@ -189,7 +189,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -291,7 +295,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -416,7 +424,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -607,6 +619,7 @@ class AuthController extends PublicController
         $token = jwt::getNewToken($adminId);
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
         $shopAdmin->save();
+        $shopAdminId = $shopAdmin->id ?? 0;
 
         //是否有切换门店的权限
         $switchShop = \biz\shop\classes\ShopAdminClass::hasSwitchShopRight($shopAdmin);
@@ -616,7 +629,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];
@@ -717,7 +734,11 @@ class AuthController extends PublicController
 
         $hdUpgrading = getenv('HD_UPGRADING') == false ? 0 : getenv('HD_UPGRADING');
         if ($hdUpgrading == 1) {
-            util::fail('系统升级中，稍后再试');
+            $allowShopAdminIdsStr = getenv('HD_UPGRADE_ALLOW_SHOP_ADMIN_IDS') ?: '';
+            $allowShopAdminIds = !empty($allowShopAdminIdsStr) ? explode(',', $allowShopAdminIdsStr) : [];
+            if (!in_array($shopAdminId, $allowShopAdminIds)) {
+                util::fail('系统升级中，稍后再试');
+            }
         }
 
         $apiHost = Yii::$app->params['hdHost'];

biz/ghs/classes/GhsClass.php

@@ -460,8 +460,8 @@ class GhsClass extends BaseClass
             return false;
         }
 
-        //要排除的批发店
-        $exclude = [23667, 78556, 64112, 795, 1405, 28051, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167, 15007, 88085, 91064, 413, 62421];
+        //要排除的批发店,填门店id
+        $exclude = [95258, 23667, 78556, 64112, 795, 1405, 28051, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167, 15007, 88085, 91064, 413, 62421];
         foreach ($nearbyShops as $key => $nearbyShop) {
             if (in_array($nearbyShop['id'], $exclude)) {
                 unset($nearbyShops[$key]);
@@ -572,4 +572,4 @@ class GhsClass extends BaseClass
         }
         return true;
     }
-}
+}