Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

 cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml

@@ -16,6 +16,7 @@
               pickUpQuantity,
               `sort`,
               shelves

        from t_points_merchandise
        where 1 = 1
        <if test="name != null">
@@ -35,6 +36,39 @@
        </if>
        order by insertTime desc
    </select>
    <select id="queryGoodsListOfSearchAudit" resultType="java.util.Map">
        SELECT id,
               `name`,
               `cover`,
               `type`,
               date_format(startTime ,'%Y-%m-%d') as startTime,
               date_format(endTime ,'%Y-%m-%d') as endTime,
               useScope,
               userPopulation,
               quantityIssued,
               pickUpQuantity,
               `sort`,
               shelves,
        status
        from t_points_merchandise
        where type =3  and `status` !=1
        <if test="name != null">
            and `name` like concat('%', #{name}, '%')
        </if>
        <if test="type != null">
            and cardType = #{type}
        </if>
        <if test="redemptionMethod != null">
            and redemptionMethod = #{redemptionMethod}
        </if>
        <if test="userPopulation != null">
            and userPopulation = #{userPopulation}
        </if>
        <if test="activeStatus != null">
            and `status` = #{activeStatus}
        </if>
        order by insertTime desc
    </select>
    <select id="ticketList" resultType="java.util.Map">
        SELECT id,
        `name`,