Merge branch 'linqh-dev'

# Conflicts:
#	sql.sql

sql.sql

@@ -218,4 +218,188 @@ ALTER TABLE `xhMerchant` MODIFY `style` TINYINT NOT NULL DEFAULT 0 COMMENT '商
 ALTER TABLE `xhMerchant` ADD `property` TINYINT NOT NULL DEFAULT 0 COMMENT '商家属性 0零售 1 供货' AFTER `style`;
 ALTER TABLE `xhMerchant` MODIFY `property` TINYINT NOT NULL DEFAULT 0 COMMENT '平台微信取用类型 0普通 1零售商使用 2供货商使用';
 ALTER TABLE `xhApply` ADD adminName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '店长姓名' AFTER adminId;
-ALTER TABLE `xhApply` MODIFY `mobile` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '店长手机号' AFTER `adminName`;
+ALTER TABLE `xhApply` MODIFY `mobile` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '店长手机号' AFTER `adminName`;
+=======
+===linqhai 2021-01-11
+
+ALTER TABLE `xhItem` ADD COLUMN `pyName`  varchar(50) NOT NULL DEFAULT '' COMMENT '花材名称的拼音首字母' AFTER `name`;
+ALTER TABLE `xhMerchantItemClass`
+ADD COLUMN `adminId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '操作人ID' AFTER `inTurn`,
+ADD INDEX `idx_merchantId` (`merchantId`) USING BTREE ;
+RENAME  TABLE xhMerchantItemClass to xhGhsItemClass;
+RENAME  TABLE xhMerchantItem to xhGhsItem;
+RENAME  TABLE xhMerchantItemRank to xhGhsItemRank;
+
+ALTER TABLE `xhGhsItemClass`
+CHANGE COLUMN `merchantId` `ghsId`  int(11) NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `id`,
+DROP INDEX `idx_merchantId` ,
+ADD INDEX `idx_ghsId` (`ghsId`) USING BTREE ;
+
+ALTER TABLE `xhGhsItem`
+CHANGE COLUMN `merchantId` `ghsId`  int(11) NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `id`,
+ADD INDEX `idx_ghsId` (`ghsId`) USING BTREE ;
+
+ALTER TABLE `xhGhsItem`
+ADD INDEX `idx_itemId` (`itemId`) USING BTREE ,
+ADD INDEX `idx_classId` (`classId`) USING BTREE ;
+
+CREATE TABLE `xhGhsItemInfo` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '供货商ID',
+  `shopId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '门店ID',
+  `itemId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '花材ID',
+  `stock` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '库存，多少扎,可以出现负库存',
+  `rank` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'B' COMMENT '花材等级 A、B、C、D',
+  `price` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '每扎的价格(对应等级价格)',
+  `actualSold` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '实际销售量',
+  `viewNum` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '浏览量',
+  `delStatus` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除 1删除',
+  `adminId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '最后操作人',
+  `addTime` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+  `updateTime` int(11) NOT NULL DEFAULT '0' COMMENT '最后修改时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='供货商的商品表，对应各个门店';
+
+
+CREATE TABLE `xhGhsCheckOrder` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '供货商ID',
+  `shopId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '门店ID',
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `orderStatus` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '盘点订单状态： 1草稿，2完成',
+  `adminId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作人ID',
+  `itemNumBundle` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(扎)(盈亏）',
+  `itemNumPiece` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(支)(盈亏）',
+  `totalItemPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '商品总价格(盈亏）',
+  `remark` varchar(1000) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '备注信息',
+  `addTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `updateTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '最后修改时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uni_orderNum` (`orderSn`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='盘点订单表';
+
+CREATE TABLE `xhGhsCheckOrderItem` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `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 '当时的库存',
+  `profitLossNum` 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 '价格',
+  PRIMARY KEY (`id`),
+  KEY `idx_orderNum` (`orderSn`) USING BTREE,
+  KEY `idx_goodsItemId` (`itemId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='盘点订单详情表';
+
+CREATE TABLE `xhGhsPurchaseOrder` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '供货商ID',
+  `shopId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '门店ID',
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `orderStatus` tinyint(2) NOT NULL DEFAULT '0' COMMENT '订单状态：1待确认，2待配送，3配送中，4已完成',
+  `adminId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '采购人ID',
+  `gysId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '供应商ID',
+  `itemNumBundle` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(扎)',
+  `itemNumPiece` int(11) DEFAULT NULL COMMENT '合计多少商品(支)',
+  `totalGoodsPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '商品总价格',
+  `packingCharge` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '打包费',
+  `shortHaulCharge` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '短途运费',
+  `lineHaulCharge` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '长途运费',
+  `pickCharge` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '提货费',
+  `localHaulCharge` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '本地运费',
+  `orderPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '订单总价',
+  `entryTime` int(11) NOT NULL DEFAULT '0' COMMENT '入库时间',
+  `addTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `updateTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '最后修改时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uni_orderNum` (`orderSn`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='采购订单表';
+
+
+CREATE TABLE `xhGhsPurchaseOrderItem` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '采购订单号',
+  `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 COMMENT '花材信息json{"itemName":"","itemCover":"","itemRank":""}   ',
+  `itemPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '采购价',
+  PRIMARY KEY (`id`),
+  KEY `idx_orderNum` (`orderSn`) USING BTREE,
+  KEY `idx_goodsItemId` (`itemId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='采购订单详情表';
+
+CREATE TABLE `xhGhsSellOrder` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '供货商ID',
+  `shopId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '门店ID',
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `orderStatus` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '订单状态： 1待确认，2下单成功，2出库中，3已完成，4取消下单',
+  `distributionMode` tinyint(2) NOT NULL DEFAULT '0' COMMENT '配送方式: 1 门店自取，2本地送，3快递',
+  `shipStatus` tinyint(2) NOT NULL DEFAULT '0' COMMENT '订单物流状态：1待确认，2待配送，3发货，4配送中，5配送中-已接单，6配送中-骑手送货中，7配送中-配送完成',
+  `shipType` tinyint(2) NOT NULL COMMENT '快递公司: 1达达，2顺丰同城3闪送，4美团',
+  `shipSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '快递单号',
+  `payMethod` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '支付方式： alipay,wxpay,defer(延期)，cash(现金收款)，',
+  `payNo` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '支付订单号',
+  `payStatus` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '支付状态：1待支付，2支付成功,3支付失败',
+  `payTime` int(11) NOT NULL DEFAULT '0' COMMENT '支付时间',
+  `adminId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '采购人ID',
+  `retailShopId` int(11) NOT NULL DEFAULT '0' COMMENT '零售门店ID',
+  `userId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '客户D',
+  `itemNumBundle` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(扎)',
+  `itemNumPiece` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(支)',
+  `totalItemPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '商品总价格',
+  `orderPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '订单总价',
+  `shipPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '运费',
+  `address` text COLLATE utf8mb4_unicode_ci COMMENT '收货地址 json',
+  `addTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `updateTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '最后修改时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uni_orderNum` (`orderSn`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='销售订单表';
+
+
+CREATE TABLE `xhGhsSellOrderItem` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `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 COMMENT '花材信息json{"itemName":"","itemCover":"","itemRank":""}',
+  `itemPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '价格',
+  PRIMARY KEY (`id`),
+  KEY `idx_orderNum` (`orderSn`) USING BTREE,
+  KEY `idx_goodsItemId` (`itemId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='销售订单详情表';
+
+CREATE TABLE `xhGhsStockOrder` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ghsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '出库的供货商ID',
+  `outShopId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '出库的门店ID',
+  `inShopId` int(11) NOT NULL DEFAULT '0' COMMENT '入库的门店ID',
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `orderStatus` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '订单状态： 1待出库，2已出库（待入库） 3已入库, 4取消出库，5取消入库',
+  `adminId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作人ID',
+  `itemNumBundle` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(扎)',
+  `itemNumPiece` int(11) NOT NULL DEFAULT '0' COMMENT '合计多少商品(支)',
+  `totalItemPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '商品总价格',
+  `remark` varchar(1000) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '备注信息',
+  `addTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `updateTime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '最后修改时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uni_orderNum` (`orderSn`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='出库入库订单表';
+
+CREATE TABLE `xhGhsStockOrderItem` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
+  `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 '价格',
+  PRIMARY KEY (`id`),
+  KEY `idx_orderNum` (`orderSn`) USING BTREE,
+  KEY `idx_goodsItemId` (`itemId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='盘点订单详情表';
+
+