diff --git a/sql/yx_store_seckill.sql b/sql/yx_store_seckill.sql new file mode 100644 index 00000000..660e8cf6 --- /dev/null +++ b/sql/yx_store_seckill.sql @@ -0,0 +1,65 @@ +/* + Navicat Premium Data Transfer + + Source Server : 本地 + Source Server Type : MySQL + Source Server Version : 50729 + Source Host : localhost:3306 + Source Schema : yshopb2c + + Target Server Type : MySQL + Target Server Version : 50729 + File Encoding : 65001 + + Date: 31/08/2020 09:21:52 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for yx_store_seckill +-- ---------------------------- +DROP TABLE IF EXISTS `yx_store_seckill`; +CREATE TABLE `yx_store_seckill` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '商品秒杀产品表id', + `product_id` bigint(20) UNSIGNED NOT NULL COMMENT '商品id', + `image` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '推荐图', + `images` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '轮播图', + `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '活动标题', + `info` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '简介', + `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '价格', + `cost` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '成本', + `ot_price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '原价', + `give_integral` decimal(10, 2) UNSIGNED NOT NULL COMMENT '返多少积分', + `sort` int(10) UNSIGNED NOT NULL COMMENT '排序', + `stock` int(10) UNSIGNED NOT NULL COMMENT '库存', + `sales` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '销量', + `unit_name` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '单位名', + `postage` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '邮费', + `description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '内容', + `start_time` date NOT NULL COMMENT '开始时间', + `stop_time` date NOT NULL COMMENT '结束时间', + `create_time` datetime(0) NOT NULL COMMENT '添加时间', + `update_time` datetime(0) NULL DEFAULT NULL, + `status` tinyint(1) UNSIGNED NOT NULL COMMENT '产品状态', + `is_postage` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否包邮', + `is_hot` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '热门推荐', + `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除 0未删除1已删除', + `num` int(11) UNSIGNED NOT NULL COMMENT '最多秒杀几个', + `is_show` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '显示', + `time_id` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '时间段id', + `spec_type` tinyint(1) NULL DEFAULT NULL COMMENT '规格 0单 1多', + `temp_id` int(10) NULL DEFAULT NULL COMMENT '运费模板id', + PRIMARY KEY (`id`) USING BTREE, + INDEX `product_id`(`product_id`) USING BTREE, + INDEX `start_time`(`start_time`, `stop_time`) USING BTREE, + INDEX `is_del`(`is_del`) USING BTREE, + INDEX `is_hot`(`is_hot`) USING BTREE, + INDEX `is_show`(`status`) USING BTREE, + INDEX `add_time`(`create_time`) USING BTREE, + INDEX `sort`(`sort`) USING BTREE, + INDEX `is_postage`(`is_postage`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 35 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商品秒杀产品表' ROW_FORMAT = DYNAMIC; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java index 902b7b18..fef16782 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java @@ -10,6 +10,7 @@ package co.yixiang.modules.wechat.service.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,54 +28,70 @@ public class YxWechatLiveDto implements Serializable { /** 直播间id */ /** 防止精度丢失 */ @JsonSerialize(using= ToStringSerializer.class) + @ApiModelProperty(value = "直播间id") private Long roomid; private Long id; /** 直播间标题 */ + @ApiModelProperty(value = "直播间标题") private String name; /** 背景图 */ + @ApiModelProperty(value = "背景图") private String coverImge; /** 分享图片 */ + @ApiModelProperty(value = "分享图片") private String shareImge; /** 直播间状态 */ + @ApiModelProperty(value = "直播间状态 101:直播中,102:未开始,103 已结束,104 禁播,105:暂停,106:异常,107:已过期") private Integer liveStatus; /** 开始时间 */ + @ApiModelProperty(value = "开始时间") private Long startTime; /** 预计结束时间 */ + @ApiModelProperty(value = "预计结束时间") private Long endTime; /** 主播昵称 */ + @ApiModelProperty(value = "主播昵称") private String anchorName; /** 主播微信号 */ + @ApiModelProperty(value = "主播微信号") private String anchorWechat; /** 主播头像 */ + @ApiModelProperty(value = "主播头像") private String anchorImge; /** 直播间类型 1:推流 0:手机直播 */ + @ApiModelProperty(value = "直播间类型 1:推流 0:手机直播") private Integer type; /** 横屏、竖屏 【1:横屏,0:竖屏】 */ + @ApiModelProperty(value = "横屏、竖屏 【1:横屏,0:竖屏】") private Integer screenType; /** 是否关闭点赞 【0:开启,1:关闭】 */ + @ApiModelProperty(value = "是否关闭点赞 【0:开启,1:关闭】") private Integer closeLike; /** 是否关闭评论 【0:开启,1:关闭】 */ + @ApiModelProperty(value = "是否关闭评论 【0:开启,1:关闭】") private Integer closeComment; /** 是否关闭货架 【0:开启,1:关闭】 */ + @ApiModelProperty(value = "是否关闭货架 【0:开启,1:关闭】") private Integer closeGoods; /** * 关联商品id多个,隔开 */ + private String productId; private List product; }