Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 852ec1d729b61077d8131591a5349c7e4a1bed79

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

@@ -37,31 +37,94 @@

    </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>

<!--    app活动优惠券-->
    <select id="getActivityEffectList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">

        SELECT *
        FROM t_coupon_template t
        WHERE t.deleted = FALSE
        AND t.get_start_date &lt;= NOW()
        AND NOW() &lt;= t.get_end_date
        <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.getType != null and param.getType != ''">
            AND t.get_type =  #{param.getType}
        </if>
        ORDER BY t.create_time DESC

    </select>
    <select id="getCouponCustomerList"
            resultType="com.mzl.flower.dto.response.coupon.CouponTemplateCustomerVO">
        select ci.id,ci.name,u.tel
        from t_coupon_template c
        left JOIN t_coupon_template_customer cc
        on c.id=cc.coupon_id
        left join t_customer_info ci
        on cc.custom_id=ci.id
        left join t_user u
        on ci.user_id=u.id
        where c.deleted= false
        and c.id=#{id}

    </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 *