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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsAnticipateHelp.java

@@ -19,16 +19,19 @@ public class GoblinGoodsAnticipateHelp implements Serializable {
     /**
      * skuId
      */
+    @ApiModelProperty("skuId")
     private String skuId;
 
     /**
      * 预约类型
      */
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
     private Integer type;
 
     /**
      * 配置预约人数
      */
+    @ApiModelProperty("配置预约人数")
     private Integer people;
 
     /**

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

@@ -243,19 +243,43 @@ CREATE TABLE `goblin_goods_anticipate_value`  (
                                                   `update_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
                                                   `del_tag` int NOT NULL DEFAULT 0 COMMENT '删除（0:未删除1:已删除）',
                                                   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约关联sku和spu表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约关联sku和spu表' ROW_FORMAT = Dynamic;
 
 # -- >>------------------------------------------------------------------------------------
 
 DROP TABLE IF EXISTS `goblin_goods_anticipate`;
 CREATE TABLE `goblin_goods_anticipate`  (
                                             `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增主键id',
+                                            `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '预约名称',
                                             `ant_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'ant_id',
+                                            `people` bigint NOT NULL COMMENT '预约人数（达到一定人数可以预约）',
+                                            `type` int NOT NULL COMMENT '预约类型（1：预约提醒，2：预约获得购买资格）',
                                             `rule` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '预约规则',
                                             `created_date` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
                                             `del_tag` int NOT NULL DEFAULT 0 COMMENT '删除（0:未删除1:已删除）',
                                             PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约规则表' ROW_FORMAT = Dynamic;
+# -- >>------------------------------------------------------------------------------------
+
+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',
+                                                  `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'url分享地址（备用）',
+                                                  `created_date` datetime NOT NULL COMMENT '创建时间',
+                                                  PRIMARY KEY (`sid`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约创建助力表' ROW_FORMAT = Dynamic;
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------