bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

加会delFlag

This commit is contained in:
sxu 2025-05-28 17:01:19 +08:00
parent 7130c44c64
commit 0d11c63bf1
9 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicArea.java
View File

@ -50,6 +50,11 @@ public class BasicArea extends BaseEntity {
@ApiModelProperty(value = "联系电话")
private String contactTel;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
private List<BasicArea> children = new ArrayList();
}

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java
View File

@ -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);
}

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java
View File

@ -113,6 +113,11 @@ public class BasicStall extends BaseEntity {
@ApiModelProperty(value = "档口收款码链接")
private String payCodeUrl;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
private List<BasicStallMealtime> basicStallMealtimeList;
public String getImgUrl() {

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java
View File

@ -69,4 +69,9 @@ public class CookRecipe extends BaseEntity {
private int dishesCount;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
}

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDTO.java
View File

@ -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<CookRecipeDateDTO> recipeDateList;
}

13
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicAreaMapper.xml
View File

@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="manager" column="manager" />
<result property="description" column="description" />
<result property="contactTel" column="contact_tel" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBasicAreaVo">
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
</sql>
@ -30,17 +31,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="manager != null and manager != ''"> and manager = #{manager}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="contactTel != null and contactTel != ''"> and contact_tel = #{contactTel}</if>
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
</where>
</select>
<select id="selectBasicAreaByAreaName" parameterType="String" resultMap="BasicAreaResult">
<include refid="selectBasicAreaVo"/>
where area_name = #{areaName}
where del_flag = 0 and area_name = #{areaName}
</select>
<select id="selectBasicAreaByAreaId" parameterType="Long" resultMap="BasicAreaResult">
<include refid="selectBasicAreaVo"/>
where area_id = #{areaId}
where del_flag = 0 and area_id = #{areaId}
</select>
<insert id="insertBasicArea" parameterType="com.bonus.canteen.core.basic.domain.BasicArea" useGeneratedKeys="true" keyProperty="areaId">
@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="manager != null">manager = #{manager},</if>
<if test="description != null">description = #{description},</if>
<if test="contactTel != null">contact_tel = #{contactTel},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@ -86,11 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteBasicAreaByAreaId" parameterType="Long">
delete from basic_area where area_id = #{areaId}
update basic_area set del_flag = '2' where area_id = #{areaId}
</delete>
<delete id="deleteBasicAreaByAreaIds" parameterType="String">
delete from basic_area where area_id in
update basic_area set del_flag = '2' where area_id in
<foreach item="areaId" collection="array" open="(" separator="," close=")">
#{areaId}
</foreach>

15
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenMapper.xml
View File

@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ifBook" column="if_book" />
<result property="ifReserve" column="if_reserve" />
<result property="ifPayCode" column="if_pay_code" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectBasicCanteenVo">
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"
<if test="ifBook != null "> and bc.if_book = #{ifBook}</if>
<if test="ifReserve != null "> and bc.if_reserve = #{ifReserve}</if>
<if test="ifPayCode != null "> and bc.if_pay_code = #{ifPayCode}</if>
<if test="delFlag != null and delFlag != ''"> and bc.del_flag = #{delFlag}</if>
</where>
</select>
<select id="selectBasicCanteenByCanteenId" parameterType="Long" resultMap="BasicCanteenResult">
<include refid="selectBasicCanteenVo"/>
where bc.canteen_id = #{canteenId}
where bc.canteen_id = #{canteenId} and bc.del_flag = 0
</select>
<select id="selectBasicCanteenByCanteenName" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteen" resultMap="BasicCanteenResult">
<include refid="selectBasicCanteenVo"/>
where bc.canteen_name = #{canteenName} and bc.area_id = #{areaId}
where bc.canteen_name = #{canteenName} and bc.area_id = #{areaId} and bc.del_flag = 0
</select>
<select id="getBasicCanteenCountByAreaIds" resultType="Integer">
select count(1)
from basic_canteen
where area_id in
where del_flag = 0 and area_id in
<foreach item="areaId" collection="array" open="(" separator="," close=")">
#{areaId}
</foreach>
@ -145,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ifBook != null">if_book = #{ifBook},</if>
<if test="ifReserve != null">if_reserve = #{ifReserve},</if>
<if test="ifPayCode != null">if_pay_code = #{ifPayCode},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@ -154,11 +157,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteBasicCanteenByCanteenId" parameterType="Long">
delete from basic_canteen where canteen_id = #{canteenId}
update basic_canteen set del_flag = '2' where canteen_id = #{canteenId}
</delete>
<delete id="deleteBasicCanteenByCanteenIds" parameterType="String">
delete from basic_canteen where canteen_id in
update basic_canteen set del_flag = '2' where canteen_id in
<foreach item="canteenId" collection="array" open="(" separator="," close=")">
#{canteenId}
</foreach>

15
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicStallMapper.xml
View File

@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ifReserve" column="if_reserve" />
<result property="ifPayCode" column="if_pay_code" />
<result property="payCodeUrl" column="pay_code_url" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectBasicStallVo">
select bs.stall_id, bs.stall_name, bs.area_id, bs.canteen_id, bs.manager, bs.contact_tel, bs.biz_state,
bs.biz_start_time, bs.biz_end_time, bs.if_delivery, bs.deliveries, bs.if_order, bs.img_url,
bs.if_book, bs.if_reserve, bs.if_pay_code, bs.pay_code_url, bs.create_by, bs.create_time,
bs.if_book, bs.if_reserve, bs.if_pay_code, bs.pay_code_url, bs.del_flag, bs.create_by, bs.create_time,
bs.update_by, bs.update_time, bc.canteen_name, ba.area_name
from basic_stall bs
left join basic_canteen bc on bc.canteen_id = bs.canteen_id
@ -58,23 +59,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ifReserve != null "> and bs.if_reserve = #{ifReserve}</if>
<if test="ifPayCode != null "> and bs.if_pay_code = #{ifPayCode}</if>
<if test="payCodeUrl != null and payCodeUrl != ''"> and bs.pay_code_url = #{payCodeUrl}</if>
<if test="delFlag != null and delFlag != ''"> and bs.del_flag = #{delFlag}</if>
</where>
</select>
<select id="selectBasicStallByStallId" parameterType="Long" resultMap="BasicStallResult">
<include refid="selectBasicStallVo"/>
where bs.stall_id = #{stallId}
where bs.stall_id = #{stallId} and bs.del_flag = 0
</select>
<select id="selectBasicStallByStallName" parameterType="com.bonus.canteen.core.basic.domain.BasicStall" resultMap="BasicStallResult">
<include refid="selectBasicStallVo"/>
where bs.stall_name = #{stallName} and bc.canteen_id = #{canteenId}
where bs.stall_name = #{stallName} and bs.canteen_id = #{canteenId} and bs.del_flag = 0
</select>
<select id="selectBasicStallCountByCanteenIds" resultType="Integer">
select count(1)
from alloc_stall
where canteen_id in
where del_flag = 0 and canteen_id in
<foreach item="canteenId" collection="array" open="(" separator="," close=")">
#{canteenId}
</foreach>
@ -147,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ifReserve != null">if_reserve = #{ifReserve},</if>
<if test="ifPayCode != null">if_pay_code = #{ifPayCode},</if>
<if test="payCodeUrl != null">pay_code_url = #{payCodeUrl},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@ -156,11 +159,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteBasicStallByStallId" parameterType="Long">
delete from basic_stall where stall_id = #{stallId}
update basic_stall set del_flag = '2' where stall_id = #{stallId}
</delete>
<delete id="deleteBasicStallByStallIds" parameterType="String">
delete from basic_stall where stall_id in
update basic_stall set del_flag = '2' where stall_id in
<foreach item="stallId" collection="array" open="(" separator="," close=")">
#{stallId}
</foreach>

13
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
View File

@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="planId" column="plan_id" />
<result property="effectDate" column="effect_date" />
<result property="expireDate" column="expire_date" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectCookRecipeVo">
select cr.recipe_id, cr.recipe_name, cr.recipe_type, cr.stall_id, cr.canteen_id, cr.plan_id, cr.effect_date,
cr.expire_date, cr.create_by, cr.create_time, cr.update_by, cr.update_time,
cr.expire_date, cr.create_by, cr.create_time, cr.update_by, cr.update_time, cr.del_flag,
bs.stall_name, bc.canteen_name, ba.area_name
from cook_recipe cr
left join basic_stall bs on bs.stall_id = cr.stall_id
@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null and planId != ''"> and cr.plan_id = #{planId}</if>
<if test="effectDate != null "> and cr.effect_date = #{effectDate}</if>
<if test="expireDate != null "> and cr.expire_date = #{expireDate}</if>
<if test="delFlag != null and delFlag != ''"> and cr.del_flag = #{delFlag}</if>
</where>
</select>
@ -128,12 +130,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCookRecipeByRecipeId" parameterType="Long" resultMap="CookRecipeResult">
<include refid="selectCookRecipeVo"/>
where cr.recipe_id = #{recipeId}
where cr.recipe_id = #{recipeId} and cr.del_flag = 0
</select>
<select id="selectCookRecipeByRecipeName" parameterType="String" resultMap="CookRecipeResult">
<include refid="selectCookRecipeVo"/>
where cr.recipe_name = #{recipeName}
where cr.recipe_name = #{recipeName} and cr.del_flag = 0
</select>
<insert id="insertCookRecipe" parameterType="com.bonus.canteen.core.cook.domain.CookRecipe" useGeneratedKeys="true" keyProperty="recipeId">
@ -176,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">plan_id = #{planId},</if>
<if test="effectDate != null">effect_date = #{effectDate},</if>
<if test="expireDate != null">expire_date = #{expireDate},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@ -185,11 +188,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteCookRecipeByRecipeId" parameterType="Long">
delete from cook_recipe where recipe_id = #{recipeId}
update cook_recipe set del_flag = '2' where recipe_id = #{recipeId}
</delete>
<delete id="deleteCookRecipeByRecipeIds" parameterType="String">
delete from cook_recipe where recipe_id in
update cook_recipe set del_flag = '2' where recipe_id in
<foreach item="recipeId" collection="array" open="(" separator="," close=")">
#{recipeId}
</foreach>