Merge remote-tracking branch 'origin/dev_yy_dh' into dev_yy_dh

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -59,7 +59,7 @@ info:
     version: '@project.version@'
 # -----------------------------------------------------------
 mybatis-plus:
-  mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml,classpath:com.liquidnet.service.*.mapper/*Mapper.xml,classpath:com.liquidnet.service.kylin.mapper/*Mapper.xml
+  mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml
 # -----------------------------------------------------------
 spring:
   application:

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql

@@ -96,3 +96,31 @@ CREATE TABLE `goblin_nft_ex_code_task_relation`
     PRIMARY KEY (`mid`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '兑换码定时任务生成副表' ROW_FORMAT = Dynamic;
 
+# 预约关联表新增创建时间
+ALTER TABLE `goblin_goods_anticipate_user` ADD `created_date` datetime NULL DEFAULT NULL COMMENT '创建时间';
+
+# goblin_goods_anticipate  预约表新增字段
+ALTER TABLE `goblin_goods_anticipate` ADD `people` bigint NOT NULL COMMENT '预约人数（达到一定人数可以预约）';
+ALTER TABLE `goblin_goods_anticipate` ADD `type` int NOT NULL COMMENT '预约类型（1：预约提醒，2：预约获得购买资格）';
+
+# -- >>------------------------------------------------------------------------------------
+
+
+DROP TABLE IF EXISTS `goblin_goods_anticipate_help`;
+CREATE TABLE `goblin_goods_anticipate_help`  (
+                                                 `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+                                                 `sid` varbinary(255) NOT NULL COMMENT '分享sid',
+                                                 `help_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '助力人uid',
+                                                 `created_date` datetime NOT NULL COMMENT '创建时间',
+                                                 PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约他人助力记录表' ROW_FORMAT = Dynamic;
+# -- >>------------------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `goblin_goods_anticipate_share`;
+CREATE TABLE `goblin_goods_anticipate_share`  (
+                                                  `sid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
+                                                  `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '用户uid',
+                                                  `sku_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'sku_Id',
+                                                  `created_date` datetime NOT NULL COMMENT '创建时间',
+                                                  PRIMARY KEY (`sid`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约创建助力表' ROW_FORMAT = Dynamic;