Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-08-30 8495247c638d9b201eedfaf09bbf38e0fecda87d

 src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml

@@ -37,31 +37,59 @@

    </resultMap>
    <update id="activeBatchCouponTemplate">
        update t_coupon_template set status='active',update_by=#{dto.updateBy},update_time=now() where id in
        <foreach collection="dto.idList" item="item" open="(" separator="," close=")">
        update t_coupon_template set status='active',update_by=#{param.updateBy},update_time=now() where id in
        <foreach collection="param.idList" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </update>
    <update id="expireBatchCouponTemplate">
        update t_coupon_template set status='expired',update_by=#{dto.updateBy},update_time=now() where id in
        <foreach collection="dto.idList" item="item" open="(" separator="," close=")">
        update t_coupon_template set status='expired',update_by=#{param.updateBy},update_time=now() where id in
        <foreach collection="param.idList" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </update>

    <update id="deleteBatchCouponTemplate">
        update t_coupon_template set deleted=true ,update_by=#{dto.updateBy},update_time=now() where id in
        <foreach collection="dto.idList" item="item" open="(" separator="," close=")">
        update t_coupon_template set deleted=true ,update_by=#{param.updateBy},update_time=now() where id in
        <foreach collection="param.idList" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </update>

    <select id="getCouponTemplatePage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
        <include refid="QuerySql2"></include>
        <include refid="QuerySql2"/>
    </select>
    <select id="getList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
        <include refid="QuerySql2"></include>
        <include refid="QuerySql2"/>
    </select>
    <select id="getCouponPointList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
        <include refid="QueryPointSql" />
    </select>
    <select id="getPointPage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
        <include refid="QueryPointSql" />
    </select>

    <sql id="QueryPointSql">
        select *
        from t_coupon_template
        where deleted=0
        <if test="param.category != null and param.category != ''">
            AND category =  #{param.category}
        </if>
        <if test="param.status != null and param.status != ''">
            AND status =  #{param.status}
        </if>
        <if test="param.minPoint != null ">
            AND point &gt;=  #{param.minPoint}
        </if>
        <if test="param.maxPoint != null ">
            AND point &lt;=  #{param.maxPoint}
        </if>
        <if test="param.orderStr != null and param.orderStr != '' ">
            order by ${param.orderStr}
        </if>

    </sql>

    <sql id="QuerySql2">
        select *