diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java index eaa6cee3..7f127411 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java @@ -58,7 +58,10 @@ public class ShopInfoEditDTO { * 是否启用满减活动 1-是 0-否 */ private Integer isEnableDiscount; - + /** + * 是否启用限时折扣 1-是 0-否 + */ + private Integer isLimitTimeDiscount; /** * 台桌预订短信 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java index 4c533c0e..40224d47 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java @@ -46,6 +46,11 @@ public class ShopConfig implements Serializable { * 是否启用满减活动 1-是 0-否 */ private Integer isEnableDiscount; + /** + * 是否启用限时折扣 1-是 0-否 + */ + + private Integer isLimitTimeDiscount; /** * 是否允许账号登录 1-是 0-否 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java index ca58a1bb..facc59c2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java @@ -262,6 +262,11 @@ public class ShopInfo implements Serializable { */ @Column(ignore = true) private Integer isEnableDiscount; + /** + * 是否启用限时折扣 1-是 0-否 + */ + @Column(ignore = true) + private Integer isLimitTimeDiscount; /** * 是否允许账号登录 1-是 0-否 */ diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java index 761daa3a..627b5ddb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java @@ -51,7 +51,7 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl