merchantId to sjId

app-hd/controllers/OrderController.php

@@ -458,7 +458,7 @@ class OrderController extends BaseController
             $timeout_express = "1m";//超时时间
 
             $capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
-            $passBackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $sjId;//将流水类型、优惠卷传过去
+            $passBackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&sjId=' . $sjId;//将流水类型、优惠卷传过去
             $passBackParams = urlencode($passBackParams);
 
             $payRequestBuilder = new \AlipayTradeWapPayContentBuilder();

app-mall/controllers/OrderController.php

@@ -367,7 +367,7 @@ class OrderController extends BaseController
             $timeout_express = "1m";//超时时间
 
             $capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
-            $passBackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $sjId;//将流水类型、优惠卷传过去
+            $passBackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&sjId=' . $sjId;//将流水类型、优惠卷传过去
             $passBackParams = urlencode($passBackParams);
 
             $payRequestBuilder = new \AlipayTradeWapPayContentBuilder();

app-pt/controllers/WxController.php

@@ -541,7 +541,7 @@ class WxController extends PublicController
 				$adminId = $merchant['adminId'];
 				$admin = xhAdminService::getById($adminId);
 				if (empty($admin)) {
-					Yii::warning("没有管理员,merchantId:" . $sjId);
+					Yii::warning("没有管理员,sjId:" . $sjId);
 					util::end();
 				}
 				$adminOpenId = $admin['openId'];

biz-ghs/item/classes/ItemClassClass.php

@@ -41,7 +41,7 @@ class ItemClassClass extends BaseClass
             util::fail("请输入花材分类");
         }
 
-        //判断花材名称是否存在（当前merchantId下）
+        //判断花材名称是否存在（当前sjId下）
         $exist = self::exists(['sjId'=>$sjId,'name'=>$name]);
         if($exist){
             util::fail("花材分类名称已存在");

biz-ghs/product/classes/ProductClass.php

@@ -455,7 +455,7 @@ class ProductClass extends BaseClass
             }
         }
 
-        //获取merchantId 下 对应的itemId=>stockWaring
+        //获取sjId 下 对应的itemId=>stockWaring
         $itemData = ItemClass::getAllList("itemId,stockWarning", ['sjId' => $sjId]);
         $itemStockWaring = [];
         if ($itemData) {

biz-ghs/stock/services/StockRecordService.php

@@ -11,7 +11,7 @@ class StockRecordService extends BaseService
     //采购订单流水记录
 
     /**
-     * @param $data  merchantId,shopId,orderSn,itemId,itemNum,oldStock(原库存)，newStock（订单完成后新库存）
+     * @param $data  sjId,shopId,orderSn,itemId,itemNum,oldStock(原库存)，newStock（订单完成后新库存）
      * @return mixed
      */
     public static function addPurchaseOrderRecord($data)

biz-hd/item/classes/ItemClassClass.php

@@ -32,7 +32,7 @@ class ItemClassClass extends BaseClass
             util::fail("请输入花材分类");
         }
 
-        //判断花材名称是否存在（当前merchantId下）
+        //判断花材名称是否存在（当前sjId下）
         $exist = self::exists(['sjId'=>$sjId,'name'=>$name]);
         if($exist){
             util::fail("花材分类名称已存在");

biz-hd/promote/services/CouponService.php

@@ -220,7 +220,7 @@ class CouponService extends BaseService
 		/**列出首次、二次和三次的卷**/
 		$commonCoupon = CouponModelService::getCommonCoupon();
 		if (count($commonCoupon) != 3) {
-			Yii::info('merchantId:' . $sjId . '还没有设置通用卷（首次卷、二次卷、三次卷）');
+			Yii::info('sjId:' . $sjId . '还没有设置通用卷（首次卷、二次卷、三次卷）');
 			return false;
 		}
 		$userInfo = UserService::getById($userId);

biz-hd/user/services/UserService.php

@@ -227,7 +227,7 @@ class UserService extends BaseService
     //添加新客户 ssh 2020.1.10
     public static function addUser($data)
     {
-        //merchantId $source $realName $member $growth $balance $mobile
+        //sjId $source $realName $member $growth $balance $mobile
         //必传参数
         validate::easyCheck(['sjId', 'mobile'], $data);
 

biz-hd/wx/services/WxSceneService.php

@@ -58,7 +58,7 @@ class WxSceneService extends BaseService
 		$sjId = $merchant['id'];
 		$info = self::getByCondition(['sjId' => $sjId, 'sceneId' => (string)$sceneId], true);
 		if (empty($info)) {
-			Yii::info('merchantId:' . $sjId . ' sceneId:' . $sceneId . '没有找到场景信息');
+			Yii::info('sjId:' . $sjId . ' sceneId:' . $sceneId . '没有找到场景信息');
 			return false;
 		}
 		//刮刮卡

biz-mall/promote/services/CouponService.php

@@ -220,7 +220,7 @@ class CouponService extends BaseService
 		/**列出首次、二次和三次的卷**/
 		$commonCoupon = CouponModelService::getCommonCoupon();
 		if (count($commonCoupon) != 3) {
-			Yii::info('merchantId:' . $sjId . '还没有设置通用卷（首次卷、二次卷、三次卷）');
+			Yii::info('sjId:' . $sjId . '还没有设置通用卷（首次卷、二次卷、三次卷）');
 			return false;
 		}
 		$userInfo = UserService::getById($userId);

biz-mall/user/services/UserService.php

@@ -214,7 +214,7 @@ class UserService extends BaseService
 	//添加新客户 ssh 2020.1.10
 	public static function addUser($data)
 	{
-		//merchantId $source $realName $member $growth $balance $mobile
+		//sjId $source $realName $member $growth $balance $mobile
 		//必传参数
 		validate::easyCheck(['sjId', 'mobile'], $data);
 		

biz-mall/wx/services/WxSceneService.php

@@ -58,7 +58,7 @@ class WxSceneService extends BaseService
 		$sjId = $merchant['id'];
 		$info = self::getByCondition(['sjId' => $sjId, 'sceneId' => (string)$sceneId], true);
 		if (empty($info)) {
-			Yii::info('merchantId:' . $sjId . ' sceneId:' . $sceneId . '没有找到场景信息');
+			Yii::info('sjId:' . $sjId . ' sceneId:' . $sceneId . '没有找到场景信息');
 			return false;
 		}
 		//刮刮卡

common/components/miniUtil.php

@@ -753,7 +753,7 @@ class miniUtil
                 }
                 return $miniAccessToken;
             }
-            Yii::info('accessToken失效：merchantId:' . $sjId);
+            Yii::info('accessToken失效：sjId:' . $sjId);
         }
         return $miniAccessToken;
     }

common/components/wxUtil.php

@@ -749,7 +749,7 @@ class wxUtil
                 }
                 return $miniAccessToken;
             }
-            Yii::info('accessToken失效：merchantId:' . $sjId);
+            Yii::info('accessToken失效：sjId:' . $sjId);
         }
         Yii::info('有效小程序 accesstoken:' . $miniAccessToken);
         return $miniAccessToken;

common/services/xhAllOrderService.php

@@ -34,7 +34,7 @@ class xhAllOrderService {
     /**
      * 通过ID获取数据
      * @param $id
-     * @param int $sjId 商户号  --  默认为0; 当不为0时，会与订单的merchantId进行校验(必须要相同)
+     * @param int $sjId 商户号  --  默认为0; 当不为0时，会与订单的sjId进行校验(必须要相同)
      * @return array|null|\yii\db\ActiveRecord
      */
     public static function getById($id, $sjId=0)

common/services/xhMerchantAssetService.php

@@ -36,12 +36,12 @@ class xhMerchantAssetService
     {
         set_time_limit(0);
         //计算总收入
-        $income = Yii::$app->db->createCommand("SELECT SUM(amount) as totalIncome FROM xhSjCapital WHERE io=1 and merchantId={$sjId}")->queryOne();
+        $income = Yii::$app->db->createCommand("SELECT SUM(amount) as totalIncome FROM xhSjCapital WHERE io=1 and sjId={$sjId}")->queryOne();
         $totalIncome = $income['totalIncome'];
         //计算总粉丝数
         $totalFans = xhUser::find()->andWhere(['subscribe' => 1, 'sjId' => $sjId])->count('id');
         //计算访问总量
-        $visit = Yii::$app->db->createCommand("SELECT SUM(riseNum) as num FROM xhStatVisitByDay WHERE merchantId={$sjId}")->queryOne();
+        $visit = Yii::$app->db->createCommand("SELECT SUM(riseNum) as num FROM xhStatVisitByDay WHERE sjId={$sjId}")->queryOne();
         $totalVisit = $visit['num'];
         //计算总交易量
         $totalDeal = xhSjCapital::find()->andWhere(['io' => 1, 'sjId' => $sjId])->count('id');

common/services/xhOrderService.php

@@ -38,7 +38,7 @@ class xhOrderService
 	/**
 	 * 通过ID获取数据
 	 * @param $id
-	 * @param int $sjId 商户号  --  默认为0; 当不为0时，会与订单的merchantId进行校验(必须要相同)
+	 * @param int $sjId 商户号  --  默认为0; 当不为0时，会与订单的sjId进行校验(必须要相同)
 	 * @return array|null|\yii\db\ActiveRecord
 	 */
 	public static function getById($id, $sjId = 0)

console/controllers/UpgradeController.php

@@ -87,7 +87,7 @@ ALTER TABLE xhAdminRole CHANGE authority auth VARCHAR(500) NOT NULL DEFAULT '' C
 		$sql = "ALTER TABLE xhOrder MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '订单状态 0待付款 1待配送 2配送中 3待通知 4已取消 5已完成';";
 		$sql .= "update xhOrder set `status`=5;";
 		$sql .= "DROP TABLE IF EXISTS xhCategoryRelate;
-ALTER TABLE xhCategory ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER parentId;
+ALTER TABLE xhCategory ADD sjId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER parentId;
 DROP TABLE IF EXISTS xhGoodsUsage;
 DROP TABLE IF EXISTS xhUsage;
 DROP TABLE IF EXISTS xhUsageRelation;
@@ -98,12 +98,12 @@ RENAME TABLE xhGoodsPrice TO xhGoodsStyle;
 ALTER TABLE xhGoodsStyle COMMENT '商品款式';
 ALTER TABLE xhGoodsStyle ADD goodsId INT NOT NULL DEFAULT 0 COMMENT '商品id' AFTER `id`;
 DROP TABLE IF EXISTS `xhGoodsUsage`;
-ALTER TABLE xhOrder ADD INDEX merchant(merchantId,`status`);
+ALTER TABLE xhOrder ADD INDEX merchant(sjId,`status`);
 ALTER TABLE xhOrder ADD INDEX userId(userId,`status`);
 ALTER TABLE xhUserAsset ADD inviteNum INT NOT NULL DEFAULT 0 COMMENT '邀请新人数量' AFTER `discount`;
 ALTER TABLE xhAdmin MODIFY `password` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '密码';
 ALTER TABLE xhAdmin MODIFY `payPassword` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '确认密码';
-ALTER TABLE `xhUser` ADD INDEX mobile(merchantId,`mobile`);
+ALTER TABLE `xhUser` ADD INDEX mobile(sjId,`mobile`);
 ALTER TABLE xhUserAsset DROP COLUMN `point`;
 ALTER TABLE xhUserAsset MODIFY `integral` INT NOT NULL DEFAULT 0 COMMENT '积分';
 ALTER TABLE xhUser MODIFY birthday DATE NOT NULL DEFAULT '0000-00-00' COMMENT '生日';
@@ -130,7 +130,7 @@ DROP TABLE IF EXISTS xhAd;
 CREATE TABLE IF NOT EXISTS xhAd(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 `adName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '广告名称',
-`merchantId` INT NOT NULL DEFAULT 0 COMMENT '商家id',
+`sjId` INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `type` TINYINT NOT NULL DEFAULT 0 COMMENT '广告类型 0商城首页轮播图 1门店轮播图',
 `style` TINYINT NOT NULL DEFAULT 0 COMMENT '0 url 1商品id',
 `url` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '链接',
@@ -139,25 +139,25 @@ id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 `endTime` INT NOT NULL DEFAULT 0 COMMENT '结束时间，方便查询，永不过期 使用值4102416000即2100-01-01 00:00:00',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 )COMMENT='广告管理';
-ALTER TABLE xhAd ADD INDEX `merchantId`(`merchantId`,`endTime`);
+ALTER TABLE xhAd ADD INDEX `sjId`(`sjId`,`endTime`);
 DROP TABLE IF EXISTS `xhCategoryRelate`;
 ALTER TABLE xhCategory ADD indexShow TINYINT NOT NULL DEFAULT 0 COMMENT '首页上显示 0不显示 1显示' AFTER categoryName;
 ALTER TABLE xhCategory ADD menuShow TINYINT NOT NULL DEFAULT 0 COMMENT '菜单显示 0不显示 1显示' AFTER `indexShow`;
-ALTER TABLE xhCategory ADD INDEX indexShow(merchantId,indexShow);
-ALTER TABLE xhCategory ADD INDEX menuShow(merchantId,menuShow);
+ALTER TABLE xhCategory ADD INDEX indexShow(sjId,indexShow);
+ALTER TABLE xhCategory ADD INDEX menuShow(sjId,menuShow);
 ALTER TABLE xhAd ADD adImg VARCHAR(800) NOT NULL DEFAULT '' COMMENT '广告图' AFTER adName;
 ALTER TABLE xhAd MODIFY endTime INT NOT NULL DEFAULT 0 COMMENT '结束时间；方便查询，永不过期情况，使用 开始值0 结束值4102416000即2100-01-01 00:00:00';
 ALTER TABLE xhGoodsCategory MODIFY `cId` INT NOT NULL DEFAULT 0 COMMENT '分类id';
 ALTER TABLE xhGoods DROP COLUMN `categoryId`;
-ALTER TABLE xhGoodsCategory ADD INDEX merchantId(merchantId);
+ALTER TABLE xhGoodsCategory ADD INDEX sjId(sjId);
 ALTER TABLE xhCategory DROP COLUMN `indexShow`;
 ALTER TABLE xhCategory DROP COLUMN `menuShow`;
 ALTER TABLE xhCategory ADD `status` TINYINT NOT NULL DEFAULT 0 COMMENT '状态 0停用1启用';
 ALTER TABLE xhCategory DROP INDEX `indexShow`;
 ALTER TABLE xhCategory DROP INDEX `menuShow`;
-ALTER TABLE xhCategory ADD INDEX merchantId(merchantId,`status`);
-ALTER TABLE xhGoodsCategory DROP INDEX merchantId;
-ALTER TABLE xhGoodsCategory ADD INDEX merchantId(merchantId,cId);
+ALTER TABLE xhCategory ADD INDEX sjId(sjId,`status`);
+ALTER TABLE xhGoodsCategory DROP INDEX sjId;
+ALTER TABLE xhGoodsCategory ADD INDEX sjId(sjId,cId);
 ALTER TABLE xhGoods DROP COLUMN `cover`;
 ALTER TABLE xhGoods ADD sendType TINYINT NOT NULL DEFAULT 0 COMMENT '配送方式 0需要配送 1到店自提' AFTER sendArea;
 ALTER TABLE xhGoods ADD freightType TINYINT NOT NULL DEFAULT 0 COMMENT '运费计算方式，0按距离计算 1免运费' AFTER sendType;
@@ -175,7 +175,7 @@ ALTER TABLE xhCoupon CHANGE howToGet getType TINYINT NOT NULL DEFAULT 0 COMMENT
 ALTER TABLE xhCoupon DROP COLUMN `targetId`;
 ALTER TABLE xhCoupon MODIFY deadline INT NOT NULL DEFAULT 0 COMMENT '过期时间；值4102416000表示永不过期，即2100-01-01 00:00:00';
 ALTER TABLE xhCoupon ADD INDEX userId(userId,`status`);
-ALTER TABLE xhCoupon ADD INDEX merchantId(merchantId,`status`);";
+ALTER TABLE xhCoupon ADD INDEX sjId(sjId,`status`);";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$sql = "ALTER TABLE xhGoods CHANGE `style` `goodsStyle` TINYINT NOT NULL DEFAULT 0 COMMENT '商品款式 0单款式 1多款式';
@@ -228,7 +228,7 @@ ALTER TABLE xhAd ADD `forever` TINYINT NOT NULL DEFAULT 0 COMMENT '永久有效
 DROP TABLE IF EXISTS xhPic;
 CREATE TABLE IF NOT EXISTS xhPic(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 img VARCHAR(500) NOT NULL DEFAULT '' COMMENT '图片地址',
 price DECIMAL(9,2) NOT NULL DEFAULT 0.00 COMMENT '价格',
 `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商品名称',
@@ -237,14 +237,14 @@ price DECIMAL(9,2) NOT NULL DEFAULT 0.00 COMMENT '价格',
 DROP TABLE IF EXISTS xhPicCategory;
 CREATE TABLE IF NOT EXISTS xhPicCategory(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 pictureId INT NOT NULL DEFAULT 0 COMMENT '图片id',
 categoryId INT NOT NULL DEFAULT 0 COMMENT '分类id'
 )COMMENT='商品图与分类关系';
 ALTER TABLE xhPic ADD inTurn INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER `name`;
 ALTER TABLE xhPicCategory ADD inTurn INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER categoryId;
 ALTER TABLE xhPicCategory CHANGE pictureId picId INT NOT NULL DEFAULT 0 COMMENT '图片id';
-ALTER TABLE xhGoodsCategory ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '上下架状态 0下架 1正常' AFTER `merchantId`;
+ALTER TABLE xhGoodsCategory ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '上下架状态 0下架 1正常' AFTER `sjId`;
 ALTER TABLE xhCategory ADD goodsNum INT NOT NULL DEFAULT 0 COMMENT '商品数' AFTER `cover`;
 ALTER TABLE xhCategory ADD sold INT NOT NULL DEFAULT 0 COMMENT '销量' AFTER `goodsNum`;
 ALTER TABLE xhCategory CHANGE cover `img` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '分类图片';";
@@ -258,15 +258,15 @@ ALTER TABLE xhGoodsSetting DROP COLUMN `createTime`;
 ALTER TABLE xhGoodsSetting DROP COLUMN `updateTime`;
 ALTER TABLE xhMerchantExtend DROP COLUMN `createTime`;
 ALTER TABLE xhMerchantExtend DROP COLUMN `updateTime`;
-ALTER TABLE xhGoodsSetting ADD riseSwitch TINYINT NOT NULL DEFAULT 1 COMMENT '自动涨价开关 1开启 0关闭' AFTER `merchantId`;
+ALTER TABLE xhGoodsSetting ADD riseSwitch TINYINT NOT NULL DEFAULT 1 COMMENT '自动涨价开关 1开启 0关闭' AFTER `sjId`;
 ALTER TABLE xhAdmin DROP COLUMN `openId`;
 ALTER TABLE xhAdmin DROP COLUMN `unionId`;
 ALTER TABLE xhAdmin DROP COLUMN `subscribe`;
 ALTER TABLE xhAdmin DROP COLUMN `wxQrCode`;
 ALTER TABLE xhAdmin MODIFY `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状态 0停用 1正常';
-ALTER TABLE xhAdmin ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `roleId`;
+ALTER TABLE xhAdmin ADD sjId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `roleId`;
 DROP TABLE IF EXISTS `xhAdminToMerchant`;
-ALTER TABLE xhAdmin ADD userId INT NOT NULL DEFAULT 0 COMMENT '员工关联的userId' AFTER merchantId;
+ALTER TABLE xhAdmin ADD userId INT NOT NULL DEFAULT 0 COMMENT '员工关联的userId' AFTER sjId;
 ALTER TABLE xhAdmin ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `status`;
 ALTER TABLE xhAdmin DROP COLUMN `createTime`;
 ALTER TABLE xhAdmin DROP COLUMN `updateTime`;
@@ -278,17 +278,17 @@ ALTER TABLE xhAdmin DROP COLUMN `addLong`;
 ALTER TABLE xhAdmin DROP COLUMN `addLat`;
 ALTER TABLE xhAdmin DROP COLUMN `addPrecision`;
 ALTER TABLE xhAdmin ADD incomeNotice TINYINT NOT NULL DEFAULT 0 COMMENT '收入通知 0不需要 1需要' AFTER `currentShopId`;
-ALTER TABLE xhAdminRole ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `merchantId`;
+ALTER TABLE xhAdminRole ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `sjId`;
 ALTER TABLE xhAdminRole DROP COLUMN `createTime`;
 ALTER TABLE xhAdminRole DROP COLUMN `updateTime`;
 ALTER TABLE xhAdmin DROP COLUMN `avatar`;
 ALTER TABLE xhAdmin ADD loginTime INT NOT NULL DEFAULT 0 COMMENT '最后登陆时间' AFTER `status`;
 ALTER TABLE xhAdmin ADD `super` TINYINT NOT NULL DEFAULT 0 COMMENT '是否超级管理员 0不是 1是，超级员工不可删除' AFTER `sex`;
-ALTER TABLE xhAdminRole ADD `num` INT NOT NULL DEFAULT 0 COMMENT '成员数' AFTER `merchantId`;
+ALTER TABLE xhAdminRole ADD `num` INT NOT NULL DEFAULT 0 COMMENT '成员数' AFTER `sjId`;
 CREATE TABLE xhAdminLog(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 `ip` BIGINT NOT NULL DEFAULT 0 COMMENT 'ip地址',
-`merchantId` INT NOT NULL DEFAULT 0 COMMENT '商家id',
+`sjId` INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `content` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '操作内容',
 adminId INT NOT NULL DEFAULT 0 COMMENT '员工id；管理员id',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
@@ -299,7 +299,7 @@ adminId INT NOT NULL DEFAULT 0 COMMENT '员工id；管理员id',
 DROP TABLE IF EXISTS `xhCouponAsset`;
 CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 totalNum INT NOT NULL DEFAULT 0 COMMENT '优惠券总数',
 unUseNum INT NOT NULL DEFAULT 0 COMMENT '未使用数',
 useNum INT NOT NULL DEFAULT 0 COMMENT '已使用数',
@@ -309,7 +309,7 @@ invalidNum INT NOT NULL DEFAULT 0 COMMENT '失效数',
 DROP TABLE IF EXISTS `xhInvite`;
 CREATE TABLE IF NOT EXISTS `xhInvite`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `userName` varchar(50) NOT NULL DEFAULT '' COMMENT '邀请人的昵称',
 mobile VARCHAR(20) NOT NULL DEFAULT '' COMMENT '邀请人手机号',
 userId INT NOT NULL DEFAULT 0 COMMENT '受邀人',
@@ -323,7 +323,7 @@ orderTime INT NOT NULL DEFAULT 0 COMMENT '下单时间',
 DROP TABLE IF EXISTS xhInviteAsset;
 CREATE TABLE IF NOT EXISTS `xhInviteAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 switch TINYINT NOT NULL DEFAULT 1 COMMENT '是否开启邀请有礼 0关闭 1开启。默认开启',
 amount INT NOT NULL DEFAULT 0 COMMENT '新人领券金额',
 miniCost INT NOT NULL DEFAULT 0 COMMENT '最低消费',
@@ -377,9 +377,9 @@ id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 )COMMENT='申请试用';
 ALTER TABLE xhWxScene MODIFY `type` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '场景类型 0刮刮卡 1邀请有礼领券';
 ALTER TABLE xhShop ADD `openTime` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '营业时间' AFTER `telephone`;
-ALTER TABLE `xhAd` DROP INDEX `merchantId`;
-ALTER TABLE `xhAd` ADD INDEX `merchantId`(`merchantId`,`type`);
-ALTER TABLE `xhAd` ADD INDEX `multiple`(`merchantId`,`type`,`status`,`startTime`,`endTime`);
+ALTER TABLE `xhAd` DROP INDEX `sjId`;
+ALTER TABLE `xhAd` ADD INDEX `sjId`(`sjId`,`type`);
+ALTER TABLE `xhAd` ADD INDEX `multiple`(`sjId`,`type`,`status`,`startTime`,`endTime`);
 DELETE FROM `xhAd`;
 ALTER TABLE `xhAd` MODIFY `startTime` INT NOT NULL DEFAULT 0 COMMENT '开始时间';
 ALTER TABLE `xhAd` MODIFY `endTime` INT NOT NULL DEFAULT 0 COMMENT '结束时间；方便查询，永不过期情况，使用 开始值0 结束值4102416000即2100-01-01 00:00:00';
@@ -442,7 +442,7 @@ ALTER TABLE xhOrder MODIFY currentFlow TINYINT NOT NULL DEFAULT 0 COMMENT '完
 drop table if exists `xhStatIncomeUsage`;
 CREATE TABLE if not exists `xhStatIncomeUsage` (
   `id` int(11) NOT NULL auto_increment primary key,
-  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `shopId` int not null default 0 comment '门店id,0表示商家所有门店',
   `time` int(11) NOT NULL DEFAULT '0' COMMENT '时间',
   `usageId` tinyint(4) NOT NULL DEFAULT '0' COMMENT '用途id；UsageRelation id',
@@ -465,7 +465,7 @@ CREATE TABLE if not exists `xhStatIncomeUsageMonth` (
   `alipay` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '支付宝收入',
   `balancePay` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '余额付款收入',
   `cash` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '现金收入',
-  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
 `shopId` int not null default 0 comment '门店id,0表示商家所有门店',
   `addTime` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '添加时间'
 ) COMMENT='按用途统计每月收入';
@@ -479,7 +479,7 @@ ALTER TABLE `xhInvite` ADD giveTime INT NOT NULL DEFAULT 0 COMMENT '兑奖时间
 		$sql = "DROP TABLE IF EXISTS `xhCouponAsset`;
 CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `switch` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '是否开启邀请有礼 0关闭 1开启。默认开启',
   `amount` INT(11) NOT NULL DEFAULT '0' COMMENT '新人领券金额',
   `miniCost` INT(11) NOT NULL DEFAULT '0' COMMENT '最低消费',
@@ -492,7 +492,7 @@ ALTER TABLE `xhWxMenu` ADD targetId INT NOT NULL DEFAULT 0 COMMENT '常用链接
 CREATE TABLE `xhUserRemark`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 userId INT NOT NULL DEFAULT 0 COMMENT '用户id',
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 remark VARCHAR(200) NOT NULL DEFAULT '' COMMENT '备注',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 )COMMENT='用户备注';
@@ -549,7 +549,7 @@ ALTER TABLE `xhMerchantExtend` ADD miniVersion INT NOT NULL DEFAULT 0 COMMENT '
 DROP TABLE IF EXISTS `xhMiniUpgrade`;
 CREATE TABLE `xhMiniUpgrade`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `version` INT NOT NULL DEFAULT 0 COMMENT '提交版本号',
 `submitTime` INT NOT NULL DEFAULT 0 COMMENT '提交时间',
 `checkTime` INT NOT NULL DEFAULT 0 COMMENT '审核时间',
@@ -615,7 +615,7 @@ CREATE TABLE if not exists `xhFest` (
 drop table if exists `xhFestRise`;
 CREATE TABLE `xhFestRise` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `festId` int(11) NOT NULL DEFAULT '0' COMMENT '节日',
   PRIMARY KEY (`id`)
 ) COMMENT='涨价节日';
@@ -634,7 +634,7 @@ ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `latitude`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `longitude`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `precision`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `openId`;
-ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `merchantId`;
+ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `sjId`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `userId`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `wxOpenId`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `unionId`;
@@ -644,7 +644,7 @@ ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `updateTime`;
 ALTER TABLE `xhWxOpenAdmin` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `status`;
 ALTER TABLE `xhWxOpenAdmin` MODIFY `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状态 0冻结 1正常';
 ALTER TABLE `xhRenew` DROP COLUMN `payStyle`;
-ALTER TABLE `xhRenew` MODIFY `merchantId` INT NOT NULL DEFAULT 0 COMMENT '续费的商家';
+ALTER TABLE `xhRenew` MODIFY `sjId` INT NOT NULL DEFAULT 0 COMMENT '续费的商家';
 ALTER TABLE xhRenew MODIFY `payWay` TINYINT NOT NULL DEFAULT 0 COMMENT '支付方式 0微信 1支付宝 2余额';
 DROP TABLE IF EXISTS `xhRenew`;
 CREATE TABLE IF NOT EXISTS `xhRenew` (
@@ -656,7 +656,7 @@ CREATE TABLE IF NOT EXISTS `xhRenew` (
   `actPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '实际付款，实价，修改后价格，打折后',
   `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '用户id',
   `alipayId` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '支付宝用户id',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '续费的商家',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '续费的商家',
   `remark` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '备注',
   `setId` SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '套餐id',
   `beforeDeadline` INT(11) NOT NULL DEFAULT '0' COMMENT '之前到期时间',
@@ -681,7 +681,7 @@ ALTER TABLE `xhApply` MODIFY `userId` INT NOT NULL DEFAULT 0 COMMENT '邀请花
 DROP TABLE IF EXISTS `xhAgentAsset`;
 CREATE TABLE IF NOT EXISTS `xhAgentAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 inviteNum INT NOT NULL DEFAULT 0 COMMENT '邀请花店数',
 payNum INT NOT NULL DEFAULT 0 COMMENT '付费花店数',
 income DECIMAL(9,2) NOT NULL DEFAULT 0.00 COMMENT '累计收益',
@@ -702,7 +702,7 @@ ALTER TABLE `xhUserAsset` DROP COLUMN `isMember`;
 ALTER TABLE `xhUser` DROP COLUMN `isMember`;
 ALTER TABLE `xhUser` ADD `member` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员' AFTER `source`;
 ALTER TABLE `xhGoods` ADD delStatus TINYINT NOT NULL DEFAULT 0 COMMENT '删除标识 0未删除 1删除' AFTER `riseAmount`;
-ALTER TABLE `xhGoodsCategory` ADD delStatus TINYINT NOT NULL DEFAULT 0 COMMENT '删除标识 0未删除 1已删除' AFTER `merchantId`;
+ALTER TABLE `xhGoodsCategory` ADD delStatus TINYINT NOT NULL DEFAULT 0 COMMENT '删除标识 0未删除 1已删除' AFTER `sjId`;
 DROP TABLE IF EXISTS `xhStatIn`;
 DROP TABLE IF EXISTS `xhStatInMonth`;
 ALTER TABLE `xhStatIncomeCategoryMonth` ADD `time` INT NOT NULL DEFAULT 0 COMMENT '月份' AFTER `id`;
@@ -722,7 +722,7 @@ CREATE TABLE `xhStatUserMonth` (
   `totalMemberNum` INT(11) NOT NULL DEFAULT '0' COMMENT '当前会员总数',
   `riseUserNum` INT(11) NOT NULL DEFAULT '0' COMMENT '访客数',
   `totalUserNum` INT(11) NOT NULL DEFAULT '0' COMMENT '当前访客总数',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`)
 ) COMMENT='客户月度统计';
@@ -839,7 +839,7 @@ ALTER TABLE `xhSjCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '收支
 				}
 			}
 		}
-		$sql = "ALTER TABLE `xhUserGrowth` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id';ALTER TABLE `xhAdminRoleAuth` ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `endId`;";
+		$sql = "ALTER TABLE `xhUserGrowth` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id';ALTER TABLE `xhAdminRoleAuth` ADD sjId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `endId`;";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$sql = "DROP TABLE IF EXISTS `xhInformAdmin`;
@@ -847,7 +847,7 @@ CREATE TABLE `xhInformAdmin` (
   `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '管理员userId',
   `adminId` INT(11) NOT NULL DEFAULT '0' COMMENT '管理员Id',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `noticeType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '类型',
   `content` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '内容',
   `noticeWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '通知方式 0微信1短信',
@@ -861,7 +861,7 @@ DROP TABLE IF EXISTS `xhInformUser`;
 CREATE TABLE `xhInformUser` (
   `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户id',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `noticeType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '类型',
   `content` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '内容',
   `noticeWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '通知方式 0微信1短信',
@@ -883,10 +883,10 @@ CREATE TABLE `xhStatView` (
   `time` INT(11) NOT NULL DEFAULT '0' COMMENT '时间戳',
   `riseNum` INT(11) NOT NULL DEFAULT '0' COMMENT '增加数量',
   `totalNum` INT(11) NOT NULL DEFAULT '0' COMMENT '总数量',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `addTime` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `num` (`merchantId`,`time`)
+  UNIQUE KEY `num` (`sjId`,`time`)
 ) COMMENT='每天增加访问次数，非访问ip数';
 DROP TABLE IF EXISTS `xhStatViewMonth`;
 CREATE TABLE `xhStatViewMonth` (
@@ -894,10 +894,10 @@ CREATE TABLE `xhStatViewMonth` (
   `time` INT(11) NOT NULL DEFAULT '0' COMMENT '月份',
   `riseNum` INT(11) NOT NULL DEFAULT '0' COMMENT '增加数量',
   `totalNum` INT(11) NOT NULL DEFAULT '0' COMMENT '总数量',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
 `addTime` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `num` (`merchantId`,`time`)
+  UNIQUE KEY `num` (`sjId`,`time`)
 ) COMMENT='每月增加访问次数，非访问ip数';";
 		Yii::$app->db->createCommand($sql)->execute();
 		
@@ -966,10 +966,10 @@ INSERT INTO xhAdminRole VALUES(683,'店长',12358,1,0,'*'),(684,'店长',12359,1
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$sql = "ALTER TABLE `xhAdmin` AUTO_INCREMENT=18532;
-UPDATE `xhAdmin` SET id=18531,merchantId=12361,roleId=686 WHERE id=5;
-UPDATE `xhAdmin` SET id=18530,merchantId=12360,roleId=685 WHERE id=4;
-UPDATE `xhAdmin` SET id=18529,merchantId=12359,roleId=684 WHERE id=3;
-UPDATE `xhAdmin` SET id=18528,merchantId=12358,roleId=683 WHERE id=1;";
+UPDATE `xhAdmin` SET id=18531,sjId=12361,roleId=686 WHERE id=5;
+UPDATE `xhAdmin` SET id=18530,sjId=12360,roleId=685 WHERE id=4;
+UPDATE `xhAdmin` SET id=18529,sjId=12359,roleId=684 WHERE id=3;
+UPDATE `xhAdmin` SET id=18528,sjId=12358,roleId=683 WHERE id=1;";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		//优惠券的资产信息
@@ -991,12 +991,12 @@ UPDATE `xhAdmin` SET id=18528,merchantId=12358,roleId=683 WHERE id=1;";
 		
 		//花美灵开放平台
 		if ($env == 'dev') {
-			$sql = "update `xhWxOpen` set appId='wxe4428cfe08fc74d6',openName='花美灵',appSecret='d87df5ef94f834f7dad186b85b663e34',merchantId=12359,adminId=18529,token='XH11464773308',verifyTicket='ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg',verifyTicketTime='2020-01-09 21:04:50',componentAccessToken='29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY',componentAccessTokenTime='2020-01-09 21:36:26',aesKey='Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',preAuthCode='preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2',preAuthCodeTime='2019-12-19 16:13:58',createTime='2019-04-17 14:49:19',updateTime='2020-03-05 15:00:00' where id=1;";
+			$sql = "update `xhWxOpen` set appId='wxe4428cfe08fc74d6',openName='花美灵',appSecret='d87df5ef94f834f7dad186b85b663e34',sjId=12359,adminId=18529,token='XH11464773308',verifyTicket='ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg',verifyTicketTime='2020-01-09 21:04:50',componentAccessToken='29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY',componentAccessTokenTime='2020-01-09 21:36:26',aesKey='Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5',preAuthCode='preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2',preAuthCodeTime='2019-12-19 16:13:58',createTime='2019-04-17 14:49:19',updateTime='2020-03-05 15:00:00' where id=1;";
 			Yii::$app->db->createCommand($sql)->execute();
 		}
 		//花掌柜开放平台
 		if ($env == 'test') {
-			$sql = "update `xhWxOpen` set appId='wx364800c320a0cf53',openName='花掌柜平台',appSecret='6a83bfa98f3ff5e66b1a85a19c54ebdb',merchantId=12359,adminId=18529,token='CS11464773309',verifyTicket='ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg',verifyTicketTime='2020-01-09 21:04:50',componentAccessToken='29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY',componentAccessTokenTime='2020-01-09 21:36:26',aesKey='hseBIikJaExAbi2acp1JGFbEs8Cb4mDEnyEYgl9zXWv',preAuthCode='preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2',preAuthCodeTime='2019-12-19 16:13:58',createTime='2019-04-17 14:49:19',updateTime='2020-03-05 15:00:00' where id=1;";
+			$sql = "update `xhWxOpen` set appId='wx364800c320a0cf53',openName='花掌柜平台',appSecret='6a83bfa98f3ff5e66b1a85a19c54ebdb',sjId=12359,adminId=18529,token='CS11464773309',verifyTicket='ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg',verifyTicketTime='2020-01-09 21:04:50',componentAccessToken='29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY',componentAccessTokenTime='2020-01-09 21:36:26',aesKey='hseBIikJaExAbi2acp1JGFbEs8Cb4mDEnyEYgl9zXWv',preAuthCode='preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2',preAuthCodeTime='2019-12-19 16:13:58',createTime='2019-04-17 14:49:19',updateTime='2020-03-05 15:00:00' where id=1;";
 			Yii::$app->db->createCommand($sql)->execute();
 		}
 		
@@ -1011,8 +1011,8 @@ ALTER TABLE `xhTMessage` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时
 		
 		//申请信息修改
 		$sql = "ALTER TABLE `xhApply` MODIFY `userId` INT NOT NULL DEFAULT 0 COMMENT '平台userId';
-ALTER TABLE `xhApply` CHANGE `oldId` introMerchantId INT NOT NULL DEFAULT 0 COMMENT '花店介绍人';
-ALTER TABLE `xhApply` CHANGE `newId` merchantId INT NOT NULL DEFAULT 0 COMMENT '新花店id；0表示还没审核通过';";
+ALTER TABLE `xhApply` CHANGE `oldId` introsjId INT NOT NULL DEFAULT 0 COMMENT '花店介绍人';
+ALTER TABLE `xhApply` CHANGE `newId` sjId INT NOT NULL DEFAULT 0 COMMENT '新花店id；0表示还没审核通过';";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		//门店省市区地址字段变更
@@ -1079,8 +1079,8 @@ ALTER TABLE `xhShop` ADD `default` TINYINT NOT NULL DEFAULT 0 COMMENT '默认门
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$sql = "ALTER TABLE `xhCategory` ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '删除状态 0未删除 1已删除' AFTER `inTurn`;
-ALTER TABLE `xhCategory` DROP INDEX `merchantId`;
-ALTER TABLE `xhCategory` ADD INDEX `merchant`(`merchantId`,`delStatus`);";
+ALTER TABLE `xhCategory` DROP INDEX `sjId`;
+ALTER TABLE `xhCategory` ADD INDEX `merchant`(`sjId`,`delStatus`);";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$sql = "ALTER TABLE `xhMerchantExtend` ADD miniAuth TINYINT NOT NULL DEFAULT 0 COMMENT '小程序授权 0未授权 1授权' AFTER `payment`;
@@ -1091,14 +1091,14 @@ ALTER TABLE `xhMerchantExtend` ADD openAppBind TINYINT NOT NULL DEFAULT 0 COMMEN
 		
 		//花美灵开放平台的公众号和第一个公众号
 		if ($env == 'dev') {
-			$sql = "update xhMerchant set name='花美灵' where id=12359;update xhShop set shopName='花美灵',name='花美灵',`status`=1 where merchantId=12359;
-update xhMerchant set name='中花卉' where id=12358;update xhShop set shopName='中花卉',name='中花卉' where merchantId=12358;";
+			$sql = "update xhMerchant set name='花美灵' where id=12359;update xhShop set shopName='花美灵',name='花美灵',`status`=1 where sjId=12359;
+update xhMerchant set name='中花卉' where id=12358;update xhShop set shopName='中花卉',name='中花卉' where sjId=12358;";
 			Yii::$app->db->createCommand($sql)->execute();
 		}
 		//花掌柜开放平台的公众号和第一个公众号
 		if ($env == 'test') {
-			$sql = "update xhMerchant set name='花掌柜' where id=12359;update xhShop set shopName='花掌柜',name='花掌柜',`status`=1 where merchantId=12359;
-update xhMerchant set name='花店宝' where id=12358;update xhShop set shopName='花店宝',name='花店宝' where merchantId=12358;";
+			$sql = "update xhMerchant set name='花掌柜' where id=12359;update xhShop set shopName='花掌柜',name='花掌柜',`status`=1 where sjId=12359;
+update xhMerchant set name='花店宝' where id=12358;update xhShop set shopName='花店宝',name='花店宝' where sjId=12358;";
 			Yii::$app->db->createCommand($sql)->execute();
 		}
 		
@@ -1114,21 +1114,21 @@ update xhMerchant set name='花店宝' where id=12358;update xhShop set shopName
 		$sql = "update xhShop set openTime='08:00-22:00',telephone='18030142050',lat='24.46886',`long`='118.10708',province='福建省',city='厦门市',address='福建省厦门市思明区后埭溪路128-5号' where id in(15681,15680);update xhShop set telephone='15280215347' where id=15681;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
-		$sql = "UPDATE xhMerchant SET wxAppId='',openAppId='' WHERE id IN(12359,12358);UPDATE xhMerchantExtend SET wxAppId='',openAppId='',wxAuth=0,miniAuth=0,init=0 WHERE merchantId IN(12359,12358);";
+		$sql = "UPDATE xhMerchant SET wxAppId='',openAppId='' WHERE id IN(12359,12358);UPDATE xhMerchantExtend SET wxAppId='',openAppId='',wxAuth=0,miniAuth=0,init=0 WHERE sjId IN(12359,12358);";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
 		//更换开发环境小程序的miniAppId、miniAppSecret
 		if ($env == 'dev') {
-			$sql = "UPDATE xhMerchant SET miniAppId='wxe41bd5816affd0ba',miniAppSecret='ad634457979bc6eb1fb0bc7f4f58d885' WHERE id=12358;UPDATE xhMerchantExtend SET miniAppId='wxe41bd5816affd0ba',wxPayInit=0,wxPayMerchantId='',wxPayKey='' WHERE merchantId=12358;";
+			$sql = "UPDATE xhMerchant SET miniAppId='wxe41bd5816affd0ba',miniAppSecret='ad634457979bc6eb1fb0bc7f4f58d885' WHERE id=12358;UPDATE xhMerchantExtend SET miniAppId='wxe41bd5816affd0ba',wxPayInit=0,wxPaysjId='',wxPayKey='' WHERE sjId=12358;";
 			Yii::$app->db->createCommand($sql)->execute($sql);
-			$sql = "UPDATE xhMerchant SET miniAppId='wxe4675bab299a52f7',miniAppSecret='12f90039b1245ba6abf2e4184462fb30' WHERE id=12359;UPDATE xhMerchantExtend SET miniAppId='wxe4675bab299a52f7',wxPayInit=0,wxPayMerchantId='',wxPayKey='' WHERE merchantId=12359;";
+			$sql = "UPDATE xhMerchant SET miniAppId='wxe4675bab299a52f7',miniAppSecret='12f90039b1245ba6abf2e4184462fb30' WHERE id=12359;UPDATE xhMerchantExtend SET miniAppId='wxe4675bab299a52f7',wxPayInit=0,wxPaysjId='',wxPayKey='' WHERE sjId=12359;";
 			Yii::$app->db->createCommand($sql)->execute($sql);
 		}
 		//更换测试环境小程序的miniAppId、miniAppSecret
 		if ($env == 'test') {
-			$sql = "UPDATE xhMerchant SET miniAppId='wx36ca6b1d6e9ca2a4',miniAppSecret='b8227c6264785a233e67293f13b1b7b3' WHERE id=12358;UPDATE xhMerchantExtend SET miniAppId='wx36ca6b1d6e9ca2a4',wxPayInit=0,wxPayMerchantId='',wxPayKey='' WHERE merchantId=12358;";
+			$sql = "UPDATE xhMerchant SET miniAppId='wx36ca6b1d6e9ca2a4',miniAppSecret='b8227c6264785a233e67293f13b1b7b3' WHERE id=12358;UPDATE xhMerchantExtend SET miniAppId='wx36ca6b1d6e9ca2a4',wxPayInit=0,wxPaysjId='',wxPayKey='' WHERE sjId=12358;";
 			Yii::$app->db->createCommand($sql)->execute($sql);
-			$sql = "UPDATE xhMerchant SET miniAppId='wx21b7c3ef12082099',miniAppSecret='fd21ef3ebbc70e89d5c3a5a3c013edb6' WHERE id=12359;UPDATE xhMerchantExtend SET miniAppId='wx21b7c3ef12082099',wxPayInit=0,wxPayMerchantId='',wxPayKey='' WHERE merchantId=12359;";
+			$sql = "UPDATE xhMerchant SET miniAppId='wx21b7c3ef12082099',miniAppSecret='fd21ef3ebbc70e89d5c3a5a3c013edb6' WHERE id=12359;UPDATE xhMerchantExtend SET miniAppId='wx21b7c3ef12082099',wxPayInit=0,wxPaysjId='',wxPayKey='' WHERE sjId=12359;";
 			Yii::$app->db->createCommand($sql)->execute($sql);
 		}
 		
@@ -1160,7 +1160,7 @@ update xhMerchant set name='花店宝' where id=12358;update xhShop set shopName
 		
 		//用户删除概念的提出
 		$sql = "ALTER TABLE xhUser ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '删除状态 0未删除 1已删除' AFTER `addPrecision`;
-UPDATE xhUser SET delStatus=1 WHERE merchantId=0;";
+UPDATE xhUser SET delStatus=1 WHERE sjId=0;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
 		//小程序
@@ -1168,14 +1168,14 @@ UPDATE xhUser SET delStatus=1 WHERE merchantId=0;";
   `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
   `appId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '小程序appId',
   `appSecret` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '小程序appSecret',
-  `merchantId` INT NOT NULL DEFAULT 0 COMMENT '商家id',
+  `sjId` INT NOT NULL DEFAULT 0 COMMENT '商家id',
   `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
 ) ENGINE=INNODB AUTO_INCREMENT=12566 DEFAULT CHARSET=utf8 COMMENT='小程序';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
 		$sql = "CREATE TABLE IF NOT EXISTS `xhMerchantInit`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `memberCodeInit` TINYINT NOT NULL DEFAULT 0 COMMENT '会员注册码初始过 0 没有 1有',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 ) COMMENT='商家初始信息';";
@@ -1183,7 +1183,7 @@ merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 		
 		$sql = "CREATE TABLE xhUserUpgrade(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 userId INT NOT NULL DEFAULT 0 COMMENT '客户id',
 `type` TINYINT NOT NULL DEFAULT 0 COMMENT '升级类型 0管理员操作升级',
 `member` SMALLINT NOT NULL DEFAULT 0 COMMENT '升级后等级',
@@ -1210,7 +1210,7 @@ ALTER TABLE `xhUserGrowth` DROP COLUMN `capitalType`;";
 		
 		$sql = "CREATE TABLE IF NOT EXISTS `xhWxAccount`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '公众号名称',
 `wxAppId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '公众号的appId',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
@@ -1256,9 +1256,9 @@ CREATE TABLE `xhStatOrderCount` (
   `time` INT(11) NOT NULL DEFAULT '0' COMMENT '月份',
   `riseNum` INT(11) NOT NULL DEFAULT '0' COMMENT '增加数量',
   `totalNum` INT(11) NOT NULL DEFAULT '0' COMMENT '总数量',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   PRIMARY KEY (`id`),
-  KEY `merchant` (`merchantId`,`time`)
+  KEY `merchant` (`sjId`,`time`)
 ) COMMENT='商家月订单量，包括未付款';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
@@ -1266,7 +1266,7 @@ CREATE TABLE `xhStatOrderCount` (
 		$sql = "CREATE TABLE `xhOrderExpress`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 orderId INT NOT NULL DEFAULT 0 COMMENT '订单id',
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `side` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方',
 distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 `cost` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '运费',
@@ -1308,7 +1308,7 @@ CREATE TABLE IF NOT EXISTS `xhWxBase`(
   `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
   `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '公众号名称',
   `logo` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '公众号logo',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id 0平台使用商家',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id 0平台使用商家',
   `wxAppId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '公众号appid',
   `wxAppSecret` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '公众号appsecret',
   `wxUserName` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '微信原始名 gh_083d437a9941',
@@ -1323,12 +1323,12 @@ CREATE TABLE IF NOT EXISTS `xhWxBase`(
   `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
 )COMMENT='公众号基础信息';
 ALTER TABLE `xhMerchant` DROP COLUMN `platform`;
-ALTER TABLE `xhWxOpen` ADD wx_base_id INT NOT NULL DEFAULT 0 COMMENT '平台对应的公众号' AFTER `merchantId`;
+ALTER TABLE `xhWxOpen` ADD wx_base_id INT NOT NULL DEFAULT 0 COMMENT '平台对应的公众号' AFTER `sjId`;
 CREATE TABLE IF NOT EXISTS `xhWxMiniBase`(
   `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
   `name` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
   `logo` VARCHAR(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'logo',
-  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id 0平台型',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id 0平台型',
   `miniAuth` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '授权状态 0未授权 1授权',
   `miniAppId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT 'appid',
   `miniAccessToken` VARCHAR(500) NOT NULL DEFAULT '' COMMENT 'accesstoken',
@@ -1337,7 +1337,7 @@ CREATE TABLE IF NOT EXISTS `xhWxMiniBase`(
   `miniVersion` INT(11) NOT NULL DEFAULT '0' COMMENT '当前版本',
   `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
 )COMMENT='小程序基础信息';
-ALTER TABLE `xhWxOpen` ADD wxMiniBaseId INT NOT NULL DEFAULT 0 COMMENT '平台对应的小程序' AFTER `merchantId`;
+ALTER TABLE `xhWxOpen` ADD wxMiniBaseId INT NOT NULL DEFAULT 0 COMMENT '平台对应的小程序' AFTER `sjId`;
 ALTER TABLE `xhWxOpen` CHANGE `openName` `name` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '名称' AFTER `appSecret`;
 ALTER TABLE `xhWxOpen` ADD appIdCreated VARCHAR(200) NOT NULL DEFAULT '' COMMENT '创建的平台帐号appId' AFTER `appId`;
 ALTER TABLE `xhWxOpen` MODIFY `appId` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '后台拿到的appId';";
@@ -1347,19 +1347,19 @@ ALTER TABLE `xhWxOpen` MODIFY `appId` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
 		$sql = "ALTER TABLE `xhUser` MODIFY `store` TINYINT NOT NULL DEFAULT 0 COMMENT '客户首次接入到店 0不是 1是';
-ALTER TABLE `xhAdmin` ADD `sourceType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源 0微信 1支付宝 2小程序 3朋友圈 4美团' AFTER `merchantId`;";
+ALTER TABLE `xhAdmin` ADD `sourceType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源 0微信 1支付宝 2小程序 3朋友圈 4美团' AFTER `sjId`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
 		$sql = "CREATE TABLE `xhAdminRelate`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '门店id',
 `roleId` INT(11) NOT NULL DEFAULT '0' COMMENT '角色id',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 )COMMENT='员工关系';
 ALTER TABLE `xhAdmin` DROP COLUMN `platUserId`;
 ALTER TABLE `xhAdmin` DROP COLUMN `userId`;
-ALTER TABLE `xhAdmin` DROP COLUMN `merchantId`;
+ALTER TABLE `xhAdmin` DROP COLUMN `sjId`;
 ALTER TABLE `xhAdmin` DROP COLUMN `roleId`;
 ALTER TABLE `xhAdmin` DROP COLUMN `defaultShopId`;
 ALTER TABLE `xhAdmin` DROP COLUMN `currentShopId`;";
@@ -1397,20 +1397,20 @@ UPDATE `xhUser` SET nickname=userName;";
 		$sql = "ALTER TABLE `xhAdminShop` ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '删除状态 0正常 1已删除' AFTER `default`;ALTER TABLE `xhAdmin` DROP COLUMN `remind`;ALTER TABLE `xhAdmin` CHANGE `status` `accountStatus` TINYINT NOT NULL DEFAULT 1 COMMENT '帐号状态 0禁用 1正常';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
-		$sql = "ALTER TABLE `xhStatIncome` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatIncomeCategory` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatIncomeCategoryMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatIncomeMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatIncomeSource` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatIncomeSourceMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatOrder` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatOrderCount` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatOrderMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatOut` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
-ALTER TABLE `xhStatOutMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;";
+		$sql = "ALTER TABLE `xhStatIncome` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatIncomeCategory` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatIncomeCategoryMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatIncomeMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatIncomeSource` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatIncomeSourceMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatOrder` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatOrderCount` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatOrderMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatOut` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;
+ALTER TABLE `xhStatOutMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
-		$sql = "ALTER TABLE `xhApply` MODIFY `introMerchantId`  INT NOT NULL DEFAULT 0 COMMENT '引荐花店';
+		$sql = "ALTER TABLE `xhApply` MODIFY `introsjId`  INT NOT NULL DEFAULT 0 COMMENT '引荐花店';
 ALTER TABLE `xhApply` CHANGE `userId` `adminId` INT NOT NULL DEFAULT 0 COMMENT '申请人';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
@@ -1437,7 +1437,7 @@ ALTER TABLE `xhOrder` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '
 		
 		$sql = "CREATE TABLE `xhExpress`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 )COMMENT='商家的物流与配送信息';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
@@ -1505,12 +1505,12 @@ UPDATE `xhUserAsset` SET `member`=0 WHERE `member`=-1;";
 		Yii::$app->db2->createCommand($sql)->execute();
 		
 		//更新国兰的菜单分类
-		$sql = "truncate `xhCategory`;insert  into `xhCategory`(`id`,`parentId`,`merchantId`,`categoryName`,`description`,`img`,`goodsNum`,`sold`,`inTurn`,`status`) values (1,0,12358,'花束','唯美花束','',0,0,15,1),(2,0,12358,'花盒','时尚花盒','',0,0,14,1),(3,0,12358,'开业花篮','开业花篮','',0,0,0,1),(4,0,12358,'婚礼用花','婚礼用花','',0,0,0,1),(5,0,12358,'会议用花','会议用花','',0,0,0,1),(9,0,12358,'蝴蝶兰专区','蝴蝶兰','',0,0,4,1),(87,0,12358,'花篮','时尚礼篮','',0,0,4,1),(88,0,12358,'植物-微景观','植物-微景观','',0,0,4,1);";
+		$sql = "truncate `xhCategory`;insert  into `xhCategory`(`id`,`parentId`,`sjId`,`categoryName`,`description`,`img`,`goodsNum`,`sold`,`inTurn`,`status`) values (1,0,12358,'花束','唯美花束','',0,0,15,1),(2,0,12358,'花盒','时尚花盒','',0,0,14,1),(3,0,12358,'开业花篮','开业花篮','',0,0,0,1),(4,0,12358,'婚礼用花','婚礼用花','',0,0,0,1),(5,0,12358,'会议用花','会议用花','',0,0,0,1),(9,0,12358,'蝴蝶兰专区','蝴蝶兰','',0,0,4,1),(87,0,12358,'花篮','时尚礼篮','',0,0,4,1),(88,0,12358,'植物-微景观','植物-微景观','',0,0,4,1);";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		//更新国兰分类与商品对应关系
 		Yii::$app->db->createCommand("truncate `xhGoodsCategory`;")->execute();
-		$goodsCategory = Yii::$app->db2->createCommand('select * from `xhGoodsCategory` where `merchantId`=12358')->queryAll();
+		$goodsCategory = Yii::$app->db2->createCommand('select * from `xhGoodsCategory` where `sjId`=12358')->queryAll();
 		if (!empty($goodsCategory)) {
 			foreach ($goodsCategory as $val) {
 				$cId = $val['cId'];
@@ -1522,7 +1522,7 @@ UPDATE `xhUserAsset` SET `member`=0 WHERE `member`=-1;";
 				
 			}
 		}
-		$goodsUsage = Yii::$app->db2->createCommand('select * from `xhGoodsUsage` where `merchantId`=12358')->queryAll();
+		$goodsUsage = Yii::$app->db2->createCommand('select * from `xhGoodsUsage` where `sjId`=12358')->queryAll();
 		if (!empty($goodsUsage)) {
 			foreach ($goodsUsage as $val) {
 				$usageId = $val['usageId'];

console/webim/src/Server.php

@@ -103,7 +103,7 @@ HTML;
 
         if($isCustomer){
             $clientIds = $this->storage->getMerchantM2C($uid, $chatUid);//取对方客户端号（即商家）
-            $this->log("customer login success <--> client id : #" . json_encode($clientIds) . " , customerId: $uid, merchantId: $chatUid");
+            $this->log("customer login success <--> client id : #" . json_encode($clientIds) . " , customerId: $uid, sjId: $chatUid");
         }else{
             $clientIds = $this->storage->getCustomerC2M($chatUid, $uid);//取对方客户端号（即客户）
             $this->storage->remMerchantChater($chatUid, $uid);
@@ -114,7 +114,7 @@ HTML;
                 $this->broadcastToMerchant($merchantClientIds, $chatUid, -1);
                 $this->log('商家聊天界面登录222 -- 商家聊天列表刷新消息数');
             }
-            $this->log("merchant login success <--> client id : #" . json_encode($clientIds) . ", customerId: $chatUid, merchantId: $uid");
+            $this->log("merchant login success <--> client id : #" . json_encode($clientIds) . ", customerId: $chatUid, sjId: $uid");
         }
         if(!empty($clientIds)){
             foreach ($clientIds as $clientId){

vendor/weixin/lib/WxPay.Api.php

@@ -50,7 +50,7 @@ class WxPayApi
 		}
 
 		if(isset($merchantExtend) == false){
-			echo 'merchantId:'.$merchantExtend.'取不到商家的支付信息';
+			echo 'sjId:'.$merchantExtend.'取不到商家的支付信息';
 			Yii::$app->end();
 		}
 		$WxPayConfig	= new WxPayConfig($merchantExtend);