Merge remote-tracking branch 'origin/test' into test

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;
     /**
      * 台桌预订短信
      */

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-否
 	*/

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-否
      */

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java

@@ -51,7 +51,7 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl<MkLimitTimeDisco
     public MkLimitTimeDiscount getLimitTimeDiscountByShopId(Long shopId) {
         ShopInfo shopInfo = shopInfoService.getById(shopId);
         AssertUtil.isNull(shopInfo, "店铺不存在");
-        if (shopInfo.getIsEnableDiscount() == null || shopInfo.getIsEnableDiscount() == 0) {
+        if (shopInfo.getIsLimitTimeDiscount() == null || shopInfo.getIsLimitTimeDiscount() == 0) {
             return null;
         }
         Long mainShopId = shopInfoService.getMainIdByShopId(shopId);