@bee-hole/server 1.39.4 → 1.40.0

package/storage/patch/patch.sql

@@ -1,47 +1,106 @@
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '北海道' WHERE `mall_country`.`id` = 486;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '青森県' WHERE `mall_country`.`id` = 487;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '岩手県' WHERE `mall_country`.`id` = 488;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '宮城県' WHERE `mall_country`.`id` = 489;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '秋田県' WHERE `mall_country`.`id` = 490;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '山形県' WHERE `mall_country`.`id` = 491;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '福島県' WHERE `mall_country`.`id` = 492;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '茨城県' WHERE `mall_country`.`id` = 493;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '栃木県' WHERE `mall_country`.`id` = 494;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '群馬県' WHERE `mall_country`.`id` = 495;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '埼玉県' WHERE `mall_country`.`id` = 496;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '千葉県' WHERE `mall_country`.`id` = 497;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '東京都' WHERE `mall_country`.`id` = 498;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '神奈川県' WHERE `mall_country`.`id` = 499;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '新潟県' WHERE `mall_country`.`id` = 500;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '富山県' WHERE `mall_country`.`id` = 501;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '石川県' WHERE `mall_country`.`id` = 502;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '福井県' WHERE `mall_country`.`id` = 503;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '山梨県' WHERE `mall_country`.`id` = 504;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '長野県' WHERE `mall_country`.`id` = 505;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '岐阜県' WHERE `mall_country`.`id` = 506;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '静岡県' WHERE `mall_country`.`id` = 507;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '愛知県' WHERE `mall_country`.`id` = 508;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '三重県' WHERE `mall_country`.`id` = 509;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '滋賀県' WHERE `mall_country`.`id` = 510;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '京都府' WHERE `mall_country`.`id` = 511;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '大阪府' WHERE `mall_country`.`id` = 512;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '兵庫県' WHERE `mall_country`.`id` = 513;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '奈良県' WHERE `mall_country`.`id` = 514;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '和歌山県' WHERE `mall_country`.`id` = 515;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '鳥取県' WHERE `mall_country`.`id` = 516;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '島根県' WHERE `mall_country`.`id` = 517;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '岡山県' WHERE `mall_country`.`id` = 518;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '広島県' WHERE `mall_country`.`id` = 519;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '山口県' WHERE `mall_country`.`id` = 520;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '徳島県' WHERE `mall_country`.`id` = 521;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '香川県' WHERE `mall_country`.`id` = 522;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '愛媛県' WHERE `mall_country`.`id` = 523;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '高知県' WHERE `mall_country`.`id` = 524;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '福岡県' WHERE `mall_country`.`id` = 525;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '佐賀県' WHERE `mall_country`.`id` = 526;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '長崎県' WHERE `mall_country`.`id` = 527;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '熊本県' WHERE `mall_country`.`id` = 528;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '大分県' WHERE `mall_country`.`id` = 529;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '宮崎県' WHERE `mall_country`.`id` = 530;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '鹿児島県' WHERE `mall_country`.`id` = 531;
-UPDATE `mall_country` SET `countries_libraryNodes_name` = '沖縄県' WHERE `mall_country`.`id` = 532;
+CREATE TABLE IF NOT EXISTS `mall_order_waybill_express_details` (
+    `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键',
+    `reference_id` bigint(20) UNSIGNED NOT NULL COMMENT '引用mall_order_waybill_express表的主键',
+    `sku_id` bigint(20) NOT NULL COMMENT '商品sku_id',
+    `title` varchar(255) NOT NULL COMMENT '商品标题',
+    `img_url` text COMMENT '商品图片链接',
+    `sku_prop` varchar(100) NOT NULL COMMENT 'sku属性',
+    `num` int(11) NOT NULL COMMENT '商品数量',
+    PRIMARY KEY (`id`),
+    KEY `reference_id` (`reference_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发货单详情';
+
+ALTER TABLE `admin_goods_supply` ADD COLUMN `mailing_mode`  int(1) NULL COMMENT '发货模式    1=>平台发货，2=>供应商' AFTER `reject_content`;
+
+ALTER TABLE `mall_goods` ADD COLUMN `mailing_mode` int(1) NULL COMMENT '发货模式    1=>平台发货，2=>供应商' AFTER `ai`;
+
+ALTER TABLE `mall_order_waybill_express` ADD COLUMN `mailing_mode`  int(1) NOT NULL COMMENT '发货模式，1=>平台发货，2=>供应商发货' AFTER `data`;
+
+ALTER TABLE `mall_order_waybill_express` ADD COLUMN `user_id`  bigint NOT NULL COMMENT '商家标记' AFTER `data`;
+
+ALTER TABLE `mall_order_items` ADD COLUMN `mailing_mode` int(1) NULL COMMENT '发货模式    1=>平台发货，2=>供应商' AFTER `out_id`;
+
+ALTER TABLE `mall_order_items` ADD COLUMN `from_platform` varchar(80) NULL COMMENT '商品来源平台' AFTER `out_id`;
+
+ALTER TABLE `mall_order_items` ADD COLUMN `from_good_id` BIGINT(20) NULL COMMENT '来源平台商品ID' AFTER `out_id`;
+
+CREATE TABLE `admin_gigab2b_order` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '大健云仓订单信息',
+    `order_id` varchar(64) DEFAULT NULL COMMENT '订单号',
+    `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
+    `ship_name` char(80) DEFAULT NULL COMMENT '收货人名字',
+    `ship_phone` char(20) DEFAULT NULL COMMENT '收货人联系方式',
+    `ship_country` char(10) DEFAULT NULL COMMENT '收货人国家编码(英文2位)',
+    `ship_state` char(10) DEFAULT NULL COMMENT '收货人省(英文2位编码)',
+    `ship_city` char(80) DEFAULT NULL COMMENT '收货人城市(英文)',
+    `ship_address1` varchar(255) DEFAULT NULL COMMENT '收货人地址 美国/英国/德国市场的参赛限制：35 个字符以内 JP商场的参赛限制：100个字符以内',
+    `ship_zip_code` char(50) DEFAULT NULL COMMENT '收货人邮编(国外)',
+    `total_amount` decimal(10,2) DEFAULT NULL COMMENT '总货款',
+    `total_discount` decimal(10,2) DEFAULT NULL COMMENT '总优惠',
+    `total_tax` decimal(10,2) DEFAULT NULL COMMENT '总税费',
+    `order_status` varchar(20) DEFAULT NULL COMMENT '订单状态',
+    `order_date` datetime DEFAULT NULL COMMENT '订单时间',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `order_id` (`order_id`,`shop_id`),
+    KEY `shop_id` (`shop_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `admin_gigab2b_order_items` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT,
+    `order_id` varchar(64) DEFAULT NULL COMMENT '订单号',
+    `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
+    `good_id` bigint(20) DEFAULT NULL COMMENT 'good_id',
+    `sku_id` bigint(20) DEFAULT NULL COMMENT 'sku_id',
+    `title` varchar(255) DEFAULT NULL COMMENT '产品名称',
+    `price` decimal(10,2) DEFAULT NULL COMMENT '第三方销售平台售价',
+    `num` int(11) DEFAULT NULL COMMENT '产品数量',
+    `out_id` char(80) DEFAULT NULL COMMENT 'B2B产品SKU',
+    `tax` decimal(10,2) DEFAULT NULL COMMENT '货物税',
+    `discount` decimal(10,2) DEFAULT NULL COMMENT '优惠金额',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    KEY `order_id` (`order_id`,`shop_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `admin_supply_order_item_relationship` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT,
+    `order_id` varchar(64) NOT NULL COMMENT '订单号',
+    `main_good_id` bigint(20) DEFAULT NULL COMMENT '主店商品',
+    `main_sku_id` bigint(20) DEFAULT NULL COMMENT '主店sku_id',
+    `main_title` varchar(255) DEFAULT NULL COMMENT '主店商品标题',
+    `main_img_url` text COMMENT '主店商品图片',
+    `main_num` int(11) DEFAULT NULL COMMENT '数量',
+    `main_barcode` varchar(64) DEFAULT NULL,
+    `main_out_id` varchar(64) DEFAULT NULL,
+    `main_sku_prop` varchar(100) DEFAULT NULL,
+    `main_mailing_mode` int(1) DEFAULT NULL COMMENT '主店商品发货模式',
+    `son_good_id` bigint(20) DEFAULT NULL COMMENT '子店铺商品',
+    `son_sku_id` bigint(20) DEFAULT NULL COMMENT '子店skuId信息',
+    `son_title` varchar(255) DEFAULT NULL,
+    `son_img_url` text,
+    `son_from_good_id` char(80) DEFAULT NULL COMMENT '子店商品来源',
+    `son_from_platfrom` varchar(80) DEFAULT NULL COMMENT '子店商品来源平台',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    KEY `order_id` (`order_id`),
+    KEY `good_id` (`main_good_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `admin_supply_orders` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT,
+    `main_shop_id` bigint(20) NOT NULL COMMENT '主店shop_id',
+    `order_id` varchar(64) NOT NULL COMMENT '订单编号',
+    `user_id` bigint(20) DEFAULT NULL COMMENT '供应商ID',
+    `shop_id` bigint(20) NOT NULL COMMENT '供应商店铺ID',
+    `status` varchar(20) NOT NULL COMMENT '订单状态',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE KEY `order` (`order_id`,`user_id`,`shop_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `mall_skus` ADD COLUMN `from_sku_id` BIGINT(20) NULL COMMENT '来源平台商品ID' AFTER `is_for_sale`;
+
+ALTER TABLE `mall_order_items` CHANGE `from_good_id` `from_good_id` VARCHAR(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源平台商品ID';
+
+ALTER TABLE `mall_order_waybill_express_details` ADD COLUMN `out_id` VARCHAR(64) NULL COMMENT 'SKU外部编号' AFTER `sku_id`;

package/version

@@ -1 +1 @@
-v1.39.4
+v1.40.0

package/resource/public/cp/css/chunk-53c2d596.02b3a875.css

@@ -1 +0,0 @@
-.loginTitle[data-v-ae53ed90]{margin-top:0;margin-bottom:2rem}.loginTitle .ant-tabs-bar[data-v-ae53ed90]{border:0}.loginTitle .ant-tabs-bar .ant-tabs-nav-scroll[data-v-ae53ed90]{text-align:center}.loginTitle .ant-tabs-bar .ant-tabs-nav-scroll .ant-tabs-tab-active.ant-tabs-tab[data-v-ae53ed90]{color:#000;font-weight:600;font-size:14px}.link-btns .ant-btn.ant-btn-link[data-v-ae53ed90],.link-btns[data-v-ae53ed90],.loginTitle .ant-tabs-bar .ant-tabs-nav-scroll .ant-tabs-tab[data-v-ae53ed90]{color:rgba(0,0,0,.25)}.QRcodeIcon[data-v-ae53ed90]{position:absolute;right:0;font-size:32px;color:#1890ff;margin-top:5px;margin-right:5px}.ant-space-align-center[data-v-ae53ed90]{color:#8f959e;line-height:30px;height:30px}.user-layout-login label[data-v-ae53ed90]{font-size:12px!important;font-size:14px}.user-layout-login .ant-page-header[data-v-ae53ed90]{padding:60px 0 45px 0}.user-layout-login .getCaptcha[data-v-ae53ed90]{display:block;width:100%;height:40px}.user-layout-login button.login-button[data-v-ae53ed90]{padding:0 15px;font-size:16px;height:40px;width:100%;border-radius:4px}.user-layout-login .icons-list .anticon[data-v-ae53ed90]{font-size:30px;width:40px}.user-layout-login .icons-list .dingtalk[data-v-ae53ed90]{color:#0089ff}.user-layout-login .icons-list .WeChat[data-v-ae53ed90]{color:#51c332}.user-layout-login .icons-list .Alipay[data-v-ae53ed90]{color:#06b4fd}.user-layout-login .icons-list .Sina[data-v-ae53ed90]{color:#d81e06}