Commit 680718c78fef80cc8af491bbb9a23196af17138d
1 parent
30fce291
营销：统一装修预览图片字段名称
Showing
6 changed files
with
13 additions
and
14 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/page/DiyPageBaseVO.java
| @@ -24,6 +24,6 @@ public class DiyPageBaseVO { | @@ -24,6 +24,6 @@ public class DiyPageBaseVO { | ||
| 24 | private String remark; | 24 | private String remark; |
| 25 | 25 | ||
| 26 | @Schema(description = "预览图") | 26 | @Schema(description = "预览图") |
| 27 | - private List<String> previewImageUrls; | 27 | + private List<String> previewPicUrls; |
| 28 | 28 | ||
| 29 | } | 29 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplateBaseVO.java
| @@ -21,6 +21,6 @@ public class DiyTemplateBaseVO { | @@ -21,6 +21,6 @@ public class DiyTemplateBaseVO { | ||
| 21 | private String remark; | 21 | private String remark; |
| 22 | 22 | ||
| 23 | @Schema(description = "预览图", example = "[https://www.iocoder.cn/1.jpg]") | 23 | @Schema(description = "预览图", example = "[https://www.iocoder.cn/1.jpg]") |
| 24 | - private List<String> previewImageUrls; | 24 | + private List<String> previewPicUrls; |
| 25 | 25 | ||
| 26 | } | 26 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/diy/DiyPageDO.java
| @@ -44,12 +44,11 @@ public class DiyPageDO extends BaseDO { | @@ -44,12 +44,11 @@ public class DiyPageDO extends BaseDO { | ||
| 44 | * 备注 | 44 | * 备注 |
| 45 | */ | 45 | */ |
| 46 | private String remark; | 46 | private String remark; |
| 47 | - // TODO @疯狂：这个字段要不改成 previewPicUrls，和别的模块一样用 pic 作为图片哇？ | ||
| 48 | /** | 47 | /** |
| 49 | * 预览图，多个逗号分隔 | 48 | * 预览图，多个逗号分隔 |
| 50 | */ | 49 | */ |
| 51 | @TableField(typeHandler = StringListTypeHandler.class) | 50 | @TableField(typeHandler = StringListTypeHandler.class) |
| 52 | - private List<String> previewImageUrls; | 51 | + private List<String> previewPicUrls; |
| 53 | /** | 52 | /** |
| 54 | * 页面属性，JSON 格式 | 53 | * 页面属性，JSON 格式 |
| 55 | */ | 54 | */ |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/diy/DiyTemplateDO.java
| @@ -50,12 +50,12 @@ public class DiyTemplateDO extends BaseDO { | @@ -50,12 +50,12 @@ public class DiyTemplateDO extends BaseDO { | ||
| 50 | * 备注 | 50 | * 备注 |
| 51 | */ | 51 | */ |
| 52 | private String remark; | 52 | private String remark; |
| 53 | - // TODO @疯狂：这个字段要不改成 previewPicUrls，和别的模块一样用 pic 作为图片哇？ | 53 | + |
| 54 | /** | 54 | /** |
| 55 | * 预览图 | 55 | * 预览图 |
| 56 | */ | 56 | */ |
| 57 | @TableField(typeHandler = StringListTypeHandler.class) | 57 | @TableField(typeHandler = StringListTypeHandler.class) |
| 58 | - private List<String> previewImageUrls; | 58 | + private List<String> previewPicUrls; |
| 59 | /** | 59 | /** |
| 60 | * uni-app 底部导航属性，JSON 格式 | 60 | * uni-app 底部导航属性，JSON 格式 |
| 61 | */ | 61 | */ |
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImplTest.java
| @@ -109,7 +109,7 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | @@ -109,7 +109,7 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 109 | o.setUsed(null); | 109 | o.setUsed(null); |
| 110 | o.setUsedTime(null); | 110 | o.setUsedTime(null); |
| 111 | o.setRemark(null); | 111 | o.setRemark(null); |
| 112 | - o.setPreviewImageUrls(null); | 112 | + o.setPreviewPicUrls(null); |
| 113 | o.setProperty(null); | 113 | o.setProperty(null); |
| 114 | o.setCreateTime(null); | 114 | o.setCreateTime(null); |
| 115 | }); | 115 | }); |
| @@ -122,8 +122,8 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | @@ -122,8 +122,8 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 122 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setUsedTime(null))); | 122 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setUsedTime(null))); |
| 123 | // 测试 remark 不匹配 | 123 | // 测试 remark 不匹配 |
| 124 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setRemark(null))); | 124 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setRemark(null))); |
| 125 | - // 测试 previewImageUrls 不匹配 | ||
| 126 | - diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setPreviewImageUrls(null))); | 125 | + // 测试 previewPicUrls 不匹配 |
| 126 | + diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setPreviewPicUrls(null))); | ||
| 127 | // 测试 property 不匹配 | 127 | // 测试 property 不匹配 |
| 128 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setProperty(null))); | 128 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setProperty(null))); |
| 129 | // 测试 createTime 不匹配 | 129 | // 测试 createTime 不匹配 |
| @@ -152,7 +152,7 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | @@ -152,7 +152,7 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 152 | o.setUsed(null); | 152 | o.setUsed(null); |
| 153 | o.setUsedTime(null); | 153 | o.setUsedTime(null); |
| 154 | o.setRemark(null); | 154 | o.setRemark(null); |
| 155 | - o.setPreviewImageUrls(null); | 155 | + o.setPreviewPicUrls(null); |
| 156 | o.setProperty(null); | 156 | o.setProperty(null); |
| 157 | o.setCreateTime(null); | 157 | o.setCreateTime(null); |
| 158 | }); | 158 | }); |
| @@ -165,8 +165,8 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | @@ -165,8 +165,8 @@ public class DiyTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 165 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setUsedTime(null))); | 165 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setUsedTime(null))); |
| 166 | // 测试 remark 不匹配 | 166 | // 测试 remark 不匹配 |
| 167 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setRemark(null))); | 167 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setRemark(null))); |
| 168 | - // 测试 previewImageUrls 不匹配 | ||
| 169 | - diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setPreviewImageUrls(null))); | 168 | + // 测试 previewPicUrls 不匹配 |
| 169 | + diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setPreviewPicUrls(null))); | ||
| 170 | // 测试 property 不匹配 | 170 | // 测试 property 不匹配 |
| 171 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setProperty(null))); | 171 | diyTemplateMapper.insert(cloneIgnoreId(dbDiyTemplate, o -> o.setProperty(null))); |
| 172 | // 测试 createTime 不匹配 | 172 | // 测试 createTime 不匹配 |
yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/create_tables.sql
| @@ -228,7 +228,7 @@ CREATE TABLE IF NOT EXISTS "promotion_diy_template" | @@ -228,7 +228,7 @@ CREATE TABLE IF NOT EXISTS "promotion_diy_template" | ||
| 228 | "used" bit NOT NULL, | 228 | "used" bit NOT NULL, |
| 229 | "used_time" varchar, | 229 | "used_time" varchar, |
| 230 | "remark" varchar, | 230 | "remark" varchar, |
| 231 | - "preview_image_urls" varchar, | 231 | + "preview_pic_urls" varchar, |
| 232 | "property" varchar NOT NULL, | 232 | "property" varchar NOT NULL, |
| 233 | "creator" varchar DEFAULT '', | 233 | "creator" varchar DEFAULT '', |
| 234 | "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | 234 | "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, |
| @@ -244,7 +244,7 @@ CREATE TABLE IF NOT EXISTS "promotion_diy_page" | @@ -244,7 +244,7 @@ CREATE TABLE IF NOT EXISTS "promotion_diy_page" | ||
| 244 | "template_id" bigint NOT NULL, | 244 | "template_id" bigint NOT NULL, |
| 245 | "name" varchar NOT NULL, | 245 | "name" varchar NOT NULL, |
| 246 | "remark" varchar, | 246 | "remark" varchar, |
| 247 | - "preview_image_urls" varchar, | 247 | + "preview_pic_urls" varchar, |
| 248 | "property" varchar, | 248 | "property" varchar, |
| 249 | "creator" varchar DEFAULT '', | 249 | "creator" varchar DEFAULT '', |
| 250 | "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | 250 | "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, |