flowerbackend-v2.git

			@@ -35,17 +35,23 @@
			<if test="condition.statusBackend != null and condition.statusBackend != ''">
			AND q.status_backend = #{condition.statusBackend}
			</if>
			<if test="condition.startDate != null">
			AND q.payment_time >= #{condition.startDate}
			</if>
			<if test="condition.endDate != null">
			AND q.payment_time <= #{condition.endDate}
			</if>
			<!-- <if test="condition.startDate != null">-->
			<!-- AND q.payment_time >= #{condition.startDate}-->
			<!-- </if>-->
			<!-- <if test="condition.endDate != null">-->
			<!-- AND q.payment_time <= #{condition.endDate}-->
			<!-- </if>-->
			<!-- <if test="condition.createStartDate != null">-->
			<!-- AND q.create_time >= #{condition.createStartDate}-->
			<!-- </if>-->
			<!-- <if test="condition.createEndDate != null">-->
			<!-- AND q.create_time <= #{condition.createEndDate}-->
			<!-- </if>-->
			<if test="condition.createStartDate != null">
			AND q.create_time >= #{condition.createStartDate}
			AND q.payment_time >= #{condition.createStartDate}
			</if>
			<if test="condition.createEndDate != null">
			AND q.create_time <= #{condition.createEndDate}
			AND q.payment_time <= #{condition.createEndDate}
			</if>
			<if test="condition.partnerId != null">
			AND q.partner_id = #{condition.partnerId}
			@@ -108,17 +114,24 @@
			<if test="condition.statusBackend != null and condition.statusBackend != ''">
			AND q.status_backend = #{condition.statusBackend}
			</if>
			<if test="condition.startDate != null">
			AND q.payment_time >= #{condition.startDate}
			</if>
			<if test="condition.endDate != null">
			AND q.payment_time <= #{condition.endDate}
			</if>
			<!-- <if test="condition.startDate != null">-->
			<!-- AND q.payment_time >= #{condition.startDate}-->
			<!-- </if>-->
			<!-- <if test="condition.endDate != null">-->
			<!-- AND q.payment_time <= #{condition.endDate}-->
			<!-- </if>-->
			<!-- <if test="condition.createStartDate != null">-->
			<!-- AND q.create_time >= #{condition.createStartDate}-->
			<!-- </if>-->
			<!-- <if test="condition.createEndDate != null">-->
			<!-- AND q.create_time <= #{condition.createEndDate}-->
			<!-- </if>-->
			<!-- 修改查询日期对应的的创建时间为支付时间 2024-10-12-->
			<if test="condition.createStartDate != null">
			AND q.create_time >= #{condition.createStartDate}
			AND q.payment_time >= #{condition.createStartDate}
			</if>
			<if test="condition.createEndDate != null">
			AND q.create_time <= #{condition.createEndDate}
			AND q.payment_time <= #{condition.createEndDate}
			</if>
			<if test="condition.partnerId != null">
			AND q.partner_id = #{condition.partnerId}
			@@ -176,18 +189,18 @@
			<if test="condition.statusBackend != null and condition.statusBackend != ''">
			AND q.status_backend = #{condition.statusBackend}
			</if>
			<if test="condition.startDate != null">
			AND q.payment_time >= #{condition.startDate}
			</if>
			<if test="condition.endDate != null">
			AND q.payment_time <= #{condition.endDate}
			</if>
			<if test="condition.createStartDate != null">
			AND q.create_time >= #{condition.createStartDate}
			AND q.payment_time >= #{condition.createStartDate}
			</if>
			<if test="condition.createEndDate != null">
			AND q.create_time <= #{condition.createEndDate}
			AND q.payment_time <= #{condition.createEndDate}
			</if>
			<!-- <if test="condition.createStartDate != null">-->
			<!-- AND q.create_time >= #{condition.createStartDate}-->
			<!-- </if>-->
			<!-- <if test="condition.createEndDate != null">-->
			<!-- AND q.create_time <= #{condition.createEndDate}-->
			<!-- </if>-->
			<if test="condition.partnerId != null">
			AND q.partner_id = #{condition.partnerId}
			</if>
			@@ -355,4 +368,17 @@
			</if>
			ORDER BY q.create_time desc, q.payment_time desc
			</select>

			<select id="getOrderSaleAmount" resultType="java.math.BigDecimal">
			SELECT sum(o.payment_amount)
			FROM t_order o
			WHERE o.payment_time is not null
			and o.refund_time is null
			<if test="startTime != null">
			and o.create_time > #{startTime}
			</if>
			<if test="endTime != null">
			and o.create_time <= #{endTime}
			</if>
			</select>
			</mapper>