diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/activity/entity/Activity.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/activity/entity/Activity.java index cc2c7ed..f6400f3 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/activity/entity/Activity.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/activity/entity/Activity.java @@ -60,6 +60,8 @@ public class Activity extends Entity { @ApiModelProperty("状态") private Integer status; + @ApiModelProperty("是否展示 0 展示 1 不展示") + private Integer display; private transient List activityProductList; diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java index 5925c46..17f8c68 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java @@ -48,5 +48,8 @@ public class Product extends Entity { @ApiModelProperty("状态(已上架、已下架)") private ProductStatusEnum status; + @ApiModelProperty("是否展示 0 展示 1 不展示") + private Integer display; + private transient List productSpecList; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java index 5b91e1f..d2b426c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java @@ -34,6 +34,9 @@ public class ActivityDto { @ApiModelProperty("活动产品集合") private List activityProductList; + @ApiModelProperty("是否展示 0 展示 1 不展示") + private Integer display; + public Activity trans2Domain(){ Activity activity = TypeConvertUtils.convert(this,Activity.class); activity.setStatus(ActivityStatusEnum.ENABLE.getValue()); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserCreateProductDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserCreateProductDto.java index 624df2f..77cff63 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserCreateProductDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserCreateProductDto.java @@ -70,6 +70,9 @@ public class UserCreateProductDto implements Trans2DomainAssembler { @ApiModelProperty("单日使用上限") private String dailyUseLimitValue; + @ApiModelProperty("是否展示 0 展示 1 不展示") + private Integer display; + @Override public Product trans2Domain() { return TypeConvertUtils.convert(this, Product.class); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserEditProductDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserEditProductDto.java index c62ca57..3051e5c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserEditProductDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserEditProductDto.java @@ -81,6 +81,9 @@ public class UserEditProductDto implements Trans2DomainAssembler { @ApiModelProperty("单日使用上限") private String dailyUseLimitValue; + @ApiModelProperty("是否展示 0 展示 1 不展示") + private Integer display; + @Override public Product trans2Domain() { Product product = TypeConvertUtils.convert(this, Product.class);