Merge branch 'master' into dev

app-ghs/controllers/CustomController.php

@@ -147,7 +147,7 @@ class CustomController extends BaseController
         if (getenv('YII_ENV') == 'production') {
             //小向花卉
             if (in_array($this->shopId, [23580, 24713])) {
-                if (!in_array($this->adminId, [24043, 23960, 4, 77951, 77951])) {
+                if (!in_array($this->adminId, [23960,77951,4])) {
                     util::fail('不能销单哦！！');
                 }
             }

app-ghs/controllers/OrderClearController.php

@@ -151,7 +151,7 @@ class OrderClearController extends BaseController
         if (getenv('YII_ENV') == 'production') {
             //小向花卉
             if (in_array($this->shopId, [23580, 24713])) {
-                if (!in_array($this->adminId, [24043, 23960,77951])) {
+                if (!in_array($this->adminId, [23960,77951,4])) {
                     util::fail('不能销单哈！');
                 }
             }

app-ghs/controllers/OrderController.php

@@ -1088,7 +1088,7 @@ class OrderController extends BaseController
         }
 
         if (getenv('YII_ENV') == 'production') {
-            //小向花卉开单售后控制
+            //小向花卉开单权限
             if ($this->mainId == 23390) {
                 if (!in_array($this->adminId, [24043, 24585, 24586, 24654, 24115, 23960, 28456, 31105, 28456, 31105, 52528, 25011, 61449, 77951, 24655])) {
                     util::fail('你不能开单哦');

app-ghs/controllers/PurchaseOrderController.php

@@ -570,7 +570,7 @@ class PurchaseOrderController extends BaseController
                 }
 
                 if ($globalCgMyCharge == 1) {
-                    if (isset($needCgList[$productId]) == false) {
+                    if (!isset($needCgList[$productId])) {
                         util::fail($name . ' 不需要采购');
                     }
                     $needNum = $needCgList[$productId];

app-ghs/controllers/RefundController.php

@@ -134,9 +134,9 @@ class RefundController extends BaseController
 
         //多处要同步修改ghs_refund ssh 20250331
         if (getenv('YII_ENV') == 'production') {
-            //小向花卉开单售后控制
+            //小向花卉售后权限
             if ($this->mainId == 23390) {
-                if (!in_array($this->adminId, [24043, 24585, 24586, 24654, 24115, 23960,77951])) {
+                if (!in_array($this->adminId, [23960,77951,4])) {
                     util::fail('你不能售后哦');
                 }
                 //小向花卉售后必须备注
@@ -228,9 +228,9 @@ class RefundController extends BaseController
 
         //多处要同步修改ghs_refund ssh 20250331
         if (getenv('YII_ENV') == 'production') {
-            //小向花卉开单售后控制
+            //小向花卉售后权限
             if ($this->mainId == 23390) {
-                if (!in_array($this->adminId, [24043, 24585, 24586, 24654, 24115, 23960,77951])) {
+                if (!in_array($this->adminId, [23960,77951,4])) {
                     util::fail('你不能售后哦。。');
                 }
                 //小向花卉售后必须备注
@@ -614,9 +614,9 @@ class RefundController extends BaseController
 
         //多处要同步修改ghs_refund ssh 20250331
         if (getenv('YII_ENV') == 'production') {
-            //小向花卉开单售后控制
+            //小向花卉售后权限
             if ($this->mainId == 23390) {
-                if (!in_array($this->adminId, [24043, 24585, 24586, 24654, 24115, 23960,77951])) {
+                if (!in_array($this->adminId, [23960,77951,4])) {
                     util::fail('你不能售后哈。。');
                 }
                 //小向花卉售后必须备注