合并分支修复差异

This commit is contained in:
puhui999
2023-05-03 22:18:27 +08:00
34 changed files with 529 additions and 528 deletions

View File

@@ -54,12 +54,18 @@ public class ProductSkuServiceTest extends BaseDbUnitTest {
// mock 数据
ProductSkuDO sku01 = randomPojo(ProductSkuDO.class, o -> { // 测试更新
o.setSpuId(1L);
o.setProperties(singletonList(new ProductSkuDO.Property(10L, 20L)));
//o.setProperties(singletonList(new ProductSkuDO.Property(
// 10L, "颜色", 20L, "红色"))); TODO 新增字段已注释
o.setProperties(singletonList(new ProductSkuDO.Property(
10L, 20L)));
});
productSkuMapper.insert(sku01);
ProductSkuDO sku02 = randomPojo(ProductSkuDO.class, o -> { // 测试删除
o.setSpuId(1L);
o.setProperties(singletonList(new ProductSkuDO.Property(10L, 30L)));
//o.setProperties(singletonList(new ProductSkuDO.Property(
// 10L, "颜色", 30L, "蓝色"))); TODO 新增字段已注释
o.setProperties(singletonList(new ProductSkuDO.Property(
10L, 30L)));
});
productSkuMapper.insert(sku02);
// 准备参数