flowerbackend-v2.git

			@@ -3,15 +3,21 @@
			<mapper namespace="com.mzl.flower.mapper.point.CustomerPointMapper">
			<select id="queryPage" resultType="com.mzl.flower.dto.response.point.CustomerPointDTO">
			SELECT
			p.*,
			c.`name` as customerName,
			c.user_id as userId,
			p.id as id,
			c.id as customerId,
			IFNULL(p.total_point, 0) as totalPoint,
			IFNULL(p.used_point, 0) as usedPoint,
			IFNULL(p.expired_point, 0) as expiredPoint,
			IFNULL(p.deduction_point, 0) as deductionPoint,
			t.tel as customerTel
			FROM
			t_customer_point p
			LEFT JOIN t_customer_info c ON c.id = p.customer_id
			LEFT JOIN t_user t on p.user_id = t.id
			t_customer_info c
			LEFT JOIN t_customer_point p ON c.id = p.customer_id
			LEFT JOIN t_user t on c.user_id = t.id
			WHERE
			p.deleted = 0
			c.deleted = 0
			<if test="dto.customerName!= null and dto.customerName != ''">
			AND c.`name` LIKE CONCAT('%',#{dto.customerName},'%')
			</if>
			@@ -29,17 +35,17 @@
			<if test="dto.userId!= null and dto.userId != ''">
			and t.user_id = #{dto.userId}
			</if>
			<if test="dto.recordDateStart!=null ">
			<if test="dto.recordDateStart!=null and dto.recordDateStart!='' ">
			<![CDATA[
			AND t.record_date >= #{dto.createDateBegin}
			AND t.record_date >= #{dto.recordDateStart}
			]]>
			</if>
			<if test="dto.recordDateEnd!=null ">
			<if test="dto.recordDateEnd!=null and dto.recordDateEnd!='' ">
			<![CDATA[
			AND t.record_date <= #{dto.createDateEnd}
			AND t.record_date <= #{dto.recordDateEnd}
			]]>
			</if>
			<if test="dto.type!=null and dto.type != null">
			<if test="dto.type!=null and dto.type != ''">
			and t.type = #{dto.type}
			</if>
			<if test="dto.remarks!=null and dto.remarks != null">