diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicArea.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicArea.java index b859bf9..7db74b0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicArea.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicArea.java @@ -50,6 +50,11 @@ public class BasicArea extends BaseEntity { @ApiModelProperty(value = "联系电话") private String contactTel; + /** + * 删除标志(0代表存在 2代表删除) + */ + private String delFlag; + private List children = new ArrayList(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java index 91bb397..fed1272 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java @@ -110,6 +110,11 @@ public class BasicCanteen extends BaseEntity { @ApiModelProperty(value = "是否启用收款码 默认:否") private Integer ifPayCode; + /** + * 删除标志(0代表存在 2代表删除) + */ + private String delFlag; + public String getImgUrl() { return FileUrlUtil.getFileUrl(this.imgUrl); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java index 99d1e03..ebae317 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java @@ -113,6 +113,11 @@ public class BasicStall extends BaseEntity { @ApiModelProperty(value = "档口收款码链接") private String payCodeUrl; + /** + * 删除标志(0代表存在 2代表删除) + */ + private String delFlag; + private List basicStallMealtimeList; public String getImgUrl() { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java index 9d18d55..a946f1a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java @@ -69,4 +69,9 @@ public class CookRecipe extends BaseEntity { private int dishesCount; + /** + * 删除标志(0代表存在 2代表删除) + */ + private String delFlag; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDTO.java index db26f03..5fc653e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDTO.java @@ -62,5 +62,10 @@ public class CookRecipeDTO extends BaseEntity { @Excel(name = "到期时间", width = 30, dateFormat = "yyyy-MM-dd") private Date expireDate; + /** + * 删除标志(0代表存在 2代表删除) + */ + private String delFlag; + private List recipeDateList; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicAreaMapper.xml index 1aac704..ac8f6f7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicAreaMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select area_id, area_name, parent_id, manager, description, contact_tel, + select area_id, area_name, parent_id, manager, description, contact_tel, del_flag, create_by, create_time, update_by, update_time from basic_area @@ -30,17 +31,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and manager = #{manager} and description = #{description} and contact_tel = #{contactTel} + and del_flag = #{delFlag} @@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" manager = #{manager}, description = #{description}, contact_tel = #{contactTel}, + del_flag = #{delFlag}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -86,11 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from basic_area where area_id = #{areaId} + update basic_area set del_flag = '2' where area_id = #{areaId} - delete from basic_area where area_id in + update basic_area set del_flag = '2' where area_id in #{areaId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenMapper.xml index 8933e1b..5bc09d1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenMapper.xml @@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select bc.canteen_id, bc.canteen_name, bc.area_id, bc.manager, bc.contact_tel, bc.biz_state, bc.biz_start_time, bc.biz_end_time, bc.img_url, bc.enable_pay, bc.pay_types, - bc.if_delivery, bc.deliveries, bc.if_order, bc.if_book, bc.if_reserve, bc.if_pay_code, + bc.if_delivery, bc.deliveries, bc.if_order, bc.if_book, bc.if_reserve, bc.if_pay_code, bc.del_flag bc.create_by, bc.create_time, bc.update_by, bc.update_time, ba.area_name from basic_canteen bc left join basic_area ba on bc.area_id = ba.area_id @@ -56,23 +57,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bc.if_book = #{ifBook} and bc.if_reserve = #{ifReserve} and bc.if_pay_code = #{ifPayCode} + and bc.del_flag = #{delFlag} @@ -128,12 +130,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -176,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" plan_id = #{planId}, effect_date = #{effectDate}, expire_date = #{expireDate}, + del_flag = #{delFlag}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -185,11 +188,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from cook_recipe where recipe_id = #{recipeId} + update cook_recipe set del_flag = '2' where recipe_id = #{recipeId} - delete from cook_recipe where recipe_id in + update cook_recipe set del_flag = '2' where recipe_id in #{recipeId}