Commit b7654892 by 吕明尚

增加套餐券管理

parent fcef91f8
...@@ -244,7 +244,6 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl ...@@ -244,7 +244,6 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl
@Override @Override
public TableDataInfo listDuration(SCoupon sCoupon) { public TableDataInfo listDuration(SCoupon sCoupon) {
sCoupon.setCouponType(CouponTypeEnum.DURATION.getCode());
List<SCoupon> sCouponList = sCouponMapper.listDuration(sCoupon); List<SCoupon> sCouponList = sCouponMapper.listDuration(sCoupon);
List<SCouponVo> sCouponVoList = convertDoListToVoList(sCouponList); List<SCouponVo> sCouponVoList = convertDoListToVoList(sCouponList);
if (!CollectionUtils.isEmpty(sCouponList)) { if (!CollectionUtils.isEmpty(sCouponList)) {
......
...@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="listDuration" resultMap="SCouponResult"> <select id="listDuration" resultMap="SCouponResult">
<include refid="selectSCouponVo"/> <include refid="selectSCouponVo"/>
where 1=1 and coupon_type = #{couponType} where 1=1 and coupon_type in (4,5)
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="startDate != null">and start_date &lt;= #{startDate}</if> <if test="startDate != null">and start_date &lt;= #{startDate}</if>
<!-- <if test="endDate == null">and end_date >= NOW()</if> --> <!-- <if test="endDate == null">and end_date >= NOW()</if> -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment