批发端 电脑端页面

app-ghs/controllers/ShopAdminController.php

@@ -3,16 +3,12 @@
 namespace ghs\controllers;
 
 use bizHd\wx\classes\WxOpenClass;
-use bizGhs\admin\classes\AdminClass;
 use bizGhs\shop\classes\ShopAdminClass;
 use bizGhs\admin\services\AdminRoleService;
 use bizGhs\shop\services\ShopAdminService;
-use bizHd\wx\services\WxOpenService;
 use common\components\imgUtil;
-use common\components\jwt;
 use common\components\util;
 use Yii;
-use yii\web\Controller;
 
 class ShopAdminController extends BaseController
 {
@@ -57,7 +53,7 @@ class ShopAdminController extends BaseController
         if (empty($relation)) {
             util::fail('没有找到员工');
         }
-        ShopAdminClass::valid($relation->attributes, $this->sjId);
+        ShopAdminClass::valid($relation->attributes, $this->shopId);
         $relation->remind = $remind;
         $relation->save();
         util::complete();
@@ -73,7 +69,7 @@ class ShopAdminController extends BaseController
         if (empty($relation)) {
             util::fail('没有找到员工');
         }
-        ShopAdminClass::valid($relation->attributes, $this->sjId);
+        ShopAdminClass::valid($relation->attributes, $this->shopId);
         $relation->status = $status;
         $relation->save();
         util::complete();
@@ -131,7 +127,7 @@ class ShopAdminController extends BaseController
         if ($relation['super'] == 1) {
             //util::fail("管理员不能删除");
         }
-        ShopAdminClass::valid($relation, $this->sjId);
+        ShopAdminClass::valid($relation, $this->shopId);
         ShopAdminClass::delRelation($relation);
         util::complete();
     }

biz-ghs/shop/services/ShopAdminService.php

@@ -109,12 +109,6 @@ class ShopAdminService extends BaseService
             $roleId = $val['roleId'];
             $roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
             $list[$key]['roleName'] = $roleName;
-            //帐号状态
-            $status = 1;
-            if (isset($val['status']) && $val['status'] == 0) {
-                $status = 0;
-            }
-            $list[$key]['status'] = $status;
             $avatar = $prefix . 'hhb_small.png';
             if (isset($val['avatar']) && !empty($val['avatar'])) {
                 $avatar = $prefix . $val['avatar'];

sql.sql

@@ -1952,3 +1952,6 @@ ALTER TABLE `xhGhsProduct`
 ADD COLUMN `cost`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '成本价' AFTER `adminId`,
 ADD COLUMN `addPrice`  decimal(9,1) NOT NULL DEFAULT 0 COMMENT '每扎加价' AFTER `cost`;
 
+
+=====shish 2021-4-7
+UPDATE `xhPtItem` SET ratio = 1 WHERE ratio=0;