增加套餐券管理

share-system/src/main/java/share/system/service/impl/SCouponServiceImpl.java

@@ -244,7 +244,6 @@ public class SCouponServiceImpl extends ServiceImpl<SCouponMapper, SCoupon> impl
 
     @Override
     public TableDataInfo listDuration(SCoupon sCoupon) {
-        sCoupon.setCouponType(CouponTypeEnum.DURATION.getCode());
         List<SCoupon> sCouponList = sCouponMapper.listDuration(sCoupon);
         List<SCouponVo> sCouponVoList = convertDoListToVoList(sCouponList);
         if (!CollectionUtils.isEmpty(sCouponList)) {

share-system/src/main/resources/mapper/system/SCouponMapper.xml

@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="listDuration" resultMap="SCouponResult">
         <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="startDate != null">and start_date &lt;= #{startDate}</if>
         <!--         <if test="endDate == null">and end_date >= NOW()</if> -->