|
|
@@ -981,7 +981,7 @@ purchaseIds TEXT NOT NULL COMMENT '结算的采购单id,json串',
|
|
|
`addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
|
|
|
`updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
|
|
|
)COMMENT='采购单结算';
|
|
|
-CREATE TABLE IF EXISTS `xhPurchaseClearSn`;
|
|
|
+DROP TABLE IF EXISTS `xhPurchaseClearSn`;
|
|
|
CREATE TABLE IF NOT EXISTS `xhPurchaseClearSn` (
|
|
|
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
|
PRIMARY KEY (`id`)
|
|
|
@@ -2301,4 +2301,51 @@ ALTER TABLE `xhPurchaseClear` RENAME TO `xhClear`;
|
|
|
ALTER TABLE `xhPurchaseClearSn` RENAME TO `xhClearSn`;
|
|
|
ALTER TABLE xhClear ADD orderIds VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '销售单id,json串' AFTER `shopId`;
|
|
|
ALTER TABLE `xhClear` MODIFY `purchaseIds` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '采购单id,json串';
|
|
|
-ALTER TABLE `xhClear` CHANGE `orderIds` `saleOrderIds` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '销售单id,json串';
|
|
|
+ALTER TABLE `xhClear` CHANGE `orderIds` `saleOrderIds` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '销售单id,json串';
|
|
|
+
|
|
|
+
|
|
|
+DROP TABLE IF EXISTS `xhGhsOrderClear`;
|
|
|
+CREATE TABLE `xhGhsOrderClear` (
|
|
|
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
|
|
|
+ `prePrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '应付款,原价,未修改价格,打折前',
|
|
|
+ `actPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '实际付款,实价,修改后价格,打折后',
|
|
|
+ `orderSn` CHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
|
|
|
+ `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
|
|
|
+ `orderIds` TEXT COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'id的json串',
|
|
|
+ `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 `xhGhsOrderClearSn`;
|
|
|
+CREATE TABLE `xhGhsOrderClearSn` (
|
|
|
+ `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
|
+ PRIMARY KEY (`id`)
|
|
|
+) AUTO_INCREMENT=12568276 COMMENT='清算订单号';
|
|
|
+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`;
|
|
|
+ALTER TABLE xhGhsOrderClear ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '员工id' AFTER `customId`;
|
|
|
+ALTER TABLE xhGhsOrderClear ADD clearType TINYINT NOT NULL DEFAULT 1 COMMENT '清算方式 1花店发起清算 2供货商发起清算' AFTER `shopAdminId`;
|
|
|
+
|
|
|
+DROP TABLE IF EXISTS `xhPurchaseClear`;
|
|
|
+CREATE TABLE IF NOT EXISTS xhPurchaseClear(
|
|
|
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
|
+ `prePrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '应付款,原价,未修改价格,打折前',
|
|
|
+ `actPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '实际付款,实价,修改后价格,打折后',
|
|
|
+orderSn CHAR(20) NOT NULL DEFAULT '' COMMENT '订单号',
|
|
|
+merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
|
|
|
+purchaseIds TEXT NOT NULL COMMENT '结算的采购单id,json串',
|
|
|
+`addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
|
|
|
+`updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
|
|
|
+)COMMENT='采购单结算';
|
|
|
+DROP TABLE IF EXISTS `xhPurchaseClearSn`;
|
|
|
+CREATE TABLE IF NOT EXISTS `xhPurchaseClearSn` (
|
|
|
+ `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
|
+ PRIMARY KEY (`id`)
|
|
|
+) AUTO_INCREMENT=28586254 COMMENT='结算订单号';
|
|
|
+ALTER TABLE xhPurchaseClear ADD `deadline` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '订单失效时间' AFTER `purchaseIds`;
|
|
|
+ALTER TABLE xhPurchaseClear ADD changePrice TINYINT NOT NULL DEFAULT 1 COMMENT '1可以修改价格 2不能修改价格,微信发起支付后不能修改' AFTER `deadline`;
|
|
|
+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`;
|