shish 3 år sedan
förälder
incheckning
6a6798ab71

+ 5 - 0
app-ghs/controllers/AdminController.php

@@ -2,6 +2,7 @@
 
 namespace ghs\controllers;
 
+use bizGhs\item\classes\LabelClass;
 use bizGhs\shop\classes\ShopAdminClass;
 use bizHd\wx\classes\WxOpenClass;
 use bizGhs\admin\classes\AdminClass;
@@ -303,6 +304,7 @@ class AdminController extends BaseController
         $openShop = $admin['openGhsShop'] ?? 1;
         $showDemo = 1;
         $skCustomId = $this->shop->skCustomId ?? 0;
+        $mainId = $this->shop->mainId ?? 0;
         $apiHost = Yii::$app->params['ghsHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
         //使用手册
@@ -334,6 +336,8 @@ class AdminController extends BaseController
             $this->shopAdmin->super = 0;
         }
 
+        $labelList = LabelClass::getMyUnUseLabelList($mainId);
+
         util::success([
             'token' => '',
             'admin' => $admin,
@@ -351,6 +355,7 @@ class AdminController extends BaseController
             'hasHitNavigate' => $hasHitNavigate,
             'staff' => $this->shopAdmin,
             'lookAllShop' => $lookAllShop,
+            'labelList' => $labelList,
         ]);
     }
 

+ 14 - 0
app-ghs/controllers/AuthController.php

@@ -5,6 +5,7 @@ namespace ghs\controllers;
 use biz\admin\classes\AdminClass;
 use biz\pt\classes\AgreementClass;
 use biz\shop\classes\ShopClass;
+use bizGhs\item\classes\LabelClass;
 use bizHd\admin\classes\ShopAdminClass;
 use bizGhs\shop\services\ShopAdminService;
 use bizGhs\admin\services\AdminService;
@@ -137,6 +138,8 @@ class AuthController extends PublicController
             $shopAdmin->super = 0;
         }
 
+        $labelList = LabelClass::getMyUnUseLabelList($mainId);
+
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
             'token' => $token,
@@ -155,6 +158,7 @@ class AuthController extends PublicController
             'hasHitNavigate' => $hasHitNavigate,
             'staff' => $shopAdmin,
             'lookAllShop' => $lookAllShop,
+            'labelList' => $labelList,
         ]);
     }
 
@@ -264,6 +268,8 @@ class AuthController extends PublicController
             $shopAdmin->super = 0;
         }
 
+        $labelList = LabelClass::getMyUnUseLabelList($mainId);
+
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
             'token' => $token,
@@ -282,6 +288,7 @@ class AuthController extends PublicController
             'hasHitNavigate' => $hasHitNavigate,
             'staff' => $shopAdmin,
             'lookAllShop' => $lookAllShop,
+            'labelList' => $labelList,
         ]);
 
         util::success(['admin' => $admin]);
@@ -490,6 +497,7 @@ class AuthController extends PublicController
         $remind = getenv('GHS_UPDATE_REMIND') == false ? 0 : getenv('GHS_UPDATE_REMIND');
         $shop = ShopClass::getById($currentShopId, true);
         $skCustomId = $shop->skCustomId ?? 0;
+        $mainId = $shop->mainId ?? 0;
         $apiHost = Yii::$app->params['ghsHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
 
@@ -521,6 +529,8 @@ class AuthController extends PublicController
             $shopAdmin->super = 0;
         }
 
+        $labelList = LabelClass::getMyUnUseLabelList($mainId);
+
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
             'token' => $token,
@@ -539,6 +549,7 @@ class AuthController extends PublicController
             'hasHitNavigate' => $hasHitNavigate,
             'staff' => $shopAdmin,
             'lookAllShop' => $lookAllShop,
+            'labelList' => $labelList,
         ]);
     }
 
@@ -624,6 +635,8 @@ class AuthController extends PublicController
             $shopAdmin->super = 0;
         }
 
+        $labelList = LabelClass::getMyUnUseLabelList($mainId);
+
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
             'token' => $token,
@@ -642,6 +655,7 @@ class AuthController extends PublicController
             'hasHitNavigate' => $hasHitNavigate,
             'staff' => $shopAdmin,
             'lookAllShop' => $lookAllShop,
+            'labelList' => $labelList,
         ]);
     }
 

+ 20 - 0
app-ghs/controllers/LabelController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace ghs\controllers;
+
+use bizGhs\item\classes\LabelClass;
+use common\components\util;
+use Yii;
+
+class LabelController extends BaseController
+{
+
+    //获取我没有使用的电子标 ssh 20230817
+    public function actionGetMyLabelList()
+    {
+        $mainId = $this->mainId;
+        $list = LabelClass::getMyUnUseLabelList($mainId);
+        util::success(['list' => $list]);
+    }
+
+}

+ 19 - 0
biz-ghs/item/classes/LabelClass.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace bizGhs\item\classes;
+
+use bizGhs\base\classes\BaseClass;
+
+class LabelClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\item\models\label';
+
+    //获取没有使用的电子标 ssh 20230817
+    public static function getMyUnUseLabelList($mainId)
+    {
+        $list = self::getAllByCondition(['mainId' => $mainId, 'use' => 0], null, '*');
+        return $list;
+    }
+
+}

+ 11 - 0
biz-ghs/item/models/Label.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace bizGhs\item\models;
+use bizGhs\base\models\Base;
+class Label extends Base
+{
+    public static function tableName()
+    {
+        return 'xhLabel';
+    }
+}

+ 14 - 0
biz-ghs/item/services/LabelService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace bizGhs\item\services;
+
+use bizGhs\base\services\BaseService;
+use Yii;
+
+
+class LabelService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\item\classes\LabelClass';
+
+}