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

陶杰

2024-09-02 b977bf61c82b7dc39079974d7316b7a80cf520fa

 src/main/resources/mapper/point/CustomerPointDetailMapper.xml

@@ -17,4 +17,24 @@
        </if>
        order by t.c desc
    </select>
    <select id="tongjiExpiredPoint" resultType="com.mzl.flower.dto.response.point.ExpiredPointDTO"
            parameterType="java.time.LocalDate">
        SELECT
            p.user_id,
            p.customer_id,
            SUM(CASE WHEN p.change_type = 'add' THEN point ELSE 0 END) AS addPoint,
            SUM(CASE WHEN p.change_type = 'reduce' THEN point ELSE 0 END) AS reducePoint
        FROM
            t_customer_point_detail p
        WHERE p.deleted= 0
        <if test="lastYear!=null ">
            <![CDATA[
               and p.record_date <= #{lastYear}
            ]]>
        </if>
        GROUP BY
        p.user_id,
        p.customer_id
    </select>

</mapper>