数据库

app-pt/controllers/WxOpenController.php

@@ -311,6 +311,7 @@ class WxOpenController extends PublicController
 
         //创建平台，并将公众号绑定到平台
         if ($id == 1) {
+            echo '这步已经不需要做了，请手动去绑定';
             util::stop('这步已经不需要做了');
             wxUtil::createOpenAccount($wxAppId, $merchant, $isOpen);
             $return = wxUtil::getOpenAccount($wxAppId, $merchant, false, $isOpen);
@@ -343,6 +344,7 @@ class WxOpenController extends PublicController
         }
         //将小程序绑定到平台
         if ($id == 2) {
+            echo '这步已经不需要做了，请手动去绑定';
             util::stop('这步已经不需要做了');
             $openAppId = $merchant['openAppId'];
             $r = wxUtil::bindOpenAccount($miniAppId, $openAppId, $merchant, true, $isOpen);

sql.sql

@@ -26,13 +26,13 @@ wxOpen 平台和公众号 小程序要补好
 确认app模块下的hd ghs pt mall里的runtime有没创建成功 web里的assets是否创建成功
 
 
-=============================================================================
+==================================================
 
 
 要和供货商确认 要初始化的东西 花材的重量 花材的比例 成本价 加价 大小单位
 
 
-=============================================================================
+==================================================
 
 
 nginx配置修改
@@ -164,10 +164,34 @@ ALTER TABLE xhMerchant ADD `style` TINYINT NOT NULL DEFAULT 0 COMMENT '商家类
 
 ==ssh 20201-1-6
 
-ALTER TABLE xhWxOpen MODIFY wxMiniBaseId INT(11) NOT NULL DEFAULT '0' COMMENT '平台零售商小程序';
-ALTER TABLE xhWxOpen MODIFY wx_base_id INT(11) NOT NULL DEFAULT '0' COMMENT '平台零售商公众号';
-ALTER TABLE xhWxOpen ADD wxGhsMiniBaseId INT(11) NOT NULL DEFAULT '0' COMMENT '平台供货商小程序' AFTER wx_base_id;
-ALTER TABLE xhWxOpen ADD wxGhsBaseId INT(11) NOT NULL DEFAULT '0' COMMENT '平台供货商公众号' AFTER wxGhsMiniBaseId;
+DROP TABLE IF EXISTS `xhWxOpen`;
+CREATE TABLE if not exists `xhWxOpen` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `appId` varchar(200) NOT NULL DEFAULT '' COMMENT '后台拿到的appId',
+  `openAppBind` tinyint(4) NOT NULL DEFAULT '0' COMMENT '绑定平台状况 0没有创建 1公众号已绑 2小程序已绑 3公众号和小程序都已绑',
+  `appSecret` varchar(200) NOT NULL DEFAULT '' COMMENT '平台appSecret',
+  `style` tinyint(4) NOT NULL DEFAULT '1' COMMENT '平台类型 1花店 2供货商 3花店商城',
+  `name` varchar(20) NOT NULL DEFAULT '' COMMENT '名称',
+  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '平台绑定的商家id',
+  `wxMiniBaseId` int(11) NOT NULL DEFAULT '0' COMMENT '平台零售商小程序',
+  `wxBaseId` int(11) NOT NULL DEFAULT '0' COMMENT '平台零售商公众号',
+  `adminId` int(11) NOT NULL DEFAULT '0' COMMENT '管理员id',
+  `token` varchar(200) NOT NULL DEFAULT '' COMMENT '校验token',
+  `verifyTicket` varchar(200) NOT NULL DEFAULT '' COMMENT 'verify_ticket',
+  `verifyTicketTime` datetime NOT NULL COMMENT 'verifyTicket过期时间',
+  `componentAccessToken` varchar(200) NOT NULL DEFAULT '' COMMENT 'access_token',
+  `componentAccessTokenTime` datetime NOT NULL COMMENT 'componentAccessToken过期时间',
+  `aesKey` varchar(200) NOT NULL DEFAULT '' COMMENT '公众号消息加解密Key',
+  `preAuthCode` varchar(200) NOT NULL DEFAULT '' COMMENT 'pre_auth_code',
+  `preAuthCodeTime` datetime NOT NULL COMMENT 'preAuthCode过期时间',
+  `smsNum` int(11) NOT NULL DEFAULT '0' COMMENT '短信剩余总条数',
+  `smsRemindTime` 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 `xhGhsAdmin`;
 CREATE TABLE IF NOT EXISTS `xhGhsAdmin` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -194,72 +218,8 @@ CREATE TABLE IF NOT EXISTS `xhGhsAdmin` (
   `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`)
 )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='供货商员工';
 ALTER TABLE xhGhsAdmin MODIFY `identity` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '身份 0未知 1花店员工 2供货商员工';
-ALTER TABLE xhGhsShop CHANGE createTime `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间';
-ALTER TABLE xhGhsShop MODIFY updateTime INT NOT NULL DEFAULT 0 COMMENT '修改时间';
-ALTER TABLE xhGhsShopAdmin ADD updateTime INT NOT NULL DEFAULT 0 COMMENT '修改时间';
-ALTER TABLE xhGhsShop DROP COLUMN `createTime`;
-CREATE TABLE IF NOT EXISTS `xhGhsCustom`(
-id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-ghsId INT NOT NULL DEFAULT 0 COMMENT '供货商id merchantId',
-shopId INT NOT NULL DEFAULT 0 COMMENT '零售门店id',
-shopName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '门店名称',
-`mobile` VARCHAR(15) NOT NULL DEFAULT '0' COMMENT '店长手机号',
-isOpen TINYINT NOT NULL DEFAULT 0 COMMENT '是否开店 0没有 1已开',
-`addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间',
-`updateTime` INT NOT NULL DEFAULT 0 COMMENT '修改时间'
-)COMMENT='供货商客户';
-
-ALTER TABLE xhGhsShop CHANGE `merchantId` ghsId INT NOT NULL DEFAULT 0 COMMENT '供货商id';
-ALTER TABLE xhGhsShop CHANGE `merchantName` ghsName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '供货商名称';
-ALTER TABLE `xhGhsCustom` ADD debt TINYINT NOT NULL DEFAULT 0 COMMENT '是否允许欠款买花 0不允许 1允许' AFTER `isOpen`;
-ALTER TABLE `xhGhsCustom` ADD debtAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '欠款金额' AFTER `debt`;
-ALTER TABLE `xhGhsCustom` ADD buyNum INT NOT NULL DEFAULT 0 COMMENT '消费次数' AFTER `debtAmount`;
-ALTER TABLE `xhGhsCustom` ADD buyAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '消费总金额' AFTER `buyNum`;
-ALTER TABLE xhGhsShopAdmin CHANGE merchantId `ghsId` INT NOT NULL DEFAULT 0 COMMENT '供货商id merchantId';
+
 ALTER TABLE xhApply ADD updateTime INT NOT NULL DEFAULT 0 COMMENT '修改时间' AFTER `addTime`;
 ALTER TABLE xhApply ADD `from` TINYINT NOT NULL DEFAULT 0 COMMENT '来源 0花店自己申请 1供货商发起' AFTER `introMerchantId`;
 
@@ -483,8 +443,7 @@ CREATE TABLE `xhGhsAdminRoleAuth` (
   `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`)
 ) COMMENT='员工角色权限';
-ALTER TABLE `xhWxOpen` CHANGE `wx_mini_base_id` `wxMiniBaseId` INT(11) NOT NULL DEFAULT '0' COMMENT '平台零售商小程序';
-ALTER TABLE `xhWxOpen` CHANGE `wx_base_id` `wxBaseId` INT(11) NOT NULL DEFAULT '0' COMMENT '平台零售商公众号';
+
 
 == 平台 ssh 2021-1-13
 
@@ -576,13 +535,7 @@ CHANGE COLUMN `totalGoodsPrice` `totalItemPrice`  decimal(10,2) NOT NULL DEFAULT
 
 ====
 ==ssh 2021-01-17
-ALTER TABLE xhGhsShop AUTO_INCREMENT=35816;
-ALTER TABLE xhGhsCustom CHANGE `shopId` `retailShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '零售门店id';
 ALTER TABLE xhItem MODIFY unitNum TINYINT(4) NOT NULL DEFAULT '0' COMMENT '每扎多少支，每包多少支，每箱多少块，每扎多少条';
-ALTER TABLE `xhGhsShopAdmin` ADD `super` TINYINT NOT NULL DEFAULT 0 COMMENT '是否店长或超级管理员0不是1是' AFTER `roleId`;
-ALTER TABLE `xhShopAdmin` ADD `super` TINYINT NOT NULL DEFAULT 0 COMMENT '是否店长或超级管理员0不是1是' AFTER `roleId`;
-ALTER TABLE `xhGhsShop` ADD adminId INT NOT NULL DEFAULT 0 COMMENT '店长id' AFTER `ghsId`;
-ALTER TABLE `xhShop` ADD adminId INT NOT NULL DEFAULT 0 COMMENT '店长id' AFTER `merchantId`;
 ALTER TABLE xhGhsOrder MODIFY `sendSide` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方 0未选择 1达达2顺丰同城3闪送4美团';
 ALTER TABLE xhOrder MODIFY `sendSide` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方 0未选择 1达达2顺丰同城3闪送4美团';
 ALTER TABLE xhGhsOrder ADD `receiveProvince` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '收货地址 省' AFTER `shopId`;
@@ -619,15 +572,6 @@ CREATE TABLE `xhPurchase` (
   `updateTime` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '最后修改时间',
   PRIMARY KEY (`id`)
 ) COMMENT='采购单';
-CREATE TABLE `xhPurchaseItem` (
-  `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `orderId` INT NOT NULL DEFAULT 0 COMMENT '采购单id',
-  `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '花材ID',
-  `num` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '花材数量',
-  `unitPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '采购总价',
-  `price` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '采购总价',
-  PRIMARY KEY (`id`)
-) COMMENT='采购单详情';
 ALTER TABLE `xhPurchase` ADD getType TINYINT NOT NULL DEFAULT 1 COMMENT '取货方式 1配送 2自取' AFTER `shopId`;
 ALTER TABLE `xhPurchase` ADD sendTime INT NOT NULL DEFAULT 0 COMMENT '配送时间' AFTER `getType`;
 ALTER TABLE `xhPurchase` ADD sendCost DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '运费' AFTER `sendTime`;
@@ -682,7 +626,6 @@ ALTER TABLE `xhItem` CHANGE `pyName` `py` VARCHAR(20) NOT NULL DEFAULT '' COMMEN
 ALTER TABLE `xhGhsOrderItem` ADD orderSn CHAR(40) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `orderId`;
 ALTER TABLE xhSupplier MODIFY `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '名称拼音首字母';
 ALTER TABLE xhSupplier ADD upShopId INT NOT NULL DEFAULT 0 COMMENT '上游供货商门店id' AFTER `py`;
-ALTER TABLE `xhPurchaseItem` ADD orderSn CHAR(40) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER orderId;
 =======
 ===
 ==linqh 21-01-18
@@ -743,32 +686,18 @@ CREATE TABLE IF NOT EXISTS  xhOrderSn(
 id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
 )AUTO_INCREMENT=26315618 COMMENT='零售商订单号';
 ALTER TABLE `xhPurchase` ADD orderSn CHAR(40) NOT NULL DEFAULT '' COMMENT '订单号' AFTER `id`;
-ALTER TABLE `xhPurchaseItem` DROP COLUMN `orderId`;
-ALTER TABLE `xhGhsShop` CHANGE `ghsName` `merchantName` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '供货商名称';
-ALTER TABLE `xhGhsShop` CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
-ALTER TABLE `xhGhsShopAdmin` CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsAdminLog`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsAdminRole`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsAdminRoleAuth`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
-ALTER TABLE `xhGhsCustom`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsCheckOrder`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsOrderExpress`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsStatOrderCount`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
 ALTER TABLE `xhGhsStockOrder`  CHANGE `ghsId` `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商id';
-ALTER TABLE `xhPurchaseItem` CHANGE `itemId` `productId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '产品ID';
-ALTER TABLE `xhPurchaseItem` CHANGE `unitPrice` `bigPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '采购大单位价，每扎每包价';
-ALTER TABLE `xhPurchaseItem` ADD `ratio` TINYINT NOT NULL DEFAULT 0 COMMENT '大小单位转换比例，1扎多少支，1包多少支，1箱多少块 0表示只有一个单位' AFTER `num`;
-ALTER TABLE xhPurchaseItem MODIFY `num` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '花材数量，支持小数点';
-ALTER TABLE xhPurchaseItem MODIFY `bigPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价，每扎价、每包价、每箱价';
-ALTER TABLE xhPurchaseItem MODIFY `num` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '大单位数量，支持小数点';
 ALTER TABLE `xhGhsOrderItem` CHANGE `unitPrice` `bigPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价格，每扎价格，每包价格，每箱价格';
 ALTER TABLE `xhGhsOrderItem` CHANGE `unitNum` `ratio` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '大小单位转换比例，1扎多少支，1包多少支，1箱多少块 0表示只有一个单位';
 ALTER TABLE `xhGhsOrderItem` MODIFY `num` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '大单位数量，支持小数点';
-ALTER TABLE `xhGhsOrderItem` CHANGE `bigPrice` `price` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价格，每扎价格，每包价格，每箱价格'
+ALTER TABLE `xhGhsOrderItem` CHANGE `bigPrice` `price` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价格，每扎价格，每包价格，每箱价格';
 ALTER TABLE `xhGhsOrderItem` CHANGE `bigUnit` `unit` SMALLINT(6) NOT NULL DEFAULT '1' COMMENT '大单位，扎，箱，包';
-ALTER TABLE `xhPurchaseItem` CHANGE `price` `totalPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '采购总价';
-ALTER TABLE `xhPurchaseItem` CHANGE `bigPrice` `price` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价，每扎价、每包价、每箱价';
-ALTER  TABLE xhPurchaseItem MODIFY `totalPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '总价';
 ALTER TABLE xhGhsOrderItem ADD totalPrice DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价' AFTER `price`;
 ALTER TABLE xhGhsOrderItem DROP COLUMN `orderId`;
 ALTER TABLE `xhGhsOrder` CHANGE `goodsNum` `num` SMALLINT(4) NOT NULL DEFAULT '0' COMMENT '数量，大单位数量，多少扎，多少箱';
@@ -786,9 +715,7 @@ ALTER TABLE `xhGhsOrder` MODIFY `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT
 ALTER TABLE xhGhsOrder MODIFY `sendType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '1未确认 2免配送，自取 3自己送 4别人送，快递送';
 ALTER TABLE `xhGhsOrder` DROP COLUMN `userId`;
 ALTER TABLE xhGhsOrder CHANGE `ghsId` `merchantId` INT NOT NULL DEFAULT 0 COMMENT '商家id';
-ALTER TABLE `xhGhsCustom` CHANGE `retailId` `downId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户商id，下游商家id';
-ALTER TABLE `xhGhsCustom` CHANGE `retailShopId` `downShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户门店id，下游门店id';
-ALTER TABLE `xhGhsCustom` CHANGE `shopName` `name` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '客户名称，纯彩花艺 集美店';
+
 ALTER TABLE `xhGhsOrder` MODIFY `sendStatus` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '配送状态 1未发货，待接单 2已发货，已接单 3已送达';
 ALTER TABLE `xhGhsOrder` MODIFY `sendSide` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '配送方 1未选择 2达达 3顺丰同城 4闪送 5美团';
 ALTER TABLE `xhGhsOrder` MODIFY `refund` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1正常订单 2已退款';
@@ -802,7 +729,7 @@ ALTER TABLE `xhGhsOrderItem` DROP COLUMN `totalPrice`;
 ALTER TABLE `xhGhsOrderItem` MODIFY `price` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价格';
 ALTER TABLE `xhGhsOrderItem` CHANGE `unit` `bigUnit` SMALLINT(6) NOT NULL DEFAULT '1' COMMENT '大单位，扎，箱，包';
 ALTER TABLE xhGhsOrderItem MODIFY `ratio` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '大小单位转换比例，1扎多少支，1包多少支' AFTER `smallNum`;
-ALTER TABLE xhGhsCustom ADD address VARCHAR(800) NOT NULL DEFAULT '' COMMENT '客户地址' AFTER `mobile`;
+
 ALTER TABLE `xhGhsOrder` DROP COLUMN `addTime`;
 ALTER TABLE `xhGhsOrder` DROP COLUMN `updateTime`;
 ALTER TABLE `xhGhsOrder` ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `payTime`;
@@ -872,6 +799,7 @@ ALTER TABLE `xhGhsStockRecord`
 MODIFY COLUMN `addTime`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `newStock`,
 MODIFY COLUMN `updateTime`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER `addTime`;
 
+
 ====
 ==linqh 20210123
 RENAME TABLE  xhGhsStockOrder TO  xhGhsStockOutOrder
@@ -884,8 +812,6 @@ MODIFY COLUMN `addTime`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '
 MODIFY COLUMN `updateTime`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间' AFTER `addTime`,
 COMMENT='出库订单表';
 
-RENAME TABLE  xhGhsStockOrderItem TO  xhGhsStockOutOrderItem
-
 ALTER TABLE `xhGhsStockOutOrder`
 ADD COLUMN `inOrderSn`  char(20) NOT NULL DEFAULT '' COMMENT '对应的入库订单号，订单完成的时候写入' AFTER `orderSn`;
 
@@ -935,9 +861,6 @@ CREATE TABLE `xhGhsStockOutSn` (
 ALTER TABLE `xhGhsStockInOrderItem`
 ADD COLUMN `productId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID' AFTER `orderSn`;
 
-ALTER TABLE `xhGhsStockOutOrderItem`
-ADD COLUMN `productId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID' AFTER `orderSn`;
-
 ALTER TABLE `xhGhsStockOutOrder`
 ADD COLUMN `outTime`  timestamp NULL DEFAULT NULL COMMENT '出库时间' AFTER `remark`;
 
@@ -1141,7 +1064,6 @@ CREATE TABLE `xhExpressLocal` (
 
 ===========
 == ssh 20201-2-4
-ALTER TABLE `xhGhsCustom` ADD isDebt TINYINT NOT NULL DEFAULT 0 COMMENT '是否有欠款 0没有 1有' AFTER debt;
 ALTER TABLE xhGhsOrder ADD debt TINYINT NOT NULL DEFAULT 0 COMMENT '0没有欠款 1有欠款' AFTER `refund`;
 CREATE TABLE `xhGhsOrderClear` (
   `id` INT(11) NOT NULL AUTO_INCREMENT,
@@ -1224,11 +1146,6 @@ ALTER TABLE xhRecharge ADD orderSn CHAR(20) NOT NULL DEFAULT '' COMMENT '订单
 ALTER TABLE `xhRecharge` ADD `modPrice` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '0不能修改价格 1可以修改' AFTER `orderSn`;
 ALTER TABLE `xhRecharge` ADD `deadline` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '订单有效时间' AFTER `modPrice`;
 ALTER TABLE xhRecharge ADD payStatus TINYINT NOT NULL DEFAULT 1 COMMENT '1待付款 2已付款' AFTER `totalRecharge`;
-DROP TABLE `xhGhsShopAdmin`;
-DROP TABLE `xhGhsShop`;
-ALTER TABLE `xhShop` MODIFY `createTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '创建时间';
-ALTER TABLE xhShop ADD balance DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '余额' AFTER `adminId`;
-ALTER TABLE xhShop ADD fixBalance DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '只能向推荐人消费的余额，指定余额' AFTER `balance`;
 ALTER TABLE xhMerchant ADD parentId INT NOT NULL DEFAULT 0 COMMENT '父id' AFTER `adminId`;
 ALTER TABLE `xhRecharge` ADD INDEX `orderSn` (`orderSn`);
 DROP TABLE IF EXISTS `xhRechargeRecord`;
@@ -1242,35 +1159,17 @@ shopId INT NOT NULL DEFAULT 0 COMMENT '门店id',
 `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
 `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
 )COMMENT='充值记录';
-ALTER TABLE `xhShop` DROP COLUMN `createTime`;
-ALTER TABLE `xhShop` DROP COLUMN `addTime`;
-ALTER TABLE `xhShop` ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
 ALTER TABLE xhRechargeRecord RENAME TO xhRechargeLog;
-ALTER TABLE xhShop ADD totalRecharge DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `fixBalance`;
 ALTER TABLE xhRecharge ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `payStatus`;
 ALTER TABLE xhRecharge ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
 ALTER TABLE xhRecharge ADD remark VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '' AFTER `payStatus`;
 DROP TABLE IF EXISTS `xhRechargeLog`;
 ALTER TABLE xhMerchantCapital RENAME TO xhSjCapital;
 DROP TABLE IF EXISTS `xhWithdraw`;
-DROP TABLE IF EXISTS `xhCash`;
-CREATE TABLE IF NOT EXISTS `xhCash`(
-id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
-shopId INT NOT NULL DEFAULT 0 COMMENT '',
-amount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '提现金额',
-balance DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前余额',
-`status` TINYINT NOT NULL DEFAULT 1 COMMENT '1待处理 2处理中 3已完成',
-`addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
-`updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
-)COMMENT='提现订单';
-ALTER TABLE `xhCash` ADD `event` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '事项' AFTER `shopId`;
+
 ALTER TABLE xhMerchant DROP COLUMN `addTime`;
 ALTER TABLE xhMerchant DROP COLUMN `createTime`;
 ALTER TABLE xhMerchant ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
-ALTER TABLE xhShopAdmin DROP COLUMN `addTime`;
-ALTER TABLE xhShopAdmin ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
-ALTER TABLE xhShopAdmin ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
 ALTER TABLE xhMerchantAsset DROP COLUMN `createTime`;
 ALTER TABLE xhMerchantAsset ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `remainSmsNum`;
 ALTER TABLE xhApplyExtend ADD certType TINYINT NOT NULL DEFAULT 1 COMMENT '证件类型 1营业执照 2身份证号 3手机号' AFTER licenseNo;
@@ -1279,13 +1178,8 @@ ALTER TABLE xhMerchantAsset RENAME TO xhSjAsset;
 ALTER TABLE xhMerchantExtend RENAME TO xhSjExtend;
 ALTER TABLE xhMerchantInit RENAME TO xhSjInit;
 ALTER TABLE xhMerchantRemark RENAME TO xhSjRemark;
-ALTER TABLE xhGhsCustom CHANGE downId `customSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户对应的商家id';
-ALTER TABLE xhGhsCustom CHANGE `downShopId` `customShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户对应的门店id';
-ALTER TABLE xhGhsCustom CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的商家id';
-ALTER TABLE xhGhsCustom DROP COLUMN `addTime`;
-ALTER TABLE xhGhsCustom DROP COLUMN `updateTime`;
-ALTER TABLE xhGhsCustom ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `buyAmount`;
-ALTER TABLE xhGhsCustom ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
+
+====xhGhsCustom
 
 DROP TABLE IF EXISTS `xhUserOldData`;
 DROP TABLE IF EXISTS `xhUserPast`;
@@ -1315,7 +1209,6 @@ ADD COLUMN `shopNo`  varchar(100) NOT NULL DEFAULT '' COMMENT '门店' AFTER `ap
 ALTER TABLE xhApply ADD `licenseNo` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '营业执照号码' AFTER `name`;
 ALTER TABLE xhApply ADD `certType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '证件类型 1营业执照 2身份证号 3手机号' AFTER `licenseNo`;
 ALTER TABLE xhApplyExtend DROP COLUMN `certType`;
-ALTER TABLE xhWxOpen ADD `style` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型 1零售 2供货' AFTER `appSecret`;
 ALTER TABLE xhAdmin ADD recentShop VARCHAR(500) NOT NULL DEFAULT '' COMMENT '最近访问的店铺' AFTER `currentShopId`;
 ALTER TABLE xhGhsAdmin ADD recentShop VARCHAR(500) NOT NULL DEFAULT '' COMMENT '最近访问的店铺' AFTER `currentShopId`;
 ALTER TABLE xhApply MODIFY `certType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '证件类型 1营业执照 2身份证号';
@@ -1330,7 +1223,6 @@ ALTER TABLE xhApply ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AF
 
 需要哪些供货商要跟纯彩花艺收集好并且导入
 
-ALTER TABLE xhGhsCustom ADD `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '拼音首字母' AFTER `name`;
 ALTER TABLE xhCustom ADD `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '拼音首字母' AFTER `name`;
 ALTER TABLE xhGhsOrder ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AFTER `adminId`;
 ALTER TABLE xhGhsOrder MODIFY `adminId` INT(11) NOT NULL DEFAULT '0' COMMENT '用户id';
@@ -1446,10 +1338,8 @@ ALTER TABLE `xhAdmin` ADD `style` TINYINT NOT NULL DEFAULT 1 COMMENT '类型 1
 RENAME TABLE `xhStaff` TO `xhPtAdmin`;
 RENAME TABLE `xhWxBase` TO `xhWxGzh`;
 RENAME TABLE `xhWxMiniBase` TO `xhWxMini`;
-ALTER TABLE xhWxOpen DROP COLUMN `appIdCreated`;
 ALTER TABLE xhAdmin MODIFY `identity` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '用户身份 1客户 2员工';
-ALTER TABLE `xhShop` ADD `txBalance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '可提现余额' AFTER `balance`;
-ALTER TABLE xhCash MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1处理中 2已完成';
+
 ALTER TABLE xhGhsOrderClear CHANGE `orderIds` `orderStr` TEXT COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '订单id的json串';
 ALTER TABLE xhGhsOrderClear CHANGE `orderStr` `orderText` TEXT COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '订单id的json文本串';
 ALTER TABLE xhGhsOrderClear ADD customId INT NOT NULL DEFAULT 0 COMMENT '客户id' AFTER `sjId`;
@@ -1517,7 +1407,6 @@ CREATE TABLE `xhStatYjMonth` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `yj` (`sjId`,`year`,`month`)
 ) COMMENT='员工每月开单业绩';
-ALTER TABLE xhShopAdmin ADD adminName VARCHAR(80) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `adminId`;
 ALTER TABLE xhGhsOrderExpress ADD `orderSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER orderId;
 ALTER TABLE xhOrderExpress ADD `orderSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER orderId;
 ALTER TABLE xhGhsOrderExpress MODIFY `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '1待接单 2已接单 3已完成 4已取消';
@@ -1572,7 +1461,6 @@ ALTER TABLE `xhActOrder` CHANGE `payCode` `returnCode` VARCHAR(1000) NOT NULL DE
 ALTER TABLE `xhGhsOrder` CHANGE `payCode` `returnCode` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '支付返回数据';
 ALTER TABLE `xhOrder` CHANGE `payCode` `returnCode` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '支付返回数据';
 ALTER TABLE xhPxApply ADD applyTime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '报名时间' AFTER payTime;
-ALTER TABLE xhShop ADD totalStudent INT NOT NULL DEFAULT 0 COMMENT '总学员数' AFTER `totalRecharge`;
 CREATE TABLE `xhStatStudent` (
   `id` INT(11) NOT NULL AUTO_INCREMENT,
   `time` INT(11) NOT NULL DEFAULT '0' COMMENT '时间戳',
@@ -1676,25 +1564,7 @@ ALTER TABLE xhGhsOrder ADD customName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '
 ALTER TABLE xhGhsOrder ADD customNamePy VARCHAR(20) NOT NULL DEFAULT '' COMMENT '客户名称拼音首字母' AFTER `customName`;
 ALTER TABLE xhGhsOrder ADD customAvatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '客户头像' AFTER `customNamePy`;
 ALTER TABLE xhGhsOrder ADD customMobile CHAR(15) NOT NULL DEFAULT '' COMMENT '客户手机号' AFTER `customAvatar`;
-ALTER TABLE xhGhsCustom ADD `province` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '省' AFTER `debtAmount`;
-ALTER TABLE xhGhsCustom ADD `city` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '市' AFTER `province`;
-ALTER TABLE xhGhsCustom ADD `dist` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '区县' AFTER `city`;
-ALTER TABLE xhGhsCustom ADD `floor` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '楼号门牌号' AFTER `province`;
-ALTER TABLE xhGhsCustom ADD `fullAddress` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '完整地址' AFTER `floor`;
-ALTER TABLE xhGhsCustom ADD `lat` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '纬度' AFTER `fullAddress`;
-ALTER TABLE xhGhsCustom ADD `long` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '经度' AFTER `lat`;
-
-ALTER TABLE xhShop ADD `totalOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '总订单数；包括付款和未付款的' AFTER `default`;
-ALTER TABLE xhShop ADD `payOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '付款订单数' AFTER `totalOrder`;
-ALTER TABLE xhShop ADD `finishOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '完成订单数' AFTER `payOrder`;
-ALTER TABLE xhShop ADD `unPayOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '待付款订单数' AFTER `finishOrder`;
-ALTER TABLE xhShop ADD `unSendOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '待配送订单数' AFTER `unPayOrder`;
-ALTER TABLE xhShop ADD `sendingOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '配送中订单数' AFTER `unSendOrder`;
-ALTER TABLE xhShop ADD `cancelOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '已取消订单数' AFTER `sendingOrder`;
-
-ALTER TABLE xhWxOpen MODIFY `style` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '平台类型 1花店 2供货商 3花店商城';
-ALTER TABLE xhWxOpen DROP COLUMN `wxGhsMiniBaseId`;
-ALTER TABLE xhWxOpen DROP COLUMN `wxGhsBaseId`;
+
 
 ALTER TABLE `xhGhsOrder` CHANGE `receiveProvince` `province` VARCHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '收货地址 省';
 ALTER TABLE `xhGhsOrder` CHANGE `receiveCity` `city` VARCHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '收货地址 市';
@@ -1728,9 +1598,6 @@ TRUNCATE `xhUserUpgrade`;
 ALTER TABLE xhUser DROP COLUMN `merchantId`;
 ALTER TABLE xhCustom CHANGE `adminId` `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '用户id';
 ALTER TABLE xhCustom ADD UNIQUE INDEX custom(`sjId`,`userId`);
-ALTER TABLE xhShop ADD `cashAccount` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '支付宝提现帐号' AFTER `cancelOrder`;
-ALTER TABLE xhShop ADD `cashName` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '支付宝提现姓名' AFTER `cashAccount`;
-ALTER TABLE xhShopAdmin ADD avatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '头像' AFTER `adminId`;
 
 确认三个公众号的模板消息已经导入完整
 
@@ -1855,9 +1722,6 @@ CREATE TABLE IF NOT EXISTS `xhGhsStatYjMonth` (
 ) COMMENT='员工每月开单业绩';
 ALTER TABLE xhRecharge ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '1待充值 2已充值' AFTER `payStatus`;
 ALTER TABLE xhRecharge CHANGE `payCode` `returnCode` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '支付返回数据';
-ALTER TABLE xhShopAdmin DROP COLUMN `default`;
-ALTER TABLE xhShopAdmin ADD mobile CHAR(15) NOT NULL DEFAULT '' COMMENT '手机号' AFTER `adminName`;
-ALTER TABLE xhShopAdmin AUTO_INCREMENT=125631;
 ALTER TABLE xhSupplier RENAME TO xhGhs;
 ALTER TABLE xhGhs ADD avatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '头像' AFTER `id`;
 ALTER TABLE xhGhs CHANGE `upId` `ghsSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的商家id';
@@ -1866,37 +1730,7 @@ ALTER TABLE xhGhs MODIFY `ghsShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '供
 ALTER TABLE xhGhs ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `ghsShopId`;
 ALTER TABLE xhGhs ADD sjId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `ghsShopId`;
 ALTER TABLE xhGhs DROP COLUMN `merchantId`;
-ALTER TABLE `xhGhs` MODIFY `name` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '供货商名称' AFTER `avatar`;
-ALTER TABLE `xhGhs` MODIFY `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '名称拼音首字母' AFTER `name`;
-ALTER TABLE `xhGhs` ADD mobile CHAR(15) NOT NULL DEFAULT '' COMMENT '手机号' AFTER `py`;
-DROP TABLE IF EXISTS `xhGhs`;
-CREATE TABLE IF NOT EXISTS `xhGhs` (
-  `id` INT(11) NOT NULL AUTO_INCREMENT,
-  `avatar` VARCHAR(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '头像',
-  `name` VARCHAR(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '供货商名称',
-  `py` VARCHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称拼音首字母',
-  `mobile` CHAR(15) COLLATE utf8mb4_unicode_ci 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 '完整地址',
-    `lat` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '纬度',
-  `long` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '经度',
-  `ghsSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的商家id',
-  `ghsShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的门店id',
-  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
-  `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '门店id',
-  `debt` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1没有欠款 2有欠款',
-  `debtNum` SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '欠款订单数，欠款笔数',
-  `debtAmount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '欠款金额',
-  `expendAmount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '消费金额',
-  `expendNum` INT(11) NOT NULL DEFAULT '0' COMMENT '消费次数',
-  `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
-  `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB AUTO_INCREMENT=125861 COMMENT='供应商关系';
+
 ALTER TABLE `xhSj` DROP COLUMN `shopName`;
 ALTER TABLE `xhSj` CHANGE `shopProvince` `province` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '省';
 ALTER TABLE `xhSj` CHANGE `shopCity` `city` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '市';
@@ -1911,15 +1745,6 @@ ALTER TABLE `xhSj` DROP COLUMN `property`;
 ALTER TABLE `xhSj` MODIFY `style` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '商家类型 1花店 2供货商 3昆明供货商';
 ALTER TABLE `xhSj` CHANGE `merchantName` `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商家名称';
 
-========
-==linqh
-ALTER TABLE `xhGhsOrderExpress`
-MODIFY COLUMN `distance`  decimal(10,1) NOT NULL DEFAULT 0.0 COMMENT '距离' AFTER `expressName`;
-
-ALTER TABLE `xhGhsOrderExpress`
-ADD COLUMN `dmName`  varchar(200) NOT NULL DEFAULT '' COMMENT '骑手名' AFTER `sendTime`,
-ADD COLUMN `dmMobile`  varchar(30) NOT NULL DEFAULT '' COMMENT '骑手手机号' AFTER `dbName`;
-
 ============
 ==shish
 ALTER TABLE `xhGhsItemClass` ADD num SMALLINT NOT NULL DEFAULT 0 COMMENT '花材数量' AFTER `name`;
@@ -1975,22 +1800,16 @@ ADD COLUMN `stockWarning`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '库存预警
 
 =====shish 2021-4-7
 UPDATE `xhPtItem` SET ratio = 1 WHERE ratio=0;
-ALTER TABLE xhGhsCustom ADD `growth` INT(11) NOT NULL DEFAULT '0' COMMENT '成长值' AFTER `dist`;
-ALTER TABLE xhGhsCustom ADD `visitTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次访问时间';
 ALTER TABLE xhCustom MODIFY `visitTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次访问时间';
 ALTER TABLE `xhItem` MODIFY `stockWarning` MEDIUMINT NOT NULL DEFAULT 0 COMMENT '库存预警，大单位数量';
 ALTER TABLE `xhGhsItem` MODIFY `stockWarning` MEDIUMINT NOT NULL DEFAULT 0 COMMENT '库存预警，大单位数量';
 ALTER TABLE xhPtItem ADD `stockWarning` MEDIUMINT NOT NULL DEFAULT 0 COMMENT '库存预警，大单位数量' AFTER `weight`;
 UPDATE xhPtItem SET stockWarning=5;
-ALTER TABLE xhGhsCustom CHANGE  buyAmount `totalExpend` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费';
-ALTER TABLE xhGhsCustom CHANGE `totalExpend` buyAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费';
 ALTER TABLE xhCustom CHANGE `totalExpend` `buyAmount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费';
 ALTER TABLE xhCustom ADD buyNum INT NOT NULL DEFAULT 0 COMMENT '消费次数' AFTER `buyAmount`;
-ALTER TABLE xhGhsCustom ADD rechargeAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `buyAmount`;
 ALTER TABLE xhCustom ADD rechargeAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `buyNum`;
 ALTER TABLE xhCustom DROP COLUMN totalRecharge;
 ALTER TABLE xhCustom CHANGE `rechargeAmount` `recharge` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值';
-ALTER TABLE xhGhsCustom CHANGE `rechargeAmount` `recharge` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值';
 ALTER TABLE xhGhsOrder ADD shopAdminName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `shopAdminId`;
 
 =============linqh 2021-04-07
@@ -2103,19 +1922,6 @@ ALTER TABLE xhAdmin DROP COLUMN `identity`;
 国兰原有的商品拼音需要补回去
 
 
-ALTER TABLE xhShopAdmin ADD VARCHAR(500) NOT NULL DEFAULT '' COMMENT '添加员工时的备注' AFTER `super`;
-ALTER TABLE xhShopAdmin ADD founder TINYINT NOT NULL DEFAULT 1 COMMENT '创始人 1不是 2是' AFTER `super`;
-ALTER TABLE xhShop ADD `totalPurchase` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计采购' AFTER `totalPurchaseOrder`;
-
-======linqh 2021-04-14
-==
-ALTER TABLE `xhShop`
-ADD COLUMN `freezeBalance`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '提现时被冻结的余额' AFTER `balance`,
-ADD COLUMN `totalExpend`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '总支出' AFTER `totalIncome`,
-ADD COLUMN `totalView`  int(11) NOT NULL DEFAULT 0 COMMENT '累计访问次数' AFTER `status`,
-ADD COLUMN `totalUser`  int(11) NOT NULL DEFAULT 0 COMMENT '总用户；总客户数' AFTER `totalView`,
-ADD COLUMN `totalPurchaseOrder`  int(11) NOT NULL DEFAULT 0 COMMENT '总采购订单' AFTER `totalUser`;
-
 =======linqh 2021-4-15
 ===
 ALTER TABLE `xhStatIncome`
@@ -2140,7 +1946,6 @@ ALTER TABLE xhStatIncome DROP INDEX `income`;
 ALTER TABLE xhAdmin ADD apply TINYINT NOT NULL DEFAULT 1 COMMENT '是否已申请开店 1没有 2有' AFTER `super`;
 ALTER TABLE xhAdmin MODIFY `apply` TINYINT NOT NULL DEFAULT 1 COMMENT '申请开店 1没有 2有申请，待审核 3有申请，已审核通过';
 ALTER TABLE `xhAdmin` CHANGE `apply` `openShop` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '申请开店 1没有 2有申请，待审核 3有申请，已审核通过';
-ALTER TABLE `xhShop` CHANGE `payOrder` `totalOrderNum` INT(11) NOT NULL DEFAULT '0' COMMENT '总订单，只包括已付款订单，暂不考虑退款订单';
 ALTER TABLE xhSjAsset CHANGE `payOrder` `totalOrderNum` INT(11) NOT NULL DEFAULT '0' COMMENT '付款的总订单数，不考虑退款';
 TRUNCATE `xhStatIncome`;
 TRUNCATE `xhStatIncomeMonth`;
@@ -2162,7 +1967,6 @@ ALTER TABLE xhStatStudent 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 '名称';
@@ -2172,12 +1976,10 @@ ALTER TABLE `xhStatView` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `mer
 ALTER TABLE `xhStatViewMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `merchantId`;
 ALTER TABLE `xhStatVisit` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `merchantId`;
 ALTER TABLE `xhStatVisitMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `merchantId`;
-ALTER TABLE xhShop ADD totalItem INT NOT NULL DEFAULT 0 COMMENT '总花材数' AFTER `totalExpend`;
 
 ============linqh  2021-4-20
-===
-ALTER TABLE `xhShop`
-ADD COLUMN `mayGathering`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '应收款' AFTER `totalPurchase`;
+===shop
+
 
 ALTER TABLE `xhGhsPurchaseOrder`
 ADD INDEX `idx_shopId` (`shopId`) ,
@@ -2186,10 +1988,6 @@ ADD INDEX `idx_addTime` (`addTime`) ;
 ====shish 20210422
 ALTER TABLE `xhSj` ADD parentShopId INT NOT NULL DEFAULT 0 COMMENT '父级门店' AFTER parentId;
 ALTER TABLE `xhSj` MODIFY `parentId` INT(11) NOT NULL DEFAULT '0' COMMENT '父级商家id，介绍人';
-ALTER TABLE `xhShop` ADD mobile VARCHAR(15) NOT NULL DEFAULT '' COMMENT '手机号' AFTER `totalStudent`;
-ALTER TABLE xhGhsCustom MODIFY `isOpen` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '已开店 0没有 1有';
-ALTER TABLE `xhGhsCustom` ADD UNIQUE INDEX `custom`(`sjId`,`customSjId`,`customShopId`);
-ALTER TABLE `xhGhs` ADD UNIQUE INDEX `ghs`(`sjId`,`ghsSjId`,`ghsShopId`);
 ALTER TABLE xhStatOrderCount DROP INDEX `merchant`;
 ALTER TABLE `xhStatOrderCount` ADD UNIQUE INDEX `shop`(`shopId`,`time`);
 ALTER TABLE `xhAd` DROP INDEX `merchantId`;
@@ -2217,7 +2015,6 @@ ALTER TABLE xhShopAd RENAME TO xhShopImg;
 ALTER TABLE `xhCategory` MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '状态 0停用1启用';
 ALTER TABLE xhGoods MODIFY `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '拼音' AFTER goodsName;
 ALTER TABLE xhGoodsCategory ADD py VARCHAR(50) NOT NULL DEFAULT '' COMMENT '拼音' AFTER `goodsName`;
-ALTER TABLE `xhShop` ADD rechargeNum INT NOT NULL DEFAULT 0 COMMENT '充值续期数量' AFTER `mayGathering`;
 DROP TABLE IF EXISTS `xhRenewLog`;
 CREATE TABLE IF NOT EXISTS `xhRenewLog`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -2239,7 +2036,7 @@ ALTER TABLE `xhRenew` ADD deadline DATETIME NOT NULL DEFAULT '0000-00-00 00:00:0
 ALTER TABLE `xhRenew` ADD beforeDeadline DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '上次到期时间' AFTER `deadline`;
 ALTER TABLE xhSjExt ADD rechargeRenew TINYINT NOT NULL DEFAULT 1 COMMENT '参与充值续期活动 1没有 2有' AFTER `rrkdKey`;
 DROP TABLE IF EXISTS `xhShopImg`;
-ALTER TABLE xhShop ADD img VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '图片' AFTER `adminId`;
+
 ALTER TABLE xhPurchase DROP COLUMN `upId`;
 ALTER TABLE xhPurchase DROP COLUMN `upShopId`;
 ALTER TABLE xhPurchase MODIFY `status` TINYINT(2) NOT NULL DEFAULT '1' COMMENT '订单状态 1待付款，待确认，2待配送，3配送中，4已完成';
@@ -2261,43 +2058,22 @@ ALTER TABLE xhGhsPurchaseOrder CHANGE `supplierId` `ghsId` INT(11) UNSIGNED NOT
 ALTER TABLE xhGhsPurchaseOrder CHANGE `supplierInfo` `ghsInfo` VARCHAR(5000) NOT NULL DEFAULT '' COMMENT '供应商信息';
 ALTER TABLE xhPurchase CHANGE `supplierId` `ghsId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '供货商ID';
 ALTER TABLE xhPurchase ADD `ghsInfo` VARCHAR(2000) NOT NULL DEFAULT '' COMMENT '供应商信息' AFTER `ghsId`;
-ALTER TABLE xhGhsCustom CHANGE `sjId` `ownSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '所有者商家id';
-ALTER TABLE xhGhsCustom CHANGE `customSjId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户商家id';
-ALTER TABLE xhGhsCustom CHANGE `customShopId` `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户门店id';
-ALTER TABLE `xhGhs` CHANGE `sjId` `ownSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '所有者商家id';
-ALTER TABLE `xhGhs` CHANGE `shopId` `ownShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '所有者门店id';
-ALTER TABLE `xhGhs` CHANGE `ghsSjId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商商家id';
-ALTER TABLE `xhGhs` CHANGE `ghsShopId` `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商门店id';
-ALTER TABLE `xhGhs` DROP COLUMN `ownShopId`;
 ALTER TABLE `xhPurchase` MODIFY `shopId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '门店ID' AFTER `merchantId`;
 ALTER TABLE `xhGhsPurchaseOrder` MODIFY `shopId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '门店ID' AFTER `merchantId`;
 
 
-=============linqh 2021-4-27
-===
-ALTER TABLE `xhPurchaseItem`
-CHANGE COLUMN `num` `itemNum`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '大单位数量，支持小数点' AFTER `productId`,
-MODIFY COLUMN `price`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '单价' AFTER `ratio`,
-ADD COLUMN `itemId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '花材ID' AFTER `productId`,
-ADD COLUMN `itemInfo`  text NOT NULL COMMENT '花材信息json' AFTER `itemNum`;
-
 ======= shish 20210428
 ALTER TABLE xhGhsOrder ADD cgId INT NOT NULL DEFAULT 0 COMMENT '采购单id' AFTER `id`;
 ALTER TABLE `xhGhsOrder` CHANGE `cgId` `hdOrderId` INT NOT NULL DEFAULT 0 COMMENT '花店订单id';
 ALTER TABLE `xhPurchase` ADD ghsOrderId INT NOT NULL DEFAULT 0 COMMENT '供货商订单id' AFTER `orderSn`;
 ALTER TABLE `xhPurchase` ADD payWay TINYINT NOT NULL DEFAULT 0 COMMENT '支付方式，选项查看dict文件' AFTER `orderSn`;
-ALTER TABLE `xhGhs` ADD customId INT NOT NULL DEFAULT 0 COMMENT 'a是b的供货商，则b是a客户，即客户id' AFTER `id`;
-ALTER TABLE `xhGhsCustom` ADD ghsId INT NOT NULL DEFAULT 0 COMMENT 'a是b的客户，则b是a的供货商，即供货商id' AFTER `id`;
-ALTER TABLE `xhGhs` DROP COLUMN `customId`;
-ALTER TABLE `xhGhsCustom` DROP COLUMN `ghsId`;
 ALTER TABLE xhPurchaseClear ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状态 1待付款 2已付款 3已取消，已失效' AFTER `changePrice`;
 ALTER TABLE xhPurchaseClear ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `merchantId`;
 ALTER TABLE xhPurchaseClear CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id';
 ALTER TABLE xhPurchaseClear ADD ghsId INT NOT NULL DEFAULT 0 COMMENT '供货商id' AFTER `orderSn`;
 ALTER TABLE `xhPurchase` ADD clearId INT NOT NULL DEFAULT 0 COMMENT '欠款结算id' AFTER `payWay`;
 ALTER TABLE xhApply ADD hasLicense TINYINT NOT NULL DEFAULT 1 COMMENT '提供证件 1有 2没有' AFTER `name`;
-ALTER TABLE xhShopAdmin ADD kdAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '业绩，累计开单金额' AFTER `merchantId`;
-ALTER TABLE `xhOrder` ADD `shopAdminName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `actPrice`
+ALTER TABLE `xhOrder` ADD `shopAdminName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `actPrice`;
 ALTER TABLE `xhOrder` ADD `shopAdminId` INT(11) NOT NULL DEFAULT '0' COMMENT '员工id' AFTER `actPrice`;
 ALTER TABLE xhAdmin DROP INDEX `admin`;
 ALTER TABLE `xhAdmin` ADD UNIQUE INDEX `admin`(`mobile`,`style`);
@@ -2362,8 +2138,6 @@ ALTER TABLE xhPurchaseClear ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状
 ALTER TABLE xhPurchaseClear ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `merchantId`;
 ALTER TABLE xhPurchaseClear CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id';
 ALTER TABLE xhPurchaseClear ADD ghsId INT NOT NULL DEFAULT 0 COMMENT '供货商id' AFTER `orderSn`;
-ALTER TABLE xhGhsCustom ADD debtNum INT NOT NULL DEFAULT 0 COMMENT '欠款笔数' AFTER `debtAmount`;
-ALTER TABLE xhShopAdmin ADD lastLogin TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后登陆时间' AFTER `status`;
 ALTER TABLE `xhPurchase` ADD ghsShopAdminId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `shopId`;
 ALTER TABLE `xhPurchase` ADD ghsShopAdminName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '员工姓名' AFTER `ghsShopAdminId`;
 
@@ -2377,21 +2151,12 @@ ALTER TABLE `xhGhsItemClass`
 ADD COLUMN `isDefault`  tinyint(2) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否默认分类 1是0否' AFTER `adminId`;
 
 
--------shish 20210706
-ALTER TABLE xhGhs DROP INDEX `ghs`;
-ALTER TABLE xhGhs ADD ownShopId INT NOT NULL DEFAULT 0 COMMENT '所有者门店id' AFTER `ownSjId`;
-ALTER TABLE xhGhsCustom DROP INDEX `custom`;
-ALTER TABLE xhGhsCustom ADD ownShopId INT NOT NULL DEFAULT 0 COMMENT '所有者门店id' AFTER `ownSjId`;
+-------xhGhs
+
 ALTER TABLE xhCustom DROP INDEX `custom`;
 ALTER TABLE xhCustom ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `sjId`;
 TRUNCATE `xhCustom`;
-TRUNCATE `xhGhsCustom`;
-TRUNCATE `xhGhs`;
 ALTER TABLE `xhCustom` ADD UNIQUE INDEX `custom`(`shopId`);
-ALTER TABLE `xhGhsCustom` ADD UNIQUE INDEX `custom`(`ownShopId`,`shopId`);
-ALTER TABLE `xhGhs` ADD UNIQUE INDEX `ghs`(`ownShopId`,`shopId`);
-ALTER TABLE `xhGhs` ADD customId INT NOT NULL DEFAULT 0 COMMENT 'a是b的供应商，则b是a的客户，即customId' AFTER `id`;
-ALTER TABLE `xhGhsCustom` ADD ghsId INT NOT NULL DEFAULT 0 COMMENT 'a是b的客户，则b是a的供货商，即ghsId' AFTER `id`;
 ALTER TABLE xhPurchase MODIFY `ghsOrderId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商订单id' AFTER `id`;
 ALTER TABLE `xhPurchase` CHANGE `ghsOrderId` `saleOrderId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的销售单id';
 ALTER TABLE xhGhsOrder CHANGE `hdOrderId` `purchaseOrderId` INT(11) NOT NULL DEFAULT '0' COMMENT '花店采购单id';
@@ -2412,10 +2177,6 @@ DROP TABLE IF EXISTS `xhClearSn`;
 ALTER TABLE xhCustom DROP INDEX `custom`;
 ALTER TABLE xhCustom ADD UNIQUE INDEX custom(`shopId`,`userId`);
 
-=======linqh
-==
-ALTER TABLE `xhPurchaseItem`
-ADD COLUMN `ghsProductId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供货商的productId' AFTER `itemInfo`;
 
 ------shish 20210509
 ALTER TABLE xhPurchaseClear MODIFY `purchaseIds` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '结算的采购单id，json串';
@@ -2426,23 +2187,15 @@ ALTER TABLE xhPurchaseClear ADD customShopAdminName VARCHAR(50) NOT NULL DEFAULT
 ALTER TABLE xhPurchaseClear ADD ghsShopAdminId INT NOT NULL DEFAULT 0 COMMENT '供货商员工id' AFTER `sjId`;
 ALTER TABLE xhPurchaseClear ADD ghsShopAdminName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '供货商员工名称' AFTER `ghsShopAdminId`;
 ALTER TABLE xhPurchaseClear ADD `type` TINYINT NOT NULL DEFAULT 1 COMMENT '1客户清算 2供货商清算' AFTER `id`;
-ALTER TABLE `xhGhs` MODIFY `name` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '供货商名称';
-ALTER TABLE xhGhsCustom MODIFY `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '客户名称';
 ALTER TABLE xhRenew CHANGE userId shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id';
 ALTER TABLE xhRenew DROP COLUMN `addTime`;
 ALTER TABLE xhRenew ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
 ALTER TABLE xhRenew ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER `addTime`;
 ALTER TABLE xhRenew ADD shopAdminName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER shopAdminId;
-ALTER TABLE xhGhsCustom MODIFY `city` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '市' AFTER `province`;
-ALTER TABLE xhGhsCustom MODIFY `dist` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '区县' AFTER `city`;
-ALTER TABLE xhGhsCustom MODIFY `fullAddress` VARCHAR(800) NOT NULL DEFAULT '' COMMENT '完整地址' AFTER `dist`;
-ALTER TABLE xhGhsCustom MODIFY `address` VARCHAR(800) NOT NULL DEFAULT '' COMMENT '客户地址' AFTER `dist`;
-ALTER TABLE xhGhsCustom MODIFY `fullAddress` VARCHAR(900) NOT NULL DEFAULT '' COMMENT '完整地址' AFTER `floor`;
-ALTER TABLE xhGhsCustom ADD showAddress VARCHAR(900) NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址' AFTER `fullAddress`;
 ALTER TABLE xhOrder ADD showAddress VARCHAR(900) NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址' AFTER `fullAddress`;
 ALTER TABLE xhGhsOrder ADD showAddress VARCHAR(900) NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址' AFTER `fullAddress`;
-ALTER TABLE xhShop ADD showAddress VARCHAR(900) NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址' AFTER `fullAddress`;
-ALTER TABLE xhGhs ADD showAddress VARCHAR(900) NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址' AFTER `fullAddress`;
+
+
 ALTER TABLE xhPurchase ADD ghsInfo VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '供货商信息' AFTER `ghsId`;
 ALTER TABLE xhPurchase DROP COLUMN `ghsInfo`;
 ALTER TABLE xhPurchase ADD ghsMobile CHAR(15) NOT NULL DEFAULT '' COMMENT '供货商手机号' AFTER `ghsAvatar`;
@@ -2498,13 +2251,7 @@ ALTER TABLE xhPurchase MODIFY `status` TINYINT(2) NOT NULL DEFAULT '1' COMMENT '
 ALTER TABLE xhPurchase ADD INDEX expire(`status`,`deadline`);
 ALTER TABLE xhGhsOrder MODIFY `sendNum` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '配送编号，方便寻找订单对应的花材' AFTER `orderSn`;
 ALTER TABLE xhGhsOrder MODIFY `sendNum` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '配送编号，方便寻找订单对应的花材' AFTER `id`;
-ALTER TABLE xhShop ADD cgUnPay INT NOT NULL DEFAULT 0 COMMENT '采购待付款订单数' AFTER `totalPurchase`;
-ALTER TABLE xhShop ADD cgUnSend INT NOT NULL DEFAULT 0 COMMENT '采购待配送订单数' AFTER `cgUnPay`;
-ALTER TABLE xhShop ADD cgSending INT NOT NULL DEFAULT 0 COMMENT '采购配送中订单数' AFTER `cgUnSend`;
-ALTER TABLE xhShop ADD cgFinish INT NOT NULL DEFAULT 0 COMMENT '采购完成订单数' AFTER `cgSending`;
-ALTER TABLE xhShop ADD cgCancel INT NOT NULL DEFAULT 0 COMMENT '采购取消订单数' AFTER `cgFinish`;
 ALTER TABLE xhShopCoupon MODIFY `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '状态 1未使用 2使用 3过期';
-ALTER TABLE xhShopAdmin ADD remark VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '' AFTER `lastLogin`;
 
 -----linqh 2021.5.14  监控ws定时任务
 */1 * * * * sh /root/new_monitor_shell/ws_monitor.sh >> /dev/null 2>&1
@@ -2530,40 +2277,11 @@ ALTER TABLE `xhSetMeal` RENAME TO `xhSet`;
 ALTER TABLE xhRenew MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1 待付款 2已付款';
 
 
-drop table if exists `xhShopYeChange`;
-CREATE TABLE if not exists `xhShopYeChange` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `relateId` int(11) NOT NULL DEFAULT '0' COMMENT '关联订单id',
-  `capitalType` tinyint(4) NOT NULL DEFAULT '0' COMMENT '流水类型',
-  `amount` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '变动金额',
-  `balance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '余额',
-  `txBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '可提现余额',
-  `io` tinyint(4) NOT NULL DEFAULT '0' COMMENT '类型 0减少 1增加',
-  `payWay` tinyint(4) NOT NULL DEFAULT '0' COMMENT '支付方式',
-  `fromType` tinyint(4) NOT NULL DEFAULT '0' COMMENT '来源 0门店 1商城 2朋友圈 3..',
-  `event` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '事项',
-  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
-  `shopId` int(11) NOT NULL DEFAULT '0' COMMENT '门店id',
-  `remark` varchar(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '备注',
-  `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
-  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
-  PRIMARY KEY (`id`)
-) COMMENT='门店余额变化记录';
-ALTER TABLE xhShopYeChange MODIFY `balance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前余额';
-ALTER TABLE xhShopYeChange MODIFY `txBalance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前可提现余额';
-ALTER TABLE xhCash MODIFY `event` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '说明';
-ALTER TABLE xhCash ADD sjName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商家名称' AFTER `shopId`;
-ALTER TABLE xhCash ADD shopName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '门店名称' AFTER `sjName`;
-ALTER TABLE xhCash ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '申请提现的员工' AFTER `shopId`;
-ALTER TABLE xhCash ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '申请提现的员工' AFTER `shopId`;
-ALTER TABLE xhCash ADD cashName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '姓名' AFTER `shopName`;
-ALTER TABLE xhCash ADD cashAccount VARCHAR(100) NOT NULL DEFAULT '' COMMENT '帐号' AFTER `cashName`;
-ALTER TABLE xhCash ADD thirdOrderSn VARCHAR(200) NOT NULL DEFAULT '' COMMENT '第三方流水号' AFTER `cashAccount`;
+
 CREATE TABLE `xhCashSn` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB AUTO_INCREMENT=12123500 COMMENT='提现申请订单号';
-ALTER TABLE xhCash ADD orderSn CHAR(30) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `id`;
 ALTER TABLE xhPurchase ADD couponId INT NOT NULL DEFAULT 0 COMMENT '优惠券id' AFTER `clearId`;
 ALTER TABLE xhShopCoupon ADD take TINYINT NOT NULL DEFAULT 1 COMMENT '1未占用 2占用' AFTER `capitalType`;
 ALTER TABLE xhPurchase ADD discountAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '优惠金额' AFTER `couponId`;
@@ -2583,68 +2301,397 @@ ALTER TABLE xhPurchase MODIFY `discountType` TINYINT(4) NOT NULL DEFAULT '1' COM
 ALTER TABLE `xhGhsStockRecord`
 ADD COLUMN `productId`  int(11) NOT NULL DEFAULT 0 AFTER `orderSn`;
 
----shish 20210518
+
 ALTER TABLE xhGhsOrder ADD customPrice DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '客户实际付款金额' AFTER `actPrice`;
-ALTER TABLE xhShopYeChange MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源 1门店 2商城 3朋友圈 请查看dict.php文件';
 ALTER TABLE xhOrder MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源 1门店 2商城 3朋友圈 请查看dict.php文件';
 ALTER TABLE xhOrder MODIFY `store` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '门店订单，作废字段。';
 ALTER TABLE xhOrder MODIFY `sourceType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源，作废字段';
-ALTER TABLE xhShopYeChange ADD tx TINYINT NOT NULL DEFAULT 1 COMMENT '本条变动的余额 1不可提现 2可提现' AFTER `txBalance`;
 ALTER TABLE xhClear ADD payWay TINYINT NOT NULL DEFAULT 0 COMMENT '支付方式 请查看dict.php' AFTER `type`;
 
-----linqh  2021.5.18
-ALTER TABLE `xhGhsStockOutOrderItem`
-MODIFY COLUMN `itemStock`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '当时的库存(变更前）' AFTER `itemNum`,
-ADD COLUMN `newStock`  decimal(10,2) NOT NULL DEFAULT 0 COMMENT '变更后的库存' AFTER `itemPrice`;
+ALTER TABLE xhRecharge ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AFTER `totalRecharge`;
+ALTER TABLE xhRecharge ADD shopAdminName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `shopAdminId`;
 
------shish 20210519
-DROP TABLE IF EXISTS `xhPtAsset`;
-CREATE TABLE IF NOT EXISTS `xhPtAsset`(
-id INT NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '自增id',
-amount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '金额'
-)COMMENT='平台资产';
-DROP TABLE IF EXISTS `xhPtYeChange`;
-CREATE TABLE IF EXISTS `xhPtYeChange` (
+
+告诉供货商采购之后价格会自动变化 如果不合意需要自己去改价
+
+drop table if exists `xhShop`;
+CREATE TABLE if not exists `xhShop` (
+  `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',
+  `ptStyle` tinyint(4) NOT NULL DEFAULT '1' COMMENT '所属平台 1花店 2供货商 请查看dict.php',
+  `adminId` int(11) NOT NULL DEFAULT '0' COMMENT '店长id',
+  `img` varchar(1000) NOT NULL DEFAULT '' COMMENT '图片',
+  `balance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '余额',
+  `freezeBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '提现时被冻结的余额',
+  `txBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '可提现余额',
+  `fixBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '只能向推荐人消费的余额，指定余额',
+  `totalRecharge` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值',
+  `totalStudent` int(11) NOT NULL DEFAULT '0' COMMENT '总学员数',
+  `mobile` varchar(15) NOT NULL DEFAULT '' COMMENT '手机号',
+  `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 '完整地址',
+  `showAddress` varchar(900) 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 '累计收入',
+  `totalExpend` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '总支出',
+  `totalItem` int(11) NOT NULL DEFAULT '0' COMMENT '总花材数',
+  `default` tinyint(4) NOT NULL DEFAULT '0' COMMENT '默认门店 0不是 1是，默认门店不能删除',
+  `totalOrder` int(11) NOT NULL DEFAULT '0' COMMENT '总订单数；包括付款和未付款的',
+  `totalOrderNum` int(11) NOT NULL DEFAULT '0' COMMENT '总订单，只包括已付款订单，暂不考虑退款订单',
+  `finishOrder` int(11) NOT NULL DEFAULT '0' COMMENT '完成订单数',
+  `unPayOrder` int(11) NOT NULL DEFAULT '0' COMMENT '待付款订单数',
+  `unSendOrder` int(11) NOT NULL DEFAULT '0' COMMENT '待配送订单数',
+  `sendingOrder` int(11) NOT NULL DEFAULT '0' COMMENT '配送中订单数',
+  `cancelOrder` int(11) NOT NULL DEFAULT '0' COMMENT '已取消订单数',
+  `cashAccount` varchar(50) NOT NULL DEFAULT '' COMMENT '支付宝提现帐号',
+  `cashName` varchar(20) NOT NULL DEFAULT '' COMMENT '支付宝提现姓名',
+  `delStatus` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除状态 0没有删除 1已删除',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '门店状态 0停用 1正常',
+  `totalView` int(11) NOT NULL DEFAULT '0' COMMENT '累计访问次数',
+  `totalUser` int(11) NOT NULL DEFAULT '0' COMMENT '总用户；总客户数',
+  `totalPurchaseOrder` int(11) NOT NULL DEFAULT '0' COMMENT '总采购订单',
+  `totalPurchase` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计采购',
+  `cgUnPay` int(11) NOT NULL DEFAULT '0' COMMENT '采购待付款订单数',
+  `cgUnSend` int(11) NOT NULL DEFAULT '0' COMMENT '采购待配送订单数',
+  `cgSending` int(11) NOT NULL DEFAULT '0' COMMENT '采购配送中订单数',
+  `cgFinish` int(11) NOT NULL DEFAULT '0' COMMENT '采购完成订单数',
+  `cgCancel` int(11) NOT NULL DEFAULT '0' COMMENT '采购取消订单数',
+  `mayGathering` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '应收款',
+  `rechargeNum` int(11) NOT NULL DEFAULT '0' COMMENT '充值续期数量',
+  `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=36096 comment='门店';
+drop table if exists `xhShopAdmin`;
+CREATE TABLE `xhShopAdmin` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `adminId` int(11) NOT NULL DEFAULT '0' COMMENT '管理员id',
+  `avatar` varchar(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '头像',
+  `name` varchar(80) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '姓名',
+  `mobile` char(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '手机号',
+  `merchantId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `kdAmount` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '业绩，累计开单金额',
+  `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',
+  `super` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否超级管理员0不是1是',
+  `founder` tinyint(4) NOT NULL DEFAULT '1' COMMENT '创始人 1不是 2是',
+  `delStatus` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除状态 0正常 1已删除',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态 0停用 1正常',
+  `lastLogin` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后登陆时间',
+  `remark` varchar(1000) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  PRIMARY KEY (`id`)
+) AUTO_INCREMENT=125878 COMMENT='员工';
+drop table if exists `xhGhsCustom`;
+CREATE TABLE if not exists `xhGhsCustom` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) NOT NULL DEFAULT '0' COMMENT 'a是b的客户，则b是a的供应商，即ghsId',
+  `avatar` varchar(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '头像',
+  `ownSjId` int(11) NOT NULL DEFAULT '0' COMMENT '所有者商家id',
+  `ownShopId` int(11) NOT NULL DEFAULT '0' COMMENT '所有者门店id',
+  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '客户商家id',
+  `shopId` int(11) NOT NULL DEFAULT '0' COMMENT '客户门店id',
+  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '客户名称',
+  `py` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '拼音首字母',
+  `mobile` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '店长手机号',
+  `isOpen` tinyint(4) NOT NULL DEFAULT '1' COMMENT '已开店 0没有 1有',
+  `debt` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否允许欠款买花 0不允许 1允许',
+  `isDebt` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否有欠款 0没有 1有',
+  `debtAmount` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '欠款金额',
+  `debtNum` int(11) NOT NULL DEFAULT '0' COMMENT '欠款笔数',
+  `province` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '省',
+  `city` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '市',
+  `dist` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '区县',
+  `address` varchar(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '客户地址',
+  `floor` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '楼号门牌号',
+  `fullAddress` varchar(900) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '完整地址',
+  `showAddress` varchar(900) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址',
+  `lat` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '纬度',
+  `long` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '经度',
+  `growth` int(11) NOT NULL DEFAULT '0' COMMENT '成长值',
+  `buyNum` int(11) NOT NULL DEFAULT '0' COMMENT '消费次数',
+  `buyAmount` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费',
+  `recharge` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值',
+  `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  `visitTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次访问时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `custom` (`ownShopId`,`shopId`)
+) COMMENT='供货商客户';
+
+drop table if exists `xhGhsCustom`;
+CREATE TABLE if not exists `xhGhsCustom` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) NOT NULL DEFAULT '0' COMMENT 'a是b的客户，则b是a的供应商，即ghsId',
+  `avatar` varchar(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '头像',
+  `ownSjId` int(11) NOT NULL DEFAULT '0' COMMENT '所有者商家id',
+  `ownShopId` int(11) NOT NULL DEFAULT '0' COMMENT '所有者门店id',
+  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '客户商家id',
+  `shopId` int(11) NOT NULL DEFAULT '0' COMMENT '客户门店id',
+  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '客户名称',
+  `py` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '拼音首字母',
+  `mobile` varchar(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '店长手机号',
+  `isOpen` tinyint(4) NOT NULL DEFAULT '1' COMMENT '已开店 0没有 1有',
+  `debt` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否允许欠款买花 0不允许 1允许',
+  `isDebt` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否有欠款 0没有 1有',
+  `debtAmount` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '欠款金额',
+  `debtNum` int(11) NOT NULL DEFAULT '0' COMMENT '欠款笔数',
+  `province` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '省',
+  `city` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '市',
+  `dist` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '区县',
+  `address` varchar(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '客户地址',
+  `floor` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '楼号门牌号',
+  `fullAddress` varchar(900) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '完整地址',
+  `showAddress` varchar(900) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址',
+  `lat` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '纬度',
+  `long` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '经度',
+  `growth` int(11) NOT NULL DEFAULT '0' COMMENT '成长值',
+  `buyNum` int(11) NOT NULL DEFAULT '0' COMMENT '消费次数',
+  `buyAmount` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费',
+  `recharge` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值',
+  `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  `visitTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次访问时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `custom` (`ownShopId`,`shopId`)
+) COMMENT='供货商客户';
+drop table if exists `xhGhsOrderExpress`;
+CREATE TABLE if not exists `xhGhsOrderExpress` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `orderId` int(11) NOT NULL DEFAULT '0' COMMENT '订单id',
+  `orderSn` char(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+  `sjId` int(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `expressId` int(11) NOT NULL DEFAULT '0' COMMENT '配送方id',
+  `expressName` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '配送方名称',
+  `distance` decimal(10,1) NOT NULL DEFAULT '0.0' COMMENT '距离',
+  `cost` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '运费',
+  `tip` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '小费',
+  `sendTime` int(11) NOT NULL DEFAULT '0' COMMENT '要求配送时间',
+  `dmName` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '骑手名',
+  `dmMobile` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '骑手手机号',
+  `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '1待接单 2已接单 3已完成 4已取消',
+  `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+  PRIMARY KEY (`id`)
+) COMMENT='第三方配送';
+drop table if exists `xhShop`;
+CREATE TABLE `xhShop` (
+  `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',
+  `ptStyle` tinyint(4) NOT NULL DEFAULT '1' COMMENT '所属平台 1花店 2供货商 请查看dict.php',
+  `adminId` int(11) NOT NULL DEFAULT '0' COMMENT '店长id',
+  `img` varchar(1000) NOT NULL DEFAULT '' COMMENT '图片',
+  `balance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '余额',
+  `freezeBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '提现时被冻结的余额',
+  `txBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '可提现余额',
+  `fixBalance` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '只能向推荐人消费的余额，指定余额',
+  `totalRecharge` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值',
+  `totalStudent` int(11) NOT NULL DEFAULT '0' COMMENT '总学员数',
+  `mobile` varchar(15) NOT NULL DEFAULT '' COMMENT '手机号',
+  `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 '完整地址',
+  `showAddress` varchar(900) 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 '累计收入',
+  `totalExpend` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '总支出',
+  `totalItem` int(11) NOT NULL DEFAULT '0' COMMENT '总花材数',
+  `default` tinyint(4) NOT NULL DEFAULT '0' COMMENT '默认门店 0不是 1是，默认门店不能删除',
+  `totalOrder` int(11) NOT NULL DEFAULT '0' COMMENT '总订单数；包括付款和未付款的',
+  `totalOrderNum` int(11) NOT NULL DEFAULT '0' COMMENT '总订单，只包括已付款订单，暂不考虑退款订单',
+  `finishOrder` int(11) NOT NULL DEFAULT '0' COMMENT '完成订单数',
+  `unPayOrder` int(11) NOT NULL DEFAULT '0' COMMENT '待付款订单数',
+  `unSendOrder` int(11) NOT NULL DEFAULT '0' COMMENT '待配送订单数',
+  `sendingOrder` int(11) NOT NULL DEFAULT '0' COMMENT '配送中订单数',
+  `cancelOrder` int(11) NOT NULL DEFAULT '0' COMMENT '已取消订单数',
+  `cashAccount` varchar(50) NOT NULL DEFAULT '' COMMENT '支付宝提现帐号',
+  `cashName` varchar(20) NOT NULL DEFAULT '' COMMENT '支付宝提现姓名',
+  `delStatus` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除状态 0没有删除 1已删除',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '门店状态 0停用 1正常',
+  `totalView` int(11) NOT NULL DEFAULT '0' COMMENT '累计访问次数',
+  `totalUser` int(11) NOT NULL DEFAULT '0' COMMENT '总用户；总客户数',
+  `totalPurchaseOrder` int(11) NOT NULL DEFAULT '0' COMMENT '总采购订单',
+  `totalPurchase` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计采购',
+  `cgUnPay` int(11) NOT NULL DEFAULT '0' COMMENT '采购待付款订单数',
+  `cgUnSend` int(11) NOT NULL DEFAULT '0' COMMENT '采购待配送订单数',
+  `cgSending` int(11) NOT NULL DEFAULT '0' COMMENT '采购配送中订单数',
+  `cgFinish` int(11) NOT NULL DEFAULT '0' COMMENT '采购完成订单数',
+  `cgCancel` int(11) NOT NULL DEFAULT '0' COMMENT '采购取消订单数',
+  `mayGathering` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT '应收款',
+  `rechargeNum` int(11) NOT NULL DEFAULT '0' COMMENT '充值续期数量',
+  `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) comment='门店';
+DROP TABLE IF EXISTS `xhPurchaseItem`;
+CREATE TABLE `xhPurchaseItem` (
+  `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `orderSn` CHAR(40) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+  `productId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '产品ID',
+  `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '花材ID',
+  `itemNum` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '大单位数量，支持小数点',
+  `itemInfo` TEXT COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '花材信息json',
+  `ghsProductId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '供货商的productId',
+  `ratio` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '大小单位转换比例，1扎多少支，1包多少支，1箱多少块 0表示只有一个单位',
+  `price` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '单价',
+  `totalPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '总价',
+  PRIMARY KEY (`id`)
+) COMMENT='采购单详情';
+DROP TABLE IF EXISTS `xhGhs`;
+CREATE TABLE IF NOT EXISTS `xhGhs` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT,
+  `customId` INT(11) NOT NULL DEFAULT '0' COMMENT 'a是b的供应商，则b是a的客户，即customId',
+  `avatar` VARCHAR(800) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '头像',
+  `name` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '供货商名称',
+  `py` VARCHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称拼音首字母',
+  `mobile` CHAR(15) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '手机号',
+  `province` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '省',
+  `city` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '市',
+  `dist` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '区县',
+  `address` VARCHAR(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '街道地址',
+  `floor` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '楼号门牌号',
+  `fullAddress` VARCHAR(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '完整地址',
+  `showAddress` VARCHAR(900) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '地图接口显示的完整地址',
+  `lat` VARCHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '纬度',
+  `long` VARCHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '经度',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商商家id',
+  `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商门店id',
+  `ownSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '所有者商家id',
+  `ownShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '所有者门店id',
+  `debt` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1没有欠款 2有欠款',
+  `debtNum` SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '欠款订单数，欠款笔数',
+  `debtAmount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '欠款金额',
+  `expendAmount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '消费金额',
+  `expendNum` INT(11) NOT NULL DEFAULT '0' COMMENT '消费次数',
+  `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `ghs` (`ownShopId`,`shopId`)
+) COMMENT='供应商关系';
+DROP TABLE IF EXISTS `xhCash`;
+CREATE TABLE IF NOT EXISTS `xhCash` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT,
+  `orderSn` CHAR(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `shopId` INT(11) NOT NULL DEFAULT '0',
+  `shopAdminId` INT(11) NOT NULL DEFAULT '0' COMMENT '申请提现的员工',
+  `shopAdminName` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '员工姓名',
+  `sjName` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商家名称',
+  `shopName` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '门店名称',
+  `thirdOrderSn` VARCHAR(200) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '第三方流水号',
+  `cashName` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '收款人姓名',
+  `cashAccount` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '收款人账号',
+  `event` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '说明',
+  `amount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '提现金额',
+  `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1待审核 2通过 3未通过',
+  `remark` VARCHAR(1000) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '备注',
+  `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  PRIMARY KEY (`id`)
+) COMMENT='提现订单';
+DROP TABLE IF EXISTS `xhGhsStockOutOrderItem`;
+CREATE TABLE IF NOT EXISTS `xhGhsStockOutOrderItem` (
+  `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `orderSn` CHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+  `productId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '商品ID',
+  `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '花材ID',
+  `itemNum` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '出库花材数量',
+  `itemStock` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '当时的库存(变更前）',
+  `itemInfo` TEXT COLLATE utf8mb4_unicode_ci COMMENT '花材信息json{"itemName":"","itemCover":"","itemRank":""}',
+  `itemPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '价格',
+  `newStock` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '变更后的库存',
+  PRIMARY KEY (`id`),
+  KEY `idx_orderNum` (`orderSn`) USING BTREE,
+  KEY `idx_goodsItemId` (`itemId`) USING BTREE
+) COMMENT='出库入库订单详情表';
+DROP TABLE IF EXISTS `xhShopYeChange`;
+CREATE TABLE `xhShopYeChange` (
   `id` INT(11) NOT NULL AUTO_INCREMENT,
-  `style` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '平台类型 1花店 2供货商',
   `relateId` INT(11) NOT NULL DEFAULT '0' COMMENT '关联订单id',
+  `ptStyle` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '平台类型 查看dict.php表',
   `capitalType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '流水类型',
   `amount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '变动金额',
   `balance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前余额',
   `txBalance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前可提现余额',
-  `tx` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '本条变动的余额 1不可提现 2可提现',
+  `tx` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '本条变动的余额 1不可提现 2可提现 请查看dict.php yeTx',
   `io` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '类型 0减少 1增加',
   `payWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '支付方式',
   `fromType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源 1门店 2商城 3朋友圈 请查看dict.php文件',
-  `event` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '事项',
+  `event` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '事项',
   `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
   `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '门店id',
   `remark` VARCHAR(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '备注',
   `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
   `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
   PRIMARY KEY (`id`)
+) COMMENT='门店余额变化记录';
+DROP TABLE IF EXISTS `xhPtYeChange`;
+CREATE TABLE `xhPtYeChange` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT,
+  `ptStyle` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '平台类型 查看dict.php表',
+  `relateId` INT(11) NOT NULL DEFAULT '0' COMMENT '关联订单id',
+  `capitalType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '流水类型',
+  `amount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '变动金额',
+  `balance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前余额',
+  `txBalance` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前可提现余额',
+  `tx` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '本条变动的余额 1不可提现 2可提现 请查看dict.php yeTx',
+  `io` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '类型 0减少 1增加',
+  `payWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '支付方式',
+  `fromType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源 1门店 2商城 3朋友圈 请查看dict.php文件',
+  `event` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '事项',
+  `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '门店id',
+  `shopName` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '门店名称',
+  `sjName` VARCHAR(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商家名称',
+  `remark` VARCHAR(500) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '备注',
+  `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+  `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  PRIMARY KEY (`id`),
+  KEY `search` (`ptStyle`,`sjId`,`shopId`)
 ) COMMENT='平台余额变化记录';
-ALTER TABLE `xhPtYeChange` ADD INDEX `search`(`style`,`sjId`,`shopId`);
-ALTER TABLE `xhPtAsset` ADD `name` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '资产名称' AFTER `id`;
-ALTER TABLE xhShop ADD sjStyle TINYINT NOT NULL DEFAULT 1 COMMENT '商家类型 1花店 2供货商 3昆明供货商' AFTER `merchantId`;
-ALTER TABLE xhShop CHANGE sjStyle ptStyle TINYINT NOT NULL DEFAULT 1 COMMENT '所属平台 1花店 2供货商 请查看dict.php';
-INSERT INTO xhPtAsset VALUES(1,'零售平台余额',0.00),(2,'供货商平台余额',0.00),(3,'零售平台可提现余额',0.00),(4,'供货商平台可提现余额',0.00);
-ALTER TABLE xhPtYeChange MODIFY `tx` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '本条变动的余额 1不可提现 2可提现 请查看dict.php yeTx';
-ALTER TABLE xhShopYeChange MODIFY `tx` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '本条变动的余额 1不可提现 2可提现 请查看dict.php yeTx';
-ALTER TABLE xhRecharge ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AFTER `totalRecharge`;
-ALTER TABLE xhRecharge ADD shopAdminName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `shopAdminId`;
-ALTER TABLE xhCash DROP COLUMN `cashName`;
-ALTER TABLE xhCash DROP COLUMN `cashAccount`;
-ALTER TABLE xhCash ADD shopAdminName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '员工姓名' AFTER `shopAdminId`;
-ALTER TABLE xhCash MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1待审核 2通过 3未通过';
-ALTER TABLE xhCash DROP COLUMN `balance`;
-ALTER TABLE xhCash ADD remark VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '备注' AFTER `status`;
-ALTER TABLE xhCash ADD `cashName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '收款人姓名' AFTER `thirdOrderSn`;
-ALTER TABLE xhCash ADD `cashAccount` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '收款人账号' AFTER `cashName`;
-ALTER TABLE xhPtYeChange CHANGE `style` `ptStyle` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型 查看dict.php表';
-ALTER TABLE xhShopYeChange ADD `ptStyle` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型 查看dict.php表' AFTER `relateId`;
-ALTER TABLE xhPtYeChange ADD shopName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '门店名称' AFTER `shopId`;
-ALTER TABLE xhPtYeChange ADD sjName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '商家名称' AFTER `shopId`;
-
-
-告诉供货商采购之后价格会自动变化 如果不合意需要自己去改价
+DROP TABLE IF EXISTS `xhPtAsset`;
+CREATE TABLE `xhPtAsset` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `name` VARCHAR(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '资产名称',
+  `amount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '金额',
+  PRIMARY KEY (`id`)
+) COMMENT='平台资产';
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+线上数据库需要同步修改
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------