名称调整

app-ghs/controllers/ApplyController.php

@@ -41,7 +41,8 @@ class ApplyController extends BaseController
     {
         $post = Yii::$app->request->post();
         $post['adminId'] = $this->adminId;
-        $post['adminName'] = $post['nickName'] ?? '';
+        $admin = $this->admin;
+        $post['adminName'] = $admin['name'] ?? '';
         $post['long'] = isset($post['longitude']) ? $post['longitude'] : '';
         $post['lat'] = isset($post['latitude']) ? $post['latitude'] : '';
         $post['from'] = ApplyClass::FROM_GHS;

app-ghs/controllers/MainController.php

@@ -120,7 +120,7 @@ class MainController extends BaseController
         $shopImg = $shop['avatar'] ?? '';
         $deadline = $sj['deadline'] ?? '';
         $relation = $this->shopAdmin;
-        $adminName = $relation['adminName'];
+        $adminName = $relation['name'];
         $shopAdminId = $relation['id'];
         $mobile = $relation['mobile'] ?? '';
         $sjName = $sj['name'] ?? '';

app-ghs/controllers/OrderController.php

@@ -88,7 +88,7 @@ class OrderController extends BaseController
 
         $post['shopAdminId'] = $this->shopAdminId;
         $shopAdmin = $this->shopAdmin;
-        $post['shopAdminName'] = $shopAdmin['adminName'] ?? '';
+        $post['shopAdminName'] = $shopAdmin['name'] ?? '';
         $post['shopId'] = $shopId;
         $post['payWay'] = $this->isWx == true ? 0 : 1;
         $post['merchantId'] = $this->sjId;
@@ -361,7 +361,7 @@ class OrderController extends BaseController
         $fromType = $post['fromType'] ?? 1;
         $post['userId'] = $this->adminId;
         $admin = $this->admin;
-        $post['bookName'] = isset($admin['adminName']) ? $admin['adminName'] : '';
+        $post['bookName'] = isset($admin['name']) ? $admin['name'] : '';
         $bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
         $bookMobile = empty($bookMobile) && isset($admin['mobile']) && !empty($admin['mobile']) ? $admin['mobile'] : $bookMobile;
         $post['bookMobile'] = $bookMobile;

app-hd/controllers/ApplyController.php

@@ -42,7 +42,8 @@ class ApplyController extends BaseController
     {
         $post = Yii::$app->request->post();
         $post['adminId'] = $this->adminId;
-        $post['adminName'] = $post['nickName'] ?? '';
+        $admin = $this->admin;
+        $post['adminName'] = $admin['name'] ?? '';
         $post['long'] = isset($post['longitude']) ? $post['longitude'] : '';
         $post['lat'] = isset($post['latitude']) ? $post['latitude'] : '';
         $post['from'] = ApplyClass::FROM_RETAIL;

app-hd/controllers/MainController.php

@@ -81,7 +81,7 @@ class MainController extends BaseController
         $shopImg = $shop['avatar'] ?? '';
         $deadline = $sj['deadline'] ?? '';
         $relation = $this->shopAdmin;
-        $adminName = $relation['adminName'];
+        $adminName = $relation['name'];
         $shopAdminId = $relation['id'];
         $mobile = $relation['mobile'] ?? '';
         $sjName = $sj['name'] ?? '';

biz-ghs/admin/classes/AdminClass.php

@@ -66,7 +66,6 @@ class AdminClass extends BaseClass
     {
         $mobile = $applyData['mobile'] ?? 0;
         $adminId = $applyData['adminId'] ?? 0;
-        $adminName = $applyData['adminName'] ?? '';
         //创建管理员角色
         $roleId = 0;
         $hasRole = AdminRoleClass::getByCondition(['merchantId' => $sjId]);
@@ -91,6 +90,7 @@ class AdminClass extends BaseClass
                 $admin->openShop = 3;
                 $admin->save();
                 $avatar = $admin->avatar;
+                $name = $admin->name;
                 $shopData = [
                     'adminId' => $adminId,
                     'shopId' => $shopId,
@@ -99,7 +99,7 @@ class AdminClass extends BaseClass
                     'roleId' => $roleId,
                     'default' => 1,
                     'avatar' => $avatar,
-                    'adminName' => $adminName,
+                    'name' => $name,
                     'super' => 1,
                     'founder' => 1,
                 ];
@@ -185,7 +185,7 @@ class AdminClass extends BaseClass
     public static function getAdminNameList($merchantId)
     {
         $list = self::getAdminList($merchantId);
-        return !empty($list) ? array_column($list, 'adminName') : [];
+        return !empty($list) ? array_column($list, 'name') : [];
     }
 
     //获取商家所有员工已经关联微信的userId
@@ -268,12 +268,6 @@ class AdminClass extends BaseClass
                 $admin = self::generateAdmin($adminInfo);
             }
         } else {
-            if (!empty($unionAdmin)) {
-                if (isset($unionAdmin['id']) && isset($admin['id']) && $admin['id'] != $unionAdmin['id']) {
-                    //合并相同管理员，小程序管理保留，其它删除
-                    $admin = self::mergeAdmin($unionAdmin, $admin);
-                }
-            }
             $admin = self::updateAdmin($admin, $adminInfo);
         }
         return $admin;
@@ -287,10 +281,10 @@ class AdminClass extends BaseClass
         //替换掉微信不支持的图片
         $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
         if (!empty($nickName)) {
-            $data['nickName'] = $nickName;
+            $data['name'] = $nickName;
         }
-        if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
-            $data['adminName'] = $nickName;
+        if (isset($originalAdmin['name']) && empty($originalAdmin['name'])) {
+            $data['name'] = $originalAdmin['name'];
         }
         if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
             $openId = $getAdminInfo['openId'];
@@ -340,8 +334,7 @@ class AdminClass extends BaseClass
         $time = time();
         //替换掉微信名称不支持的图片
         $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
-        $getAdminInfo['nickName'] = $nickName;
-        $getAdminInfo['adminName'] = $nickName;
+        $getAdminInfo['name'] = $nickName;
         $subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
         $getAdminInfo['subscribe'] = $subscribe;
         $getAdminInfo['avatar'] = '';
@@ -359,32 +352,10 @@ class AdminClass extends BaseClass
                 $getAdminInfo['avatar'] = $name;
             }
         }
-
         $admin = self::add($getAdminInfo);
-        $adminId = $admin['id'];
-        if (empty($nickName)) {
-            self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
-        }
         return $admin;
     }
 
-    //合并管理员
-    public static function mergeAdmin($delAdmin, $retainAdmin)
-    {
-        $connection = Yii::$app->db;//事务处理
-        $transaction = $connection->beginTransaction();
-        try {
-
-            $delAdminId = $delAdmin['id'];
-            $clearData = ['openId' => '', 'miniOpenId' => '', 'unionId' => ''];
-            self::updateById($delAdminId, $clearData);
-            $transaction->commit();
-        } catch (Exception $e) {
-            $transaction->rollBack();
-            return [];
-        }
-    }
-
     //找出相同unionId的用户
     public static function getSameUnionId($unionId)
     {

biz-ghs/admin/classes/AdminLogClass.php

@@ -11,21 +11,21 @@ use bizGhs\base\classes\BaseClass;
 
 class AdminLogClass extends BaseClass
 {
-	
-	public static $baseFile = '\bizGhs\admin\models\AdminLog';
-	
-	public static function groupBaseInfo($list)
-	{
-		$adminIdList = array_column($list, 'adminId');
-		$adminIdList = array_unique(array_filter($adminIdList));
-		$adminList = AdminClass::getByIds($adminIdList, null, 'id');
-		foreach ($list as $key => $val) {
-			$adminId = $val['adminId'];
-			$ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
-			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['adminName'] : '';
-			$list[$key]['ip'] = $ip;
-		}
-		return $list;
-	}
+
+    public static $baseFile = '\bizGhs\admin\models\AdminLog';
+
+    public static function groupBaseInfo($list)
+    {
+        $adminIdList = array_column($list, 'adminId');
+        $adminIdList = array_unique(array_filter($adminIdList));
+        $adminList = AdminClass::getByIds($adminIdList, null, 'id');
+        foreach ($list as $key => $val) {
+            $adminId = $val['adminId'];
+            $ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
+            $list[$key]['name'] = isset($adminList[$adminId]) ? $adminList[$adminId]['name'] : '';
+            $list[$key]['ip'] = $ip;
+        }
+        return $list;
+    }
 
 }

biz-ghs/merchant/services/MerchantService.php

@@ -111,7 +111,7 @@ class MerchantService extends BaseService
             $adminId = $val['adminId'];
             $merchantId = $val['id'];
             $setId = $val['setId'];
-            $val['adminName'] = isset($admin[$adminId]['adminName']) ? $admin[$adminId]['adminName'] : '';
+            $val['adminName'] = isset($admin[$adminId]['name']) ? $admin[$adminId]['name'] : '';
             $val['merchantAsset'] = isset($asset[$merchantId]) ? $asset[$merchantId] : [];
             $val['setMealName'] = isset($set[$setId]) ? $set[$setId]['name'] : '';
             $val['extend'] = isset($ext[$merchantId]) ? $ext[$merchantId] : [];

biz-ghs/order/classes/OrderClass.php

@@ -293,7 +293,7 @@ class OrderClass extends BaseClass
 
         foreach ($list as $key => $val) {
             $adminId = $val['adminId'] ?? 0;
-            $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
+            $list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
             $list[$key]['customAddress'] = $val['fullAddress'] ?? '';
             //显示列表页的操作按钮
             $list[$key]['buttonList'] = self::getShowButton($showButton, $isList, $val);

biz-ghs/order/traits/OrderTrait.php

@@ -30,8 +30,8 @@ trait OrderTrait
 		$adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
 		foreach ($list as $k => $val) {
 			$adminId = $val['adminId'] ?? 0;
-			$list[$k]['adminName'] = $adminInfo[$adminId]['adminName']??'';
-			$list[$k]['nickName'] = $adminInfo[$adminId]['nickName']??'';
+			$list[$k]['adminName'] = $adminInfo[$adminId]['name']??'';
+			$list[$k]['nickName'] = $adminInfo[$adminId]['name']??'';
 			$list[$k]['avatar'] = $adminInfo[$adminId]['avatar'] ?? '';
 		}
 		return $list;
@@ -42,8 +42,8 @@ trait OrderTrait
 	{
 		$adminId = $data['adminId']??0;
 		$adminInfo = AdminClass::getAdminById($adminId);
-		$data['adminName'] = $adminInfo['adminName']??'';
-		$data['nickName'] = $adminInfo['nickName']??'';
+		$data['adminName'] = $adminInfo['name']??'';
+		$data['nickName'] = $adminInfo['name']??'';
 		$data['avatar'] = $adminInfo['avatar']??'';
 		return $data;
 

biz-ghs/shop/services/ShopAdminService.php

@@ -59,7 +59,7 @@ class ShopAdminService extends BaseService
         if (!empty($shopAdmin)) {
             util::fail('您已经是员工');
         }
-        $adminName = isset($source['adminName']) ? $source['adminName'] : '';
+        $name = isset($source['name']) ? $source['name'] : '';
 
         $roleId = $source['roleId'] ?? 0;
         $role = AdminRoleClass::getById($roleId);
@@ -77,7 +77,7 @@ class ShopAdminService extends BaseService
         $status = isset($source['status']) ? $source['status'] : 0;
         $password = isset($source['password']) ? password_hash($source['password'], PASSWORD_BCRYPT) : '';
         $remark = isset($source['remark']) ? $source['remark'] : '';
-        $update = ['adminName' => $adminName, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark, 'currentShopId' => $shopId];
+        $update = ['name' => $name, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark, 'currentShopId' => $shopId];
         AdminClass::updateById($adminId, $update);
         $addData = [
             'adminId' => $adminId,
@@ -86,8 +86,9 @@ class ShopAdminService extends BaseService
             'remind' => $remind,
             'status' => $status,
             'merchantId' => $merchantId,
-            'adminName' => $adminName,
-            'mobile'=>$mobile,
+            'name' => $name,
+            'mobile' => $mobile,
+            'name'=>$name,
         ];
         ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
         return ShopAdminClass::add($addData);

biz-ghs/stat/classes/StatYjClass.php

@@ -35,11 +35,11 @@ class StatYjClass extends BaseClass
         $show = [];
         foreach ($admin as $key => $val) {
             $adminId = $val['id'];
-            $adminName = $val['adminName'] ?? '';
+            $name = $val['name'] ?? '';
             $amount = $arr[$adminId]['amount'] ?? 0.00;
             $num = $arr[$adminId]['num'] ?? 0;
             $show[] = [
-                'adminName' => $adminName,
+                'name' => $name,
                 'amount' => $amount,
                 'num' => $num,
                 'id' => $val['id'],

biz-hd/admin/classes/AdminClass.php

@@ -47,7 +47,6 @@ class AdminClass extends BaseClass
     {
         $adminId = $applyData['adminId'] ?? 0;
         $mobile = $applyData['mobile'] ?? 0;
-        $adminName = $applyData['adminName'] ?? '';
         //创建角色，角色区分暂时可以通过auth值为区分
         AdminRoleClass::addAdminRole(['roleName' => '员工', 'merchantId' => $sjId, 'auth' => '']);
         $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'num' => 1, 'auth' => '*']);
@@ -68,6 +67,7 @@ class AdminClass extends BaseClass
                 $admin->openShop = 3;
                 $admin->save();
                 $avatar = $admin->avatar;
+                $name = $admin->name;
                 $shopData = [
                     'adminId' => $adminId,
                     'shopId' => $shopId,
@@ -76,7 +76,7 @@ class AdminClass extends BaseClass
                     'roleId' => $roleId,
                     'default' => 1,
                     'avatar' => $avatar,
-                    'adminName' => $adminName,
+                    'name' => $name,
                     'super' => 1,
                     'founder' => 1,
                 ];
@@ -161,7 +161,7 @@ class AdminClass extends BaseClass
     public static function getAdminNameList($merchantId)
     {
         $list = self::getAdminList($merchantId);
-        return !empty($list) ? array_column($list, 'adminName') : [];
+        return !empty($list) ? array_column($list, 'name') : [];
     }
 
     //获取商家所有员工已经关联微信的userId
@@ -242,12 +242,6 @@ class AdminClass extends BaseClass
                 $admin = self::generateAdmin($adminInfo);
             }
         } else {
-            if (!empty($unionAdmin)) {
-                if (isset($unionAdmin['id']) && isset($admin['id']) && $admin['id'] != $unionAdmin['id']) {
-                    //合并相同管理员，小程序管理保留，其它删除
-                    $admin = self::mergeAdmin($unionAdmin, $admin);
-                }
-            }
             $admin = self::updateAdmin($admin, $adminInfo);
         }
         return $admin;
@@ -261,10 +255,10 @@ class AdminClass extends BaseClass
         //替换掉微信不支持的图片
         $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
         if (!empty($nickName)) {
-            $data['nickName'] = $nickName;
+            $data['name'] = $nickName;
         }
-        if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
-            $data['adminName'] = $nickName;
+        if (isset($originalAdmin['name']) && empty($originalAdmin['name'])) {
+            $data['name'] = $originalAdmin['name'];
         }
         if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
             $openId = $getAdminInfo['openId'];
@@ -314,8 +308,7 @@ class AdminClass extends BaseClass
         $time = time();
         //替换掉微信名称不支持的图片
         $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
-        $getAdminInfo['nickName'] = $nickName;
-        $getAdminInfo['adminName'] = $nickName;
+        $getAdminInfo['name'] = $nickName;
         $subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
         $getAdminInfo['subscribe'] = $subscribe;
         $getAdminInfo['avatar'] = '';
@@ -325,7 +318,6 @@ class AdminClass extends BaseClass
         $getAdminInfo['addTime'] = $time;
         $getAdminInfo['source'] = isset($getAdminInfo['source']) ? $getAdminInfo['source'] : 0;
         $getAdminInfo['hasSubscribe'] = 0;
-
         if (isset($getAdminInfo['headImgUrl']) && !empty($getAdminInfo['headImgUrl'])) {
             $imgUrl = $getAdminInfo['headImgUrl'];
             $name = ImageService::generateAvatar(0, $imgUrl);
@@ -333,33 +325,10 @@ class AdminClass extends BaseClass
                 $getAdminInfo['avatar'] = $name;
             }
         }
-
         $admin = self::add($getAdminInfo);
-        $adminId = $admin['id'];
-        if (empty($nickName)) {
-            self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
-        }
         return $admin;
     }
 
-    //合并管理员
-    public static function mergeAdmin($delAdmin, $retainAdmin)
-    {
-        $connection = Yii::$app->db;//事务处理
-        $transaction = $connection->beginTransaction();
-        try {
-
-            $delAdminId = $delAdmin['id'];
-            $clearData = ['openId' => '', 'miniOpenId' => '', 'unionId' => ''];
-            self::updateById($delAdminId, $clearData);
-
-            $transaction->commit();
-        } catch (Exception $e) {
-            $transaction->rollBack();
-            return [];
-        }
-    }
-
     //找出相同unionId的用户
     public static function getSameUnionId($unionId)
     {

biz-hd/admin/classes/AdminLogClass.php

@@ -2,30 +2,25 @@
 
 namespace bizHd\admin\classes;
 
-use bizHd\admin\services\AdminRoleService;
-use bizHd\user\classes\UserClass;
-use bizHd\user\services\UserService;
-use common\components\util;
-use Yii;
 use bizHd\base\classes\BaseClass;
 
 class AdminLogClass extends BaseClass
 {
-	
-	public static $baseFile = '\bizHd\admin\models\AdminLog';
-	
-	public static function groupBaseInfo($list)
-	{
-		$adminIdList = array_column($list, 'adminId');
-		$adminIdList = array_unique(array_filter($adminIdList));
-		$adminList = AdminClass::getByIds($adminIdList, null, 'id');
-		foreach ($list as $key => $val) {
-			$adminId = $val['adminId'];
-			$ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
-			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['adminName'] : '';
-			$list[$key]['ip'] = $ip;
-		}
-		return $list;
-	}
+
+    public static $baseFile = '\bizHd\admin\models\AdminLog';
+
+    public static function groupBaseInfo($list)
+    {
+        $adminIdList = array_column($list, 'adminId');
+        $adminIdList = array_unique(array_filter($adminIdList));
+        $adminList = AdminClass::getByIds($adminIdList, null, 'id');
+        foreach ($list as $key => $val) {
+            $adminId = $val['adminId'];
+            $ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
+            $list[$key]['name'] = isset($adminList[$adminId]) ? $adminList[$adminId]['name'] : '';
+            $list[$key]['ip'] = $ip;
+        }
+        return $list;
+    }
 
 }

biz-hd/admin/services/ShopAdminService.php

@@ -56,7 +56,7 @@ class ShopAdminService extends BaseService
         if (!empty($shopAdmin)) {
             util::fail('您已经是管理员了');
         }
-        $adminName = isset($bindData['adminName']) ? $bindData['adminName'] : '';
+        $name = isset($bindData['name']) ? $bindData['name'] : '';
         if (isset($bindData['roleId']) == false || empty($bindData['roleId'])) {
             util::fail('添加管理员时请选择角色');
         }
@@ -72,7 +72,7 @@ class ShopAdminService extends BaseService
         $status = isset($bindData['status']) ? $bindData['status'] : 0;
         $password = isset($bindData['password']) ? password_hash($bindData['password'], PASSWORD_BCRYPT) : '';
         $remark = isset($bindData['remark']) ? $bindData['remark'] : '';
-        $update = ['adminName' => $adminName, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark, 'currentShopId' => $shopId];
+        $update = ['name' => $name, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark, 'currentShopId' => $shopId];
         AdminClass::updateById($adminId, $update);
         $addData = [
             'adminId' => $adminId,
@@ -81,7 +81,7 @@ class ShopAdminService extends BaseService
             'remind' => $remind,
             'status' => $status,
             'merchantId' => $merchantId,
-            'adminName' => $adminName,
+            'name' => $name,
             'mobile' => $mobile,
         ];
         ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);

biz-hd/purchase/classes/PurchaseClass.php

@@ -91,7 +91,7 @@ class PurchaseClass extends BaseClass
         foreach ($list as $key => $val) {
 
             $adminId = $val['adminId'] ?? 0;
-            $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
+            $list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
 
             $supplierId = $val['supplierId'] ?? 0;
             $list[$key]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';

biz-hd/purchase/services/PurchaseService.php

@@ -46,7 +46,7 @@ class PurchaseService extends BaseService
             $list[$key]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';
             $list[$key]['supplierAvatar'] = $supplierInfo[$supplierId]['logoUrl'] ?? imgUtil::getPrefix() . '/hhb_small.png';
             $adminId = $val['adminId'] ?? 0;
-            $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
+            $list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
             $list[$key]['status'] = rand(1, 4);
         }
         return $list;

biz-hd/saas/services/ApplyService.php

@@ -70,11 +70,7 @@ class ApplyService extends BaseService
         }
         $applyId = $apply['id'];
         ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);
-
-        $adminId = $apply['adminId'];
-        $admin = AdminClass::getById($adminId);
         $apply['name'] = isset($apply['name']) ? $apply['name'] : '';
-        $apply['adminName'] = $admin['adminName'] ?? '';
         //初始化商家信息
         $respond = MerchantService::initSjInfo($apply);
 

biz-hd/user/classes/UserClass.php

@@ -107,9 +107,7 @@ class UserClass extends BaseClass
         $time = time();
         //替换掉微信名称不支持的图片
         $userName = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
-        $getUserInfo['userName'] = $userName;
-        $getUserInfo['nickName'] = $userName;
-        $getUserInfo['realName'] = isset($getUserInfo['realName']) && !empty($getUserInfo['realName']) ? $getUserInfo['realName'] : '';
+        $getUserInfo['name'] = $userName;
         $getUserInfo['sex'] = isset($getUserInfo['sex']) ? $getUserInfo['sex'] : 0;//未知
         $getUserInfo['identity'] = 0;
         $subscribe = isset($getUserInfo['subscribe']) ? $getUserInfo['subscribe'] : 0;
@@ -131,9 +129,6 @@ class UserClass extends BaseClass
         //生成用户基础信息
         $user = self::add($getUserInfo);
         $userId = $user['id'];
-        if (empty($user['userName'])) {
-            self::updateById($userId, ['userName' => $userId, 'nickName' => $userId]);
-        }
 
         $assetData = ['userId' => $userId, 'merchantId' => $merchantId, 'createTime' => $date];
         //生成用户资产信息
@@ -162,8 +157,7 @@ class UserClass extends BaseClass
         //替换掉微信不支持的图片
         $userName = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
         if (!empty($userName)) {
-            $data['userName'] = $userName;
-            $data['nickName'] = $userName;
+            $data['name'] = $userName;
         }
         if (isset($getUserInfo['openId']) && !empty($getUserInfo['openId'])) {
             $openId = $getUserInfo['openId'];

biz-mall/admin/classes/AdminClass.php

@@ -95,7 +95,7 @@ class AdminClass extends BaseClass
     public static function getAdminNameList($merchantId)
     {
         $list = self::getAdminList($merchantId);
-        return !empty($list) ? array_column($list, 'adminName') : [];
+        return !empty($list) ? array_column($list, 'name') : [];
     }
 
     //获取商家所有员工已经关联微信的userId
@@ -195,10 +195,10 @@ class AdminClass extends BaseClass
         //替换掉微信不支持的图片
         $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
         if (!empty($nickName)) {
-            $data['nickName'] = $nickName;
+            $data['name'] = $nickName;
         }
-        if (isset($originalAdmin['adminName']) && empty($originalAdmin['adminName'])) {
-            $data['adminName'] = $nickName;
+        if (isset($originalAdmin['name']) && empty($originalAdmin['name'])) {
+            $data['name'] = $originalAdmin['name'];
         }
         if (isset($getAdminInfo['openId']) && !empty($getAdminInfo['openId'])) {
             $openId = $getAdminInfo['openId'];
@@ -249,7 +249,7 @@ class AdminClass extends BaseClass
         //替换掉微信名称不支持的图片
         $nickName = isset($getAdminInfo['nickName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getAdminInfo['nickName']) : '';
         $getAdminInfo['nickName'] = $nickName;
-        $getAdminInfo['adminName'] = $nickName;
+        $getAdminInfo['name'] = $nickName;
         $subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
         $getAdminInfo['subscribe'] = $subscribe;
         $getAdminInfo['avatar'] = '';
@@ -269,10 +269,6 @@ class AdminClass extends BaseClass
         }
 
         $admin = self::add($getAdminInfo);
-        $adminId = $admin['id'];
-        if (empty($nickName)) {
-            self::updateById($adminId, ['adminName' => $adminId, 'nickName' => $adminId]);
-        }
         return $admin;
     }
 

biz-mall/admin/classes/AdminLogClass.php

@@ -22,7 +22,7 @@ class AdminLogClass extends BaseClass
 		foreach ($list as $key => $val) {
 			$adminId = $val['adminId'];
 			$ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
-			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['adminName'] : '';
+			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['name'] : '';
 			$list[$key]['ip'] = $ip;
 		}
 		return $list;

biz-mall/admin/services/ShopAdminService.php

@@ -20,124 +20,125 @@ use Yii;
 
 class ShopAdminService extends BaseService
 {
-	
-	public static $baseFile = '\bizMall\admin\classes\ShopAdminClass';
-	
-	///创建管理员生成小程序 ssh 2020.4.17
-	public static function prepareBindAdmin($data)
-	{
-		ShopAdminClass::prepareBindAdmin($data);
-		$page = 'admin/shopAdmin/bind';
-		$isOpen = 1;
-		$adminId = $data['adminId'];
-		$shopId = $data['shopId'];
-		$scene = 'adminId=' . $adminId . '&shopId=' . $shopId;
-		$merchant = $data['merchant'];
-		$imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
-		return ['miniCode' => $imgUrl];
-	}
-	
-	public static function generateAdmin($data)
-	{
-		$recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;
-		$mobile = isset($data['mobile']) ? $data['mobile'] : '';
-		$shopId = isset($data['shopId']) ? $data['shopId'] : 0;
-		$adminId = isset($data['adminId']) ? $data['adminId'] : 0;
-		$bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
-		$shop = ShopClass::getById($shopId);
-		if (empty($shop)) {
-			util::fail('没有找到门店');
-		}
-		$merchantId = isset($shop['merchantId']) ? $shop['merchantId'] : 0;
-		if (empty($bindData)) {
-			util::fail('小程序码已经失效，请重新创建员工');
-		}
-		$shopAdmin = ShopAdminClass::getByCondition(['adminId' => $adminId, 'shopId' => $shopId]);
-		if (!empty($shopAdmin)) {
-			util::fail('您已经是管理员了');
-		}
-		$adminName = isset($bindData['adminName']) ? $bindData['adminName'] : '';
-		if (isset($bindData['roleId']) == false || empty($bindData['roleId'])) {
-			util::fail('添加管理员时请选择角色');
-		}
-		$admin = AdminClass::getById($adminId);
-		if (empty($admin)) {
-			util::fail('没有找到管理员信息');
-		}
-		if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
-			util::fail("请关注公众号（{$admin['id']}）");
-		}
-		$roleId = $bindData['roleId'];
-		$remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
-		$status = isset($bindData['status']) ? $bindData['status'] : 0;
-		$password = isset($bindData['password']) ? password_hash($bindData['password'], PASSWORD_BCRYPT) : '';
-		$remark = isset($bindData['remark']) ? $bindData['remark'] : '';
-		$update = ['adminName' => $adminName, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark];
-		AdminClass::updateById($adminId, $update);
-		$addData = [
-			'adminId' => $adminId,
-			'shopId' => $shopId,
-			'roleId' => $roleId,
-			'remind' => $remind,
-			'status' => $status,
-			'merchantId' => $merchantId,
-		];
-		ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
-		return ShopAdminClass::add($addData);
-	}
-	
-	//获取管理员 ssh 2020.4.21
-	// $sensitive true 密码等敏感信息不显示
-	public static function getAdminList($where, $sensitive = true)
-	{
-		$data = ShopAdminClass::getList('*', $where, 'addTime DESC');
-		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
-		if (empty($list)) {
-			return $data;
-		}
-		
-		//管理员基础信息
-		$ids = array_column($list, 'adminId');
-		$adminInfo = AdminClass::getByIds($ids, null, 'id');
-		$adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo, $sensitive);
-		
-		$roleIds = array_column($list, 'roleId');
-		$roleIds = array_filter(array_unique($roleIds));
-		$roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
-		
-		foreach ($list as $key => $val) {
-			$adminId = $val['adminId'];
-			$current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
-			$list[$key]['adminBaseInfo'] = $current;
-			$roleId = $val['roleId'];
-			$roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
-			$list[$key]['roleName'] = $roleName;
-		}
-		$data['list'] = $list;
-		return $data;
-	}
-	
-	//获取要通知的管理员 ssh 2020.4.28
-	public static function getNoticeAdminList($shopId)
-	{
-		$where = ['shopId' => $shopId];
-		$respond = self::getAdminList($where, false);
-		$list = isset($respond['list']) ? $respond['list'] : [];
-		if (!empty($list)) {
-			foreach ($list as $key => $val) {
-				if (isset($val['remind']) && $val['remind'] == 0) {
-					unset($list[$key]);
-				}
-			}
-		}
-		return $list;
-	}
-	
-	public static function valid($shopAdmin, $shopId)
-	{
-		if (isset($shopAdmin['shopId']) == false || $shopAdmin['shopId'] != $shopId) {
-			util::fail('不是您的员工');
-		}
-	}
-	
+
+    public static $baseFile = '\bizMall\admin\classes\ShopAdminClass';
+
+    ///创建管理员生成小程序 ssh 2020.4.17
+    public static function prepareBindAdmin($data)
+    {
+        ShopAdminClass::prepareBindAdmin($data);
+        $page = 'admin/shopAdmin/bind';
+        $isOpen = 1;
+        $adminId = $data['adminId'];
+        $shopId = $data['shopId'];
+        $scene = 'adminId=' . $adminId . '&shopId=' . $shopId;
+        $merchant = $data['merchant'];
+        $imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
+        return ['miniCode' => $imgUrl];
+    }
+
+    public static function generateAdmin($data)
+    {
+        $recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;
+        $mobile = isset($data['mobile']) ? $data['mobile'] : '';
+        $shopId = isset($data['shopId']) ? $data['shopId'] : 0;
+        $adminId = isset($data['adminId']) ? $data['adminId'] : 0;
+        $bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
+        $shop = ShopClass::getById($shopId);
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $merchantId = isset($shop['merchantId']) ? $shop['merchantId'] : 0;
+        if (empty($bindData)) {
+            util::fail('小程序码已经失效，请重新创建员工');
+        }
+        $shopAdmin = ShopAdminClass::getByCondition(['adminId' => $adminId, 'shopId' => $shopId]);
+        if (!empty($shopAdmin)) {
+            util::fail('您已经是管理员了');
+        }
+        $name = isset($bindData['name']) ? $bindData['name'] : '';
+        if (isset($bindData['roleId']) == false || empty($bindData['roleId'])) {
+            util::fail('添加管理员时请选择角色');
+        }
+        $admin = AdminClass::getById($adminId);
+        if (empty($admin)) {
+            util::fail('没有找到管理员信息');
+        }
+        if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
+            util::fail("请关注公众号（{$admin['id']}）");
+        }
+        $roleId = $bindData['roleId'];
+        $remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
+        $status = isset($bindData['status']) ? $bindData['status'] : 0;
+        $password = isset($bindData['password']) ? password_hash($bindData['password'], PASSWORD_BCRYPT) : '';
+        $remark = isset($bindData['remark']) ? $bindData['remark'] : '';
+        $update = ['name' => $name, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark];
+        AdminClass::updateById($adminId, $update);
+        $addData = [
+            'adminId' => $adminId,
+            'shopId' => $shopId,
+            'roleId' => $roleId,
+            'remind' => $remind,
+            'status' => $status,
+            'merchantId' => $merchantId,
+            'name' => $name,
+        ];
+        ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
+        return ShopAdminClass::add($addData);
+    }
+
+    //获取管理员 ssh 2020.4.21
+    // $sensitive true 密码等敏感信息不显示
+    public static function getAdminList($where, $sensitive = true)
+    {
+        $data = ShopAdminClass::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+
+        //管理员基础信息
+        $ids = array_column($list, 'adminId');
+        $adminInfo = AdminClass::getByIds($ids, null, 'id');
+        $adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo, $sensitive);
+
+        $roleIds = array_column($list, 'roleId');
+        $roleIds = array_filter(array_unique($roleIds));
+        $roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
+
+        foreach ($list as $key => $val) {
+            $adminId = $val['adminId'];
+            $current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
+            $list[$key]['adminBaseInfo'] = $current;
+            $roleId = $val['roleId'];
+            $roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
+            $list[$key]['roleName'] = $roleName;
+        }
+        $data['list'] = $list;
+        return $data;
+    }
+
+    //获取要通知的管理员 ssh 2020.4.28
+    public static function getNoticeAdminList($shopId)
+    {
+        $where = ['shopId' => $shopId];
+        $respond = self::getAdminList($where, false);
+        $list = isset($respond['list']) ? $respond['list'] : [];
+        if (!empty($list)) {
+            foreach ($list as $key => $val) {
+                if (isset($val['remind']) && $val['remind'] == 0) {
+                    unset($list[$key]);
+                }
+            }
+        }
+        return $list;
+    }
+
+    public static function valid($shopAdmin, $shopId)
+    {
+        if (isset($shopAdmin['shopId']) == false || $shopAdmin['shopId'] != $shopId) {
+            util::fail('不是您的员工');
+        }
+    }
+
 }

biz-mall/merchant/services/MerchantService.php

@@ -111,7 +111,7 @@ class MerchantService extends BaseService
             $adminId = $val['adminId'];
             $merchantId = $val['id'];
             $setId = $val['setId'];
-            $val['adminName'] = isset($admin[$adminId]['adminName']) ? $admin[$adminId]['adminName'] : '';
+            $val['adminName'] = isset($admin[$adminId]['name']) ? $admin[$adminId]['name'] : '';
             $val['merchantAsset'] = isset($asset[$merchantId]) ? $asset[$merchantId] : [];
             $val['setMealName'] = isset($set[$setId]) ? $set[$setId]['name'] : '';
             $val['extend'] = isset($ext[$merchantId]) ? $ext[$merchantId] : [];

biz-mall/saas/services/ApplyService.php

@@ -41,7 +41,7 @@ class ApplyService extends BaseService
 		foreach ($list as $key => $val) {
 			$adminId = $val['adminId'];
 			$introMerchantId = $val['introMerchantId'];
-			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['adminName'] : '';
+			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['name'] : '';
 			$list[$key]['adminAvatar'] = isset($adminList[$adminId]['avatarUrl']) ? $adminList[$adminId]['avatarUrl'] : '';
 			$list[$key]['oldName'] = isset($merchant[$introMerchantId]['name']) ? $merchant[$introMerchantId]['name'] : '';
 		}
@@ -59,7 +59,7 @@ class ApplyService extends BaseService
 		$apply['name'] = isset($apply['name']) ? $apply['name'] : '';
 		$adminId = $apply['adminId'];
 		$admin = AdminClass::getById($adminId);
-		$apply['adminName'] = isset($admin['adminName']) ? $admin['adminName'] : '';
+		$apply['adminName'] = isset($admin['name']) ? $admin['name'] : '';
 		return MerchantClass::generateMerchant($apply);
 	}
 	

biz-mall/user/classes/UserClass.php

@@ -141,9 +141,7 @@ class UserClass extends BaseClass
         $time = time();
         //替换掉微信名称不支持的图片
         $userName = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
-        $getUserInfo['userName'] = $userName;
-        $getUserInfo['nickName'] = $userName;
-        $getUserInfo['realName'] = isset($getUserInfo['realName']) && !empty($getUserInfo['realName']) ? $getUserInfo['realName'] : '';
+        $getUserInfo['name'] = $userName;
         $getUserInfo['sex'] = isset($getUserInfo['sex']) ? $getUserInfo['sex'] : 0;//未知
         $getUserInfo['identity'] = 0;
         $subscribe = isset($getUserInfo['subscribe']) ? $getUserInfo['subscribe'] : 0;
@@ -164,9 +162,6 @@ class UserClass extends BaseClass
         //生成用户基础信息
         $user = self::add($getUserInfo);
         $userId = $user['id'];
-        if (empty($user['userName'])) {
-            self::updateById($userId, ['userName' => $userId, 'nickName' => $userId]);
-        }
 
         //保存头像
         if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {

biz/shop/services/ShopAdminService.php

@@ -20,124 +20,125 @@ use Yii;
 
 class ShopAdminService extends BaseService
 {
-	
-	public static $baseFile = '\biz\shop\classes\ShopAdminClass';
-	
-	///创建管理员生成小程序 ssh 2020.4.17
-	public static function prepareBindAdmin($data)
-	{
-		ShopAdminClass::prepareBindAdmin($data);
-		$page = 'admin/shopAdmin/bind';
-		$isOpen = 1;
-		$adminId = $data['adminId'];
-		$shopId = $data['shopId'];
-		$scene = 'adminId=' . $adminId . '&shopId=' . $shopId;
-		$merchant = $data['merchant'];
-		$imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
-		return ['miniCode' => $imgUrl];
-	}
-	
-	public static function generateAdmin($data)
-	{
-		$recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;
-		$mobile = isset($data['mobile']) ? $data['mobile'] : '';
-		$shopId = isset($data['shopId']) ? $data['shopId'] : 0;
-		$adminId = isset($data['adminId']) ? $data['adminId'] : 0;
-		$bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
-		$shop = ShopClass::getById($shopId);
-		if (empty($shop)) {
-			util::fail('没有找到门店');
-		}
-		$merchantId = isset($shop['merchantId']) ? $shop['merchantId'] : 0;
-		if (empty($bindData)) {
-			util::fail('小程序码已经失效，请重新创建员工');
-		}
-		$shopAdmin = ShopAdminClass::getByCondition(['adminId' => $adminId, 'shopId' => $shopId]);
-		if (!empty($shopAdmin)) {
-			util::fail('您已经是管理员了');
-		}
-		$adminName = isset($bindData['adminName']) ? $bindData['adminName'] : '';
-		if (isset($bindData['roleId']) == false || empty($bindData['roleId'])) {
-			util::fail('添加管理员时请选择角色');
-		}
-		$admin = AdminClass::getById($adminId);
-		if (empty($admin)) {
-			util::fail('没有找到管理员信息');
-		}
-		if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
-			util::fail("请关注公众号（{$admin['id']}）");
-		}
-		$roleId = $bindData['roleId'];
-		$remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
-		$status = isset($bindData['status']) ? $bindData['status'] : 0;
-		$password = isset($bindData['password']) ? password_hash($bindData['password'], PASSWORD_BCRYPT) : '';
-		$remark = isset($bindData['remark']) ? $bindData['remark'] : '';
-		$update = ['adminName' => $adminName, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark];
-		AdminClass::updateById($adminId, $update);
-		$addData = [
-			'adminId' => $adminId,
-			'shopId' => $shopId,
-			'roleId' => $roleId,
-			'remind' => $remind,
-			'status' => $status,
-			'merchantId' => $merchantId,
-		];
-		ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
-		return ShopAdminClass::add($addData);
-	}
-	
-	//获取管理员 ssh 2020.4.21
-	// $sensitive true 密码等敏感信息不显示
-	public static function getAdminList($where, $sensitive = true)
-	{
-		$data = ShopAdminClass::getList('*', $where, 'addTime DESC');
-		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
-		if (empty($list)) {
-			return $data;
-		}
-		
-		//管理员基础信息
-		$ids = array_column($list, 'adminId');
-		$adminInfo = AdminClass::getByIds($ids, null, 'id');
-		$adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo, $sensitive);
-		
-		$roleIds = array_column($list, 'roleId');
-		$roleIds = array_filter(array_unique($roleIds));
-		$roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
-		
-		foreach ($list as $key => $val) {
-			$adminId = $val['adminId'];
-			$current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
-			$list[$key]['adminBaseInfo'] = $current;
-			$roleId = $val['roleId'];
-			$roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
-			$list[$key]['roleName'] = $roleName;
-		}
-		$data['list'] = $list;
-		return $data;
-	}
-	
-	//获取要通知的管理员 ssh 2020.4.28
-	public static function getNoticeAdminList($shopId)
-	{
-		$where = ['shopId' => $shopId];
-		$respond = self::getAdminList($where, false);
-		$list = isset($respond['list']) ? $respond['list'] : [];
-		if (!empty($list)) {
-			foreach ($list as $key => $val) {
-				if (isset($val['remind']) && $val['remind'] == 0) {
-					unset($list[$key]);
-				}
-			}
-		}
-		return $list;
-	}
-	
-	public static function valid($shopAdmin, $shopId)
-	{
-		if (isset($shopAdmin['shopId']) == false || $shopAdmin['shopId'] != $shopId) {
-			util::fail('不是您的员工');
-		}
-	}
-	
+
+    public static $baseFile = '\biz\shop\classes\ShopAdminClass';
+
+    ///创建管理员生成小程序 ssh 2020.4.17
+    public static function prepareBindAdmin($data)
+    {
+        ShopAdminClass::prepareBindAdmin($data);
+        $page = 'admin/shopAdmin/bind';
+        $isOpen = 1;
+        $adminId = $data['adminId'];
+        $shopId = $data['shopId'];
+        $scene = 'adminId=' . $adminId . '&shopId=' . $shopId;
+        $merchant = $data['merchant'];
+        $imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
+        return ['miniCode' => $imgUrl];
+    }
+
+    public static function generateAdmin($data)
+    {
+        $recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;
+        $mobile = isset($data['mobile']) ? $data['mobile'] : '';
+        $shopId = isset($data['shopId']) ? $data['shopId'] : 0;
+        $adminId = isset($data['adminId']) ? $data['adminId'] : 0;
+        $bindData = ShopAdminClass::getBindAdminData($shopId, $recommendAdminId);
+        $shop = ShopClass::getById($shopId);
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $merchantId = isset($shop['merchantId']) ? $shop['merchantId'] : 0;
+        if (empty($bindData)) {
+            util::fail('小程序码已经失效，请重新创建员工');
+        }
+        $shopAdmin = ShopAdminClass::getByCondition(['adminId' => $adminId, 'shopId' => $shopId]);
+        if (!empty($shopAdmin)) {
+            util::fail('您已经是管理员了');
+        }
+        $name = isset($bindData['name']) ? $bindData['name'] : '';
+        if (isset($bindData['roleId']) == false || empty($bindData['roleId'])) {
+            util::fail('添加管理员时请选择角色');
+        }
+        $admin = AdminClass::getById($adminId);
+        if (empty($admin)) {
+            util::fail('没有找到管理员信息');
+        }
+        if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
+            util::fail("请关注公众号（{$admin['id']}）");
+        }
+        $roleId = $bindData['roleId'];
+        $remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
+        $status = isset($bindData['status']) ? $bindData['status'] : 0;
+        $password = isset($bindData['password']) ? password_hash($bindData['password'], PASSWORD_BCRYPT) : '';
+        $remark = isset($bindData['remark']) ? $bindData['remark'] : '';
+        $update = ['name' => $name, 'mobile' => $mobile, 'password' => $password, 'remark' => $remark];
+        AdminClass::updateById($adminId, $update);
+        $addData = [
+            'adminId' => $adminId,
+            'shopId' => $shopId,
+            'roleId' => $roleId,
+            'remind' => $remind,
+            'status' => $status,
+            'merchantId' => $merchantId,
+            'name' => $name,
+        ];
+        ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
+        return ShopAdminClass::add($addData);
+    }
+
+    //获取管理员 ssh 2020.4.21
+    // $sensitive true 密码等敏感信息不显示
+    public static function getAdminList($where, $sensitive = true)
+    {
+        $data = ShopAdminClass::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+
+        //管理员基础信息
+        $ids = array_column($list, 'adminId');
+        $adminInfo = AdminClass::getByIds($ids, null, 'id');
+        $adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo, $sensitive);
+
+        $roleIds = array_column($list, 'roleId');
+        $roleIds = array_filter(array_unique($roleIds));
+        $roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
+
+        foreach ($list as $key => $val) {
+            $adminId = $val['adminId'];
+            $current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
+            $list[$key]['adminBaseInfo'] = $current;
+            $roleId = $val['roleId'];
+            $roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
+            $list[$key]['roleName'] = $roleName;
+        }
+        $data['list'] = $list;
+        return $data;
+    }
+
+    //获取要通知的管理员 ssh 2020.4.28
+    public static function getNoticeAdminList($shopId)
+    {
+        $where = ['shopId' => $shopId];
+        $respond = self::getAdminList($where, false);
+        $list = isset($respond['list']) ? $respond['list'] : [];
+        if (!empty($list)) {
+            foreach ($list as $key => $val) {
+                if (isset($val['remind']) && $val['remind'] == 0) {
+                    unset($list[$key]);
+                }
+            }
+        }
+        return $list;
+    }
+
+    public static function valid($shopAdmin, $shopId)
+    {
+        if (isset($shopAdmin['shopId']) == false || $shopAdmin['shopId'] != $shopId) {
+            util::fail('不是您的员工');
+        }
+    }
+
 }

common/services/xhAdminService.php

@@ -14,259 +14,259 @@ use yii\web\Cookie;
 
 class xhAdminService
 {
-	
-	/**
-	 * 手机号登陆
-	 */
-	public static function loginByMobile($mobile, $password, $autoLogin = false)
-	{
-		$admin = self::getByMobile($mobile);
-		if (empty($admin)) {
-			return ['code' => 'A0002', 'msg' => '帐号错误'];
-		}
-		$adminId = $admin['id'];
-		$dbPassword = $admin['password'];
-		if (md5($password) != $dbPassword) {
-			return ['code' => 'A0002', 'msg' => '帐号或密码错误'];
-		}
-		$adminId = $admin['id'];
-		$relation = xhAdminToMerchantService::getByAdminId($adminId);
-		if (empty($relation)) {
-			return ['code' => 'A0002', 'msg' => '帐号或密码错误！'];
-		}
-		$merchantId = $relation['merchantId'];
-		$merchant = xhMerchantService::getById($merchantId);
-		$status = $merchant['status'];
-		$pass = dict::getConfig('merchantStatus', 'pass');
-		$unfreeze = dict::getConfig('merchantStatus', 'unfreeze');
-		if (in_array($status, [$pass, $unfreeze]) == false) {
-			return ['code' => 'A0002', 'msg' => '帐号有问题'];
-		}
-		
-		//七天免登陆或者10分钟未操作退出
-		$time = time();
-		$autoLogin = Yii::$app->request->post('autoLogin', 1);
-		$expireTime = $autoLogin == 1 ? ($time + 7 * 86400) : (10 * 60 + $time);
-		$redisExpireTime = 7 * 86400;
-		$urlSession = Yii::$app->request->get('SESSIONID', '');
-		if (empty($urlSession)) {
-			$sessionId = AdminService::generateSessionId($merchantId);
-			Yii::$app->response->cookies->add(new Cookie([
-				'name' => 'SESSIONID',
-				'value' => $sessionId,
-				'domain' => $_SERVER['SERVER_NAME'],
-				'expire' => $expireTime
-			]));
-			//保存到redis
-			Yii::$app->redis->executeCommand('SET', [$sessionId, $adminId]);
-			Yii::$app->redis->executeCommand('EXPIRE', [$sessionId, $redisExpireTime]);//过期
-		}
-		
-		return ['code' => 'A0001', 'msg' => '登陆成功'];
-	}
-	
-	/**
-	 * 微信等第三方登陆
-	 */
-	public static function loginByThird($admin, $autoLogin = false)
-	{
-		$session = Yii::$app->session;
-		$session['isLogin'] = true;
-		$session['id'] = $admin['id'];
-	}
-	
-	public static function getByMobile($mobile)
-	{
-		$admin = xhAdmin::find()->where(['mobile' => $mobile])->asArray()->one();
-		return $admin;
-	}
-	
-	public static function isLogin()
-	{
-		$session = Yii::$app->session;
-		if (isset($session['isLogin']) && !empty($session['isLogin'])) {
-			return true;
-		}
-		return false;
-	}
-	
-	public static function getId()
-	{
-		$session = Yii::$app->session;
-		$userId = $session['id'];
-		return $userId;
-	}
-	
-	public static function logout()
-	{
-		//清除缓存
-		$sessionId = Yii::$app->request->cookies->getValue("SESSIONID");
-		Yii::$app->redis->executeCommand('DEL', [$sessionId]);
-		//清除cookie
-		$cookie = Yii::$app->response->cookies;
-		$cookie->remove('SESSIONID');
-		$cookie->add(new Cookie([
-			'name' => 'SESSIONID',
-			'value' => '',
-			'expire' => time() - 30 * 24 * 3600,
-			'domain' => $_SERVER['SERVER_NAME']
-		]));
-		//清除session
-		Yii::$app->session->destroy();//销毁session中所有已注册的数据
-	}
-	
-	/**
-	 * 通过微信生成用户
-	 */
-	public static function generateAdmin($baseInfo)
-	{
-		$date = date("Y-m-d H:i:s");
-		$data = [];
-		$data['mobile'] = isset($baseInfo['mobile']) ? $baseInfo['mobile'] : '';
-		$nickName = $baseInfo['nickName'];
-		$nickName = preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $nickName);//替换掉微信不支持的图片
-		$data['adminName'] = $nickName;
-		$data['avatar'] = '';
-		$data['password'] = isset($baseInfo['password']) ? md5($baseInfo['password']) : '';
-		$data['payPassword'] = '';
-		$data['openId'] = $baseInfo['openid'];
-		$data['unionId'] = isset($baseInfo['unionId']) ? $baseInfo['unionId'] : '';
-		$data['subscribe'] = isset($baseInfo['subscribe']) ? $baseInfo['subscribe'] : 0;
-		$data['merchantId'] = isset($baseInfo['merchantId']) ? $baseInfo['merchantId'] : 0;
-		$data['status'] = 0;
-		$data['createTime'] = $date;
-		$admin = self::add($data);
-		//保存头像
-		if (!empty($baseInfo['headimgurl'])) {
-			$imgUrl = $baseInfo['headimgurl'];
-			$adminId = $admin['id'];
-			$avatar = self::avatarSave($imgUrl, $adminId);
-			self::updateById($admin['id'], ['avatar' => $avatar]);
-		}
-		return $admin;
-	}
-	
-	/**
-	 * 保存头像
-	 * @return string
-	 */
-	public static function avatarSave($url, $adminId)
-	{
-		$directory = dict::getConfig('imgSavePath', 'wxAdminAvatar');
-		$path = Yii::getAlias('@webroot') . '/../../images';
-		$pre = '/' . $directory . '/' . date('Y') . '/' . date('m') . '/' . date("d") . '/';
-		if (!file_exists($path . $pre)) {
-			mkdir($path . $pre, 0777, true);
-		}
-		$randString = stringUtil::buildOrderNo();
-		$name = $adminId . '_' . $randString . '.jpg';
-		$fullFileName = $path . $pre . $name;
-		$fileName = $pre . $name;
-		$curl = new curl\Curl();
-		$result = $curl->get($url);
-		$fp2 = @fopen($fullFileName, 'a');//文件大小
-		fwrite($fp2, $result);
-		fclose($fp2);
-		
-		$dstImg200 = $path . $pre . $adminId . '_' . $randString . '_200.jpg';//缩略宽 200px 中
-		util::img2thumb($fullFileName, $dstImg200, 200, 0, 0, 0);
-		
-		$dstImg50 = $path . $pre . $adminId . '_' . $randString . '_50.jpg';//缩略成宽50px 小
-		util::img2thumb($fullFileName, $dstImg50, 50, 0, 0, 0);
-		return $fileName;//默认大小 大
-	}
-	
-	/**
-	 * 传入最大的头像，输出三种头像：大 中 小
-	 */
-	public static function getAvatarList($largeImg)
-	{
-		$extend = substr($largeImg, strrpos($largeImg, '.') + 1);
-		$pre = substr($largeImg, 0, strrpos($largeImg, '.'));
-		return ['small' => $pre . '_50.' . $extend, 'medium' => $pre . '_200.' . $extend, 'large' => $largeImg];
-	}
-	
-	public static function getById($id)
-	{
-		$admin = xhAdmin::find()->where(['id' => $id])->asArray()->one();
-		return $admin;
-	}
-	
-	public static function getByOpenId($openId)
-	{
-		$cacheKey = dict::getCacheKey('xhAdminOpenId') . $openId;
-		$admin = Yii::$app->redis->executeCommand('HGETALL', [$cacheKey]);
-		if (!empty($admin)) {
-			$arr = [];
-			$i = 0;
-			$x = 0;
-			foreach ($admin as $key => $val) {
-				$i++;
-				if ($i % 2 == 0) {
-					$arr[$x]['value'] = $val;
-					$x++;
-				} else {
-					$arr[$x]['key'] = $val;
-				}
-			}
-			$adminArr = [];
-			foreach ($arr as $key => $val) {
-				$adminArr[$val['key']] = $val['value'];
-			}
-			unset($adminArr['info_already_get_by_sql']);
-			return $adminArr;
-		}
-		$admin = xhAdmin::find()->where(['openId' => $openId])->asArray()->one();
-		$params = [$cacheKey];
-		$params[] = 'info_already_get_by_sql';
-		$params[] = 'ok';//redis没有办法设置带空值的键，加此可以数据空时表示取过
-		if (!empty($admin)) {
-			foreach ($admin as $key => $val) {
-				$params[] = $key;
-				$params[] = $val;
-			}
-		}
-		Yii::$app->redis->executeCommand('HMSET', $params);//将用户信息、用户标签放入缓存
-		return $admin;
-	}
-	
-	public static function refreshById($id)
-	{
-		$adminKey = dict::getCacheKey('admin') . $id;
-		Yii::$app->redis->executeCommand('DEL', [$adminKey]);
-		$admin = self::getById($id);
-		
-		$mobile = $admin['mobile'];
-		$mobileKey = dict::getCacheKey('xhAdminMobile') . $mobile;
-		Yii::$app->redis->executeCommand('DEL', [$mobileKey]);
-		self::getByMobile($mobile);
-		
-		$openId = $admin['openId'];
-		$openKey = dict::getCacheKey('xhAdminOpenId') . $openId;
-		Yii::$app->redis->executeCommand('DEL', [$openKey]);
-		self::getByOpenId($openId);
-	}
-	
-	public static function updateById($id, $data)
-	{
-		xhAdmin::updateById($id, $data);
-		self::refreshById($id);
-	}
-	
-	public static function deleteById($id)
-	{
-		xhAdmin::deleteById($id);
-		$preKey = dict::getCacheKey('admin');
-		$cacheKey = $preKey . $id;
-		Yii::$app->redis->executeCommand('DEL', [$cacheKey]);
-	}
-	
-	public static function add($data)
-	{
-		$admin = xhAdmin::add($data);
-		$id = $admin['id'];
-		self::refreshById($id);
-		return $admin;
-	}
-	
+
+    /**
+     * 手机号登陆
+     */
+    public static function loginByMobile($mobile, $password, $autoLogin = false)
+    {
+        $admin = self::getByMobile($mobile);
+        if (empty($admin)) {
+            return ['code' => 'A0002', 'msg' => '帐号错误'];
+        }
+        $adminId = $admin['id'];
+        $dbPassword = $admin['password'];
+        if (md5($password) != $dbPassword) {
+            return ['code' => 'A0002', 'msg' => '帐号或密码错误'];
+        }
+        $adminId = $admin['id'];
+        $relation = xhAdminToMerchantService::getByAdminId($adminId);
+        if (empty($relation)) {
+            return ['code' => 'A0002', 'msg' => '帐号或密码错误！'];
+        }
+        $merchantId = $relation['merchantId'];
+        $merchant = xhMerchantService::getById($merchantId);
+        $status = $merchant['status'];
+        $pass = dict::getConfig('merchantStatus', 'pass');
+        $unfreeze = dict::getConfig('merchantStatus', 'unfreeze');
+        if (in_array($status, [$pass, $unfreeze]) == false) {
+            return ['code' => 'A0002', 'msg' => '帐号有问题'];
+        }
+
+        //七天免登陆或者10分钟未操作退出
+        $time = time();
+        $autoLogin = Yii::$app->request->post('autoLogin', 1);
+        $expireTime = $autoLogin == 1 ? ($time + 7 * 86400) : (10 * 60 + $time);
+        $redisExpireTime = 7 * 86400;
+        $urlSession = Yii::$app->request->get('SESSIONID', '');
+        if (empty($urlSession)) {
+            $sessionId = AdminService::generateSessionId($merchantId);
+            Yii::$app->response->cookies->add(new Cookie([
+                'name' => 'SESSIONID',
+                'value' => $sessionId,
+                'domain' => $_SERVER['SERVER_NAME'],
+                'expire' => $expireTime
+            ]));
+            //保存到redis
+            Yii::$app->redis->executeCommand('SET', [$sessionId, $adminId]);
+            Yii::$app->redis->executeCommand('EXPIRE', [$sessionId, $redisExpireTime]);//过期
+        }
+
+        return ['code' => 'A0001', 'msg' => '登陆成功'];
+    }
+
+    /**
+     * 微信等第三方登陆
+     */
+    public static function loginByThird($admin, $autoLogin = false)
+    {
+        $session = Yii::$app->session;
+        $session['isLogin'] = true;
+        $session['id'] = $admin['id'];
+    }
+
+    public static function getByMobile($mobile)
+    {
+        $admin = xhAdmin::find()->where(['mobile' => $mobile])->asArray()->one();
+        return $admin;
+    }
+
+    public static function isLogin()
+    {
+        $session = Yii::$app->session;
+        if (isset($session['isLogin']) && !empty($session['isLogin'])) {
+            return true;
+        }
+        return false;
+    }
+
+    public static function getId()
+    {
+        $session = Yii::$app->session;
+        $userId = $session['id'];
+        return $userId;
+    }
+
+    public static function logout()
+    {
+        //清除缓存
+        $sessionId = Yii::$app->request->cookies->getValue("SESSIONID");
+        Yii::$app->redis->executeCommand('DEL', [$sessionId]);
+        //清除cookie
+        $cookie = Yii::$app->response->cookies;
+        $cookie->remove('SESSIONID');
+        $cookie->add(new Cookie([
+            'name' => 'SESSIONID',
+            'value' => '',
+            'expire' => time() - 30 * 24 * 3600,
+            'domain' => $_SERVER['SERVER_NAME']
+        ]));
+        //清除session
+        Yii::$app->session->destroy();//销毁session中所有已注册的数据
+    }
+
+    /**
+     * 通过微信生成用户
+     */
+    public static function generateAdmin($baseInfo)
+    {
+        $date = date("Y-m-d H:i:s");
+        $data = [];
+        $data['mobile'] = isset($baseInfo['mobile']) ? $baseInfo['mobile'] : '';
+        $name = $baseInfo['nickName'];
+        $name = preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $name);//替换掉微信不支持的图片
+        $data['name'] = $name;
+        $data['avatar'] = '';
+        $data['password'] = isset($baseInfo['password']) ? md5($baseInfo['password']) : '';
+        $data['payPassword'] = '';
+        $data['openId'] = $baseInfo['openid'];
+        $data['unionId'] = isset($baseInfo['unionId']) ? $baseInfo['unionId'] : '';
+        $data['subscribe'] = isset($baseInfo['subscribe']) ? $baseInfo['subscribe'] : 0;
+        $data['merchantId'] = isset($baseInfo['merchantId']) ? $baseInfo['merchantId'] : 0;
+        $data['status'] = 0;
+        $data['createTime'] = $date;
+        $admin = self::add($data);
+        //保存头像
+        if (!empty($baseInfo['headimgurl'])) {
+            $imgUrl = $baseInfo['headimgurl'];
+            $adminId = $admin['id'];
+            $avatar = self::avatarSave($imgUrl, $adminId);
+            self::updateById($admin['id'], ['avatar' => $avatar]);
+        }
+        return $admin;
+    }
+
+    /**
+     * 保存头像
+     * @return string
+     */
+    public static function avatarSave($url, $adminId)
+    {
+        $directory = dict::getConfig('imgSavePath', 'wxAdminAvatar');
+        $path = Yii::getAlias('@webroot') . '/../../images';
+        $pre = '/' . $directory . '/' . date('Y') . '/' . date('m') . '/' . date("d") . '/';
+        if (!file_exists($path . $pre)) {
+            mkdir($path . $pre, 0777, true);
+        }
+        $randString = stringUtil::buildOrderNo();
+        $name = $adminId . '_' . $randString . '.jpg';
+        $fullFileName = $path . $pre . $name;
+        $fileName = $pre . $name;
+        $curl = new curl\Curl();
+        $result = $curl->get($url);
+        $fp2 = @fopen($fullFileName, 'a');//文件大小
+        fwrite($fp2, $result);
+        fclose($fp2);
+
+        $dstImg200 = $path . $pre . $adminId . '_' . $randString . '_200.jpg';//缩略宽 200px 中
+        util::img2thumb($fullFileName, $dstImg200, 200, 0, 0, 0);
+
+        $dstImg50 = $path . $pre . $adminId . '_' . $randString . '_50.jpg';//缩略成宽50px 小
+        util::img2thumb($fullFileName, $dstImg50, 50, 0, 0, 0);
+        return $fileName;//默认大小 大
+    }
+
+    /**
+     * 传入最大的头像，输出三种头像：大 中 小
+     */
+    public static function getAvatarList($largeImg)
+    {
+        $extend = substr($largeImg, strrpos($largeImg, '.') + 1);
+        $pre = substr($largeImg, 0, strrpos($largeImg, '.'));
+        return ['small' => $pre . '_50.' . $extend, 'medium' => $pre . '_200.' . $extend, 'large' => $largeImg];
+    }
+
+    public static function getById($id)
+    {
+        $admin = xhAdmin::find()->where(['id' => $id])->asArray()->one();
+        return $admin;
+    }
+
+    public static function getByOpenId($openId)
+    {
+        $cacheKey = dict::getCacheKey('xhAdminOpenId') . $openId;
+        $admin = Yii::$app->redis->executeCommand('HGETALL', [$cacheKey]);
+        if (!empty($admin)) {
+            $arr = [];
+            $i = 0;
+            $x = 0;
+            foreach ($admin as $key => $val) {
+                $i++;
+                if ($i % 2 == 0) {
+                    $arr[$x]['value'] = $val;
+                    $x++;
+                } else {
+                    $arr[$x]['key'] = $val;
+                }
+            }
+            $adminArr = [];
+            foreach ($arr as $key => $val) {
+                $adminArr[$val['key']] = $val['value'];
+            }
+            unset($adminArr['info_already_get_by_sql']);
+            return $adminArr;
+        }
+        $admin = xhAdmin::find()->where(['openId' => $openId])->asArray()->one();
+        $params = [$cacheKey];
+        $params[] = 'info_already_get_by_sql';
+        $params[] = 'ok';//redis没有办法设置带空值的键，加此可以数据空时表示取过
+        if (!empty($admin)) {
+            foreach ($admin as $key => $val) {
+                $params[] = $key;
+                $params[] = $val;
+            }
+        }
+        Yii::$app->redis->executeCommand('HMSET', $params);//将用户信息、用户标签放入缓存
+        return $admin;
+    }
+
+    public static function refreshById($id)
+    {
+        $adminKey = dict::getCacheKey('admin') . $id;
+        Yii::$app->redis->executeCommand('DEL', [$adminKey]);
+        $admin = self::getById($id);
+
+        $mobile = $admin['mobile'];
+        $mobileKey = dict::getCacheKey('xhAdminMobile') . $mobile;
+        Yii::$app->redis->executeCommand('DEL', [$mobileKey]);
+        self::getByMobile($mobile);
+
+        $openId = $admin['openId'];
+        $openKey = dict::getCacheKey('xhAdminOpenId') . $openId;
+        Yii::$app->redis->executeCommand('DEL', [$openKey]);
+        self::getByOpenId($openId);
+    }
+
+    public static function updateById($id, $data)
+    {
+        xhAdmin::updateById($id, $data);
+        self::refreshById($id);
+    }
+
+    public static function deleteById($id)
+    {
+        xhAdmin::deleteById($id);
+        $preKey = dict::getCacheKey('admin');
+        $cacheKey = $preKey . $id;
+        Yii::$app->redis->executeCommand('DEL', [$cacheKey]);
+    }
+
+    public static function add($data)
+    {
+        $admin = xhAdmin::add($data);
+        $id = $admin['id'];
+        self::refreshById($id);
+        return $admin;
+    }
+
 }

common/services/xhInitService.php

@@ -8,100 +8,100 @@ use common\components\dict;
 
 class xhInitService
 {
-	
-	public static function clear($myOption = 'hhb')
-	{
-		Yii::$app->redis->executeCommand('FLUSHDB');
-		$connection = Yii::$app->db;
-		$result = Yii::$app->db->createCommand('SHOW TABLES')->queryAll();
-		if (empty($result)) {
-			util::stop('没有找到数据库表\n');
-		}
-		foreach ($result as $val) {
-			$tableName = array_pop($val);
-			if (in_array($tableName, ['xhWxOpen', 'xhWxOpenAdmin'])) {//测试时需要重复执行，xhWxOpen xhWxOpenAdmin 已经有数据则不进行清空
-				continue;
-			}
-			$sql = 'truncate ' . $tableName;
-			$connection->createCommand($sql)->execute();
-		}
-		$open = [];
-		if (empty($open)) {
-			util::fail('取平台信息错误');
-		}
-		
-		if (empty($open)) {
-			switch ($myOption) {
-				/**
-				 * case 'hhbxs'://花卉宝 线上环境
-				 * $data    = [
-				 * 'appId' => 'wxed3b3da77f382b4f',
-				 * 'openName' => '花卉宝',
-				 * 'appSecret' => '38cd1c6f37462e57bd3153e49f9a85d4',
-				 * 'token' => 'wt11464773309',
-				 * 'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',
-				 * 'createTime' => date("Y-m-d H:i:s"),
-				 * ];
-				 * break;
-				 **/
-				case 'hml'://花美灵 测试环境
-					$data = [
-						'appId' => 'wxe4428cfe08fc74d6',
-						'openName' => '花美灵',
-						'appSecret' => '2228663f0d56eb3e4b79fa96b3861f20',
-						'token' => 'wt11464773308',
-						'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW6',
-						'createTime' => date("Y-m-d H:i:s"),
-					];
-					break;
-				case 'zhh'://中花汇 开发环境
-					$data = [
-						'appId' => 'wxa08c41644219674c',
-						'openName' => '中花汇',
-						'appSecret' => 'aec3f43257d51318538ecdb8bb78a42b',
-						'token' => 'wt11464773309',
-						'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',
-						'createTime' => date("Y-m-d H:i:s"),
-					];
-					break;
-				case 'hhb'://花汇宝 演示环境
-					$data = [
-						'appId' => 'wx364800c320a0cf53',
-						'openName' => '花汇宝',
-						'appSecret' => '88565e17fa739efc020ed1e2a2a56ade',
-						'token' => 'wt11464773309',
-						'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',
-						'createTime' => date("Y-m-d H:i:s"),
-					];
-					break;
-			}
-			$historyTime = date('Y-m-d', strtotime('-30 days'));
-			$data['verifyTicketTime'] = $historyTime;
-			$data['componentAccessTokenTime'] = $historyTime;
-			$data['authorizerAccessTokenTime'] = $historyTime;
-			$data['preAuthCodeTime'] = $historyTime;
-			xhWxOpenService::add($data);
-		} else {
-			xhWxOpenService::updateById($id, ['merchantId' => 0]);
-		}
-		$id = dict::getConfig('openAdminId');
-		$adminOpen = xhWxOpenAdminService::getById($id);
-		if (empty($adminOpen)) {
-			$data = [
-				'mobile' => '15280215347',
-				'avatar' => '/platAdmin/admin.jpg',
-				'adminName' => '石少华',
-				'password' => md5('111111'),
-				'province' => '福建',
-				'city' => '厦门',
-				'dist' => '思明区',
-				'address' => '软件园二期望海路31号5楼阿里百川',
-				'createTime' => date("Y-m-d H:i:s"),
-			];
-			xhWxOpenAdminService::add($data);
-		}
-		$setData = ['name' => '零售基础版', 'manageStyle' => 0, 'price' => '3900', 'createTime' => date("Y-m-d H:i:s")];
-		xhSetMealService::add($setData);
-	}
+
+    public static function clear($myOption = 'hhb')
+    {
+        Yii::$app->redis->executeCommand('FLUSHDB');
+        $connection = Yii::$app->db;
+        $result = Yii::$app->db->createCommand('SHOW TABLES')->queryAll();
+        if (empty($result)) {
+            util::stop('没有找到数据库表\n');
+        }
+        foreach ($result as $val) {
+            $tableName = array_pop($val);
+            if (in_array($tableName, ['xhWxOpen', 'xhWxOpenAdmin'])) {//测试时需要重复执行，xhWxOpen xhWxOpenAdmin 已经有数据则不进行清空
+                continue;
+            }
+            $sql = 'truncate ' . $tableName;
+            $connection->createCommand($sql)->execute();
+        }
+        $open = [];
+        if (empty($open)) {
+            util::fail('取平台信息错误');
+        }
+
+        if (empty($open)) {
+            switch ($myOption) {
+                /**
+                 * case 'hhbxs'://花卉宝 线上环境
+                 * $data    = [
+                 * 'appId' => 'wxed3b3da77f382b4f',
+                 * 'openName' => '花卉宝',
+                 * 'appSecret' => '38cd1c6f37462e57bd3153e49f9a85d4',
+                 * 'token' => 'wt11464773309',
+                 * 'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',
+                 * 'createTime' => date("Y-m-d H:i:s"),
+                 * ];
+                 * break;
+                 **/
+                case 'hml'://花美灵 测试环境
+                    $data = [
+                        'appId' => 'wxe4428cfe08fc74d6',
+                        'openName' => '花美灵',
+                        'appSecret' => '2228663f0d56eb3e4b79fa96b3861f20',
+                        'token' => 'wt11464773308',
+                        'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW6',
+                        'createTime' => date("Y-m-d H:i:s"),
+                    ];
+                    break;
+                case 'zhh'://中花汇 开发环境
+                    $data = [
+                        'appId' => 'wxa08c41644219674c',
+                        'openName' => '中花汇',
+                        'appSecret' => 'aec3f43257d51318538ecdb8bb78a42b',
+                        'token' => 'wt11464773309',
+                        'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',
+                        'createTime' => date("Y-m-d H:i:s"),
+                    ];
+                    break;
+                case 'hhb'://花汇宝 演示环境
+                    $data = [
+                        'appId' => 'wx364800c320a0cf53',
+                        'openName' => '花汇宝',
+                        'appSecret' => '88565e17fa739efc020ed1e2a2a56ade',
+                        'token' => 'wt11464773309',
+                        'aesKey' => 'Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',
+                        'createTime' => date("Y-m-d H:i:s"),
+                    ];
+                    break;
+            }
+            $historyTime = date('Y-m-d', strtotime('-30 days'));
+            $data['verifyTicketTime'] = $historyTime;
+            $data['componentAccessTokenTime'] = $historyTime;
+            $data['authorizerAccessTokenTime'] = $historyTime;
+            $data['preAuthCodeTime'] = $historyTime;
+            xhWxOpenService::add($data);
+        } else {
+            xhWxOpenService::updateById($id, ['merchantId' => 0]);
+        }
+        $id = dict::getConfig('openAdminId');
+        $adminOpen = xhWxOpenAdminService::getById($id);
+        if (empty($adminOpen)) {
+            $data = [
+                'mobile' => '15280215347',
+                'avatar' => '/platAdmin/admin.jpg',
+                'name' => '石少华',
+                'password' => md5('111111'),
+                'province' => '福建',
+                'city' => '厦门',
+                'dist' => '思明区',
+                'address' => '软件园二期望海路31号5楼阿里百川',
+                'createTime' => date("Y-m-d H:i:s"),
+            ];
+            xhWxOpenAdminService::add($data);
+        }
+        $setData = ['name' => '零售基础版', 'manageStyle' => 0, 'price' => '3900', 'createTime' => date("Y-m-d H:i:s")];
+        xhSetMealService::add($setData);
+    }
 
 }

console/controllers/SjInitController.php

@@ -23,19 +23,19 @@ class SjInitController extends Controller
             [
                 'sjName' => '花禾家',
                 'mobile' => '15280215347',
-                'adminName' => '石头',
+                'name' => '石头',
                 'address' => '厦门市思明区岭兜西路629号夜光汇文化科创园2号楼413室',
             ],
             [
                 'sjName' => '花极客',
                 'mobile' => '17189513228',
-                'adminName' => '石头',
+                'name' => '石头',
                 'address' => '厦门市思明区岭兜西路629号夜光汇文化科创园2号楼412室',
             ],
             [
                 'sjName' => '花掌柜',
                 'mobile' => '17189512989',
-                'adminName' => '石头',
+                'name' => '石头',
                 'address' => '厦门市思明区岭兜西路629号夜光汇文化科创园2号楼411室',
             ],
         ];
@@ -45,7 +45,7 @@ class SjInitController extends Controller
             $val['introStyle'] = SjClass::STYLE_SUPPLIER;
             $val['name'] = $val['sjName'];
             $val['fullAddress'] = $val['address'];
-            $val['nickName'] = $val['adminName'];
+            $val['nickName'] = $val['name'];
             $respond = ApplyService::replaceRetail($val);
             if (!empty($respond)) {
                 $id = $respond['id'] ?? 0;

sql.sql

@@ -2146,4 +2146,12 @@ ALTER TABLE xhStatOutMonth ADD UNIQUE INDEX shop(`shopId`,`time`);
 TRUNCATE `xhStatStudent`;
 TRUNCATE `xhStatStudentMonth`;
 ALTER TABLE xhStatStudent ADD UNIQUE INDEX shop(`shopId`,`time`);
-ALTER TABLE xhStatStudentMonth ADD UNIQUE INDEX shop(`shopId`,`time`);
+ALTER TABLE xhStatStudentMonth ADD UNIQUE INDEX shop(`shopId`,`time`);
+ALTER TABLE `xhAdmin` CHANGE `nickName` `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '名称';
+ALTER TABLE `xhAdmin` DROP COLUMN `adminName`;
+ALTER TABLE `xhShopAdmin` CHANGE `adminName` `name` VARCHAR(80) NOT NULL DEFAULT '' COMMENT '姓名';
+ALTER TABLE `xhPtAdmin` CHANGE `adminName` `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '管理员姓名';
+ALTER TABLE xhApply DROP COLUMN `nickName`;
+ALTER TABLE `xhUser` CHANGE `nickName` `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '名称';
+ALTER TABLE `xhUser` DROP COLUMN `userName`;
+ALTER TABLE `xhUser` DROP COLUMN `realName`;