ghs

biz-ghs/admin/classes/AdminClass.php

@@ -11,7 +11,7 @@ use bizGhs\base\classes\BaseClass;
 class AdminClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\admin\models\Admin';
+	public static $baseFile = '\bizGhs\admin\models\Admin';
 	
 	//收益通知人
 	public static $noticeAdmin = [

biz-ghs/admin/classes/AdminLogClass.php

@@ -12,7 +12,7 @@ use bizGhs\base\classes\BaseClass;
 class AdminLogClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\admin\models\AdminLog';
+	public static $baseFile = '\bizGhs\admin\models\AdminLog';
 	
 	public static function groupBaseInfo($list)
 	{

biz-ghs/admin/classes/AdminRoleAuthClass.php

@@ -8,6 +8,6 @@ use bizGhs\base\classes\BaseClass;
 class AdminRoleAuthClass extends BaseClass
 {
 
-	public static $baseFile = '\biz\admin\models\AdminRoleAuth';
+	public static $baseFile = '\bizGhs\admin\models\AdminRoleAuth';
 
 }

biz-ghs/admin/classes/AdminRoleClass.php

@@ -9,7 +9,7 @@ use bizGhs\base\classes\BaseClass;
 class AdminRoleClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\admin\models\AdminRole';
+	public static $baseFile = '\bizGhs\admin\models\AdminRole';
 	
 	//验证权限 shish 2019.12.9
 	public static function valid($role, $merchantId)

biz-ghs/admin/classes/ShopAdminClass.php

@@ -10,7 +10,7 @@ use bizGhs\base\classes\BaseClass;
 class ShopAdminClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\admin\models\ShopAdmin';
+	public static $baseFile = '\bizGhs\admin\models\ShopAdmin';
 	
 	const GENERATE_ADMIN_DATA = 'generate_admin_data_';//创建管理员需要的数据
 	

biz-ghs/admin/models/AdminLog.php

@@ -7,7 +7,7 @@ class AdminLog extends Base
 
 	public static function tableName()
 	{
-		return 'xhAdminLog';
+		return 'xhGhsAdminLog';
 	}
 
 }

biz-ghs/admin/models/AdminRole.php

@@ -7,7 +7,7 @@ class AdminRole extends Base
 	
 	public static function tableName()
 	{
-		return 'xhAdminRole';
+		return 'xhGhsAdminRole';
 	}
 
 }

biz-ghs/admin/models/AdminRoleAuth.php

@@ -7,7 +7,7 @@ class AdminRoleAuth extends Base
 	
 	public static function tableName()
 	{
-		return 'xhAdminRoleAuth';
+		return 'xhGhsAdminRoleAuth';
 	}
 
 }

biz-ghs/admin/models/ShopAdmin.php

@@ -9,7 +9,7 @@ class ShopAdmin extends Base
 	
 	public static function tableName()
 	{
-		return 'xhShopAdmin';
+		return 'xhGhsShopAdmin';
 	}
 	
 }

biz-ghs/admin/services/AdminLogService.php

@@ -16,7 +16,7 @@ use Yii;
 class AdminLogService extends BaseService
 {
 
-	public static $baseFile = '\biz\admin\classes\AdminLogClass';
+	public static $baseFile = '\bizGhs\admin\classes\AdminLogClass';
 
 	//获取客户列表 shish 2019.11.30
 	public static function getLogList($where)

biz-ghs/admin/services/AdminRoleAuthService.php

@@ -9,7 +9,7 @@ use Yii;
 class AdminRoleAuthService extends BaseService
 {
 
-    public static $baseFile = '\biz\admin\classes\AdminRoleAuthClass';
+    public static $baseFile = '\bizGhs\admin\classes\AdminRoleAuthClass';
 
     //角色在业务端的权限 shish 2019.11.25
     public static function getAuthIdList($roleId, $endId)

biz-ghs/admin/services/AdminRoleService.php

@@ -9,7 +9,7 @@ use Yii;
 class AdminRoleService extends BaseService
 {
 	
-	public static $baseFile = '\biz\admin\classes\AdminRoleClass';
+	public static $baseFile = '\bizGhs\admin\classes\AdminRoleClass';
 	
 	public static function valid($role, $merchantId)
 	{

biz-ghs/admin/services/AdminService.php

@@ -16,7 +16,7 @@ use Yii;
 class AdminService extends BaseService
 {
 
-    public static $baseFile = '\biz\admin\classes\AdminClass';
+    public static $baseFile = '\bizGhs\admin\classes\AdminClass';
 
     public static function generateSessionId($account)
     {

biz-ghs/admin/services/ShopAdminService.php

@@ -21,7 +21,7 @@ use Yii;
 class ShopAdminService extends BaseService
 {
 	
-	public static $baseFile = '\biz\admin\classes\ShopAdminClass';
+	public static $baseFile = '\bizGhs\admin\classes\ShopAdminClass';
 	
 	///创建管理员生成小程序 shish 2020.4.17
 	public static function prepareBindAdmin($data)
@@ -36,7 +36,7 @@ class ShopAdminService extends BaseService
 		$imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
 		return ['miniCode' => $imgUrl];
 	}
-	
+
 	public static function generateAdmin($data)
 	{
 		$recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;

sql.sql

@@ -142,4 +142,47 @@ CREATE TABLE IF NOT EXISTS `xhGhsAdmin` (
   `loginTime` int(11) NOT NULL DEFAULT '0' COMMENT '最后登陆时间',
   `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`)
-)COMMENT='供货商管理员表';
+)COMMENT='供货商管理员表';
+drop table if exists `xhGhsShop`;
+CREATE TABLE `xhGhsShop` (
+  `id` bigint(11) NOT NULL AUTO_INCREMENT,
+  `avatar` varchar(500) NOT NULL DEFAULT '' COMMENT '门店照片；门店头像',
+  `shopName` varchar(100) NOT NULL DEFAULT '' COMMENT '门店名称',
+  `merchantName` varchar(100) NOT NULL DEFAULT '' COMMENT '商家名称',
+  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '商户id',
+  `lat` varchar(20) NOT NULL DEFAULT '' COMMENT '纬度',
+  `long` varchar(20) NOT NULL DEFAULT '' COMMENT '经度',
+  `province` varchar(100) NOT NULL DEFAULT '' COMMENT '省',
+  `city` varchar(100) NOT NULL DEFAULT '' COMMENT '市',
+  `dist` varchar(100) NOT NULL DEFAULT '' COMMENT '区县',
+  `address` varchar(500) NOT NULL DEFAULT '' COMMENT '街道地址',
+  `floor` varchar(50) NOT NULL DEFAULT '' COMMENT '楼号门牌号',
+  `fullAddress` varchar(500) NOT NULL DEFAULT '' COMMENT '完整地址',
+  `telephone` varchar(20) NOT NULL DEFAULT '' COMMENT '电话',
+  `openTime` varchar(30) NOT NULL DEFAULT '' COMMENT '营业时间',
+  `introduction` varchar(800) DEFAULT '' COMMENT '简介',
+  `gatheringCode` varchar(500) NOT NULL DEFAULT '' COMMENT '收款的二维码',
+  `applyMemberCode` varchar(500) NOT NULL DEFAULT '' COMMENT '注册会员码',
+  `totalIncome` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计收入',
+  `default` tinyint(4) NOT NULL DEFAULT '0' COMMENT '默认门店 0不是 1是，默认门店不能删除',
+  `delStatus` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除状态 0没有删除 1已删除',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '门店状态 0停用 1正常',
+  `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间，时间戳格式',
+  `createTime` datetime NOT NULL COMMENT '创建时间',
+  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) comment='供货商门店';
+drop table if exists `xhGhsShopAdmin`;
+CREATE TABLE if not exists `xhGhsShopAdmin` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `adminId` int(11) NOT NULL DEFAULT '0' COMMENT '管理员id',
+  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `shopId` int(11) NOT NULL DEFAULT '0' COMMENT '门店id',
+  `remind` tinyint(4) NOT NULL DEFAULT '0' COMMENT '动态提醒 0不需要 1需要',
+  `roleId` int(11) NOT NULL DEFAULT '0' COMMENT '角色id',
+  `default` tinyint(4) NOT NULL DEFAULT '0' COMMENT '默认管理的门店 1是 0否',
+  `delStatus` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除状态 0正常 1已删除',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态 0停用 1正常',
+  `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+  PRIMARY KEY (`id`)
+) COMMENT='供货商员工';