Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复 product_spu 相关的单元测试 #513

Open
wants to merge 7 commits into
base: master-jdk17
Choose a base branch
from
Open

修复 product_spu 相关的单元测试 #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba0cb78
fix: 修复创建商品时缺少 status 的问题
DevDengChao May 8, 2024
232424d
fix: 修复试图使用 MySQL 脚本创建测试用 H2 数据表的问题
DevDengChao May 8, 2024
8378515
fix: 修复测试用 H2 数据表中缺少的 delivery_types 字段
DevDengChao May 8, 2024
aa353d0
fix: 测试用 H2 数据表不对部分字段进行非空约束
DevDengChao May 8, 2024
92a96b8
fix: 补充测试用 H2 数据表部分字段的默认值
DevDengChao May 8, 2024
898a0e6
fix: 修复测试用例中的断言
DevDengChao May 8, 2024
38f565a
Merge branch 'master-jdk17' into fix/product-spu
DevDengChao Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ain/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ public class ProductSpuSaveReqVO {
@NotNull(message = "商品排序字段不能为空")
private Integer sort;

@Schema(description = "商品状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@NotNull(message = "商品状态字段不能为空")
private Integer status;

// ========== SKU 相关字段 =========

@Schema(description = "规格类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ void testGetSpuPage() {

PageResult<ProductSpuDO> spuPage = productSpuService.getSpuPage(productSpuPageReqVO);

assertEquals(1, spuPage.getTotal());
assertEquals(6, spuPage.getTotal());
}

/**
Expand Down
37 changes: 19 additions & 18 deletions yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,30 @@ CREATE TABLE IF NOT EXISTS `product_spu` (
`keyword` varchar(256) NOT NULL COMMENT '关键字',
`introduction` varchar(256) NOT NULL COMMENT '商品简介',
`description` text NOT NULL COMMENT '商品详情',
`bar_code` varchar(64) NOT NULL COMMENT '条形码',
`bar_code` varchar(64) NULL COMMENT '条形码',
`category_id` bigint NOT NULL COMMENT '商品分类编号',
`brand_id` int DEFAULT NULL COMMENT '商品品牌编号',
`pic_url` varchar(256) NOT NULL COMMENT '商品封面图',
`slider_pic_urls` varchar(2000) DEFAULT '' COMMENT '商品轮播图地址\n 数组，以逗号分隔\n 最多上传15张',
`video_url` varchar(256) DEFAULT NULL COMMENT '商品视频',
`unit` tinyint NOT NULL COMMENT '单位',
`unit` tinyint NULL COMMENT '单位',
`sort` int NOT NULL DEFAULT '0' COMMENT '排序字段',
`status` tinyint NOT NULL COMMENT '商品状态: 0 上架（开启） 1 下架（禁用）-1 回收',
`spec_type` bit(1) NOT NULL COMMENT '规格类型：0 单规格 1 多规格',
`price` int NOT NULL DEFAULT '-1' COMMENT '商品价格，单位使用：分',
`market_price` int NOT NULL COMMENT '市场价，单位使用：分',
`cost_price` int NOT NULL DEFAULT '-1' COMMENT '成本价，单位： 分',
`stock` int NOT NULL DEFAULT '0' COMMENT '库存',
`delivery_types` varchar(64) NULL COMMENT '配送方式数组',
`delivery_template_id` bigint NOT NULL COMMENT '物流配置模板编号',
`recommend_hot` bit(1) NOT NULL COMMENT '是否热卖推荐: 0 默认 1 热卖',
`recommend_benefit` bit(1) NOT NULL COMMENT '是否优惠推荐: 0 默认 1 优选',
`recommend_best` bit(1) NOT NULL COMMENT '是否精品推荐: 0 默认 1 精品',
`recommend_new` bit(1) NOT NULL COMMENT '是否新品推荐: 0 默认 1 新品',
`recommend_good` bit(1) NOT NULL COMMENT '是否优品推荐',
`give_integral` int NOT NULL COMMENT '赠送积分',
`recommend_hot` bit(1) default 0 NOT NULL COMMENT '是否热卖推荐: 0 默认 1 热卖',
`recommend_benefit` bit(1) default 0 NOT NULL COMMENT '是否优惠推荐: 0 默认 1 优选',
`recommend_best` bit(1) default 0 NOT NULL COMMENT '是否精品推荐: 0 默认 1 精品',
`recommend_new` bit(1) default 0 NOT NULL COMMENT '是否新品推荐: 0 默认 1 新品',
`recommend_good` bit(1) default 0 NOT NULL COMMENT '是否优品推荐',
`give_integral` int default 0 NOT NULL COMMENT '赠送积分',
`give_coupon_template_ids` varchar(512) DEFAULT '' COMMENT '赠送的优惠劵编号的数组',
`sub_commission_type` bit(1) NOT NULL COMMENT '分销类型',
`sub_commission_type` bit(1) default 0 NOT NULL COMMENT '分销类型',
`activity_orders` varchar(16) NOT NULL DEFAULT '' COMMENT '活动显示排序0=默认, 1=秒杀，2=砍价，3=拼团',
`sales_count` int DEFAULT '0' COMMENT '商品销量',
`virtual_sales_count` int DEFAULT '0' COMMENT '虚拟销量',
Expand Down Expand Up @@ -126,11 +127,11 @@ CREATE TABLE IF NOT EXISTS `product_property_value` (
PRIMARY KEY("id")
) COMMENT '规格值';

DROP TABLE IF EXISTS `product_comment` (
CREATE TABLE IF NOT EXISTS `product_comment` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '评论编号，主键自增',
`user_id` bigint DEFAULT NULL COMMENT '评价人的用户编号关联 MemberUserDO 的 id 编号',
`user_nickname` varchar(255) DEFAULT NULL COMMENT '评价人名称',
`user_avatar` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '评价人头像',
`user_avatar` varchar(1024) DEFAULT NULL COMMENT '评价人头像',
`anonymous` bit(1) DEFAULT NULL COMMENT '是否匿名',
`order_id` bigint DEFAULT NULL COMMENT '交易订单编号关联 TradeOrderDO 的 id 编号',
`order_item_id` bigint DEFAULT NULL COMMENT '交易订单项编号关联 TradeOrderItemDO 的 id 编号',
Expand All @@ -141,17 +142,17 @@ DROP TABLE IF EXISTS `product_comment` (
`scores` tinyint DEFAULT NULL COMMENT '评分星级1-5分',
`description_scores` tinyint DEFAULT NULL COMMENT '描述星级1-5 星',
`benefit_scores` tinyint DEFAULT NULL COMMENT '服务星级1-5 星',
`content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '评论内容',
`content` varchar(1024) DEFAULT NULL COMMENT '评论内容',
`pic_urls` varchar(4096) DEFAULT NULL COMMENT '评论图片地址数组',
`reply_status` bit(1) DEFAULT NULL COMMENT '商家是否回复',
`reply_user_id` bigint DEFAULT NULL COMMENT '回复管理员编号关联 AdminUserDO 的 id 编号',
`reply_content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '商家回复内容',
`reply_content` varchar(1024) DEFAULT NULL COMMENT '商家回复内容',
`reply_time` datetime DEFAULT NULL COMMENT '商家回复时间',
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
`creator` varchar(64) DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
`updater` varchar(64) DEFAULT '' COMMENT '更新者',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
`deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
`tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '商品评论';
PRIMARY KEY (`id`)
) COMMENT = '商品评论';