flowerbackend-v2.git

			@@ -52,8 +52,8 @@
			on oi.order_id=o.id
			left join t_code_value check_type
			on check_type.value=oic.type and check_type.type_code='CHECK_TYPE'
			where
			o.deleted=0
			where o.deleted=0
			and oic.type in ('lack','replace')
			and o.status_backend not in ('PENDING','CANCEL','REFUND')
			and oic.deleted=0 and oic.audit_status='AGREED' and oi.deleted=0 and o.deleted=0
			and o.payment_time >= #{dto.walletOnlineTime}
			@@ -72,11 +72,48 @@
			<if test="dto.endDate != null">
			and DATE_FORMAT(o.payment_time, '%Y-%m-%d') <= #{dto.endDate}
			</if>
			union
			select oic.id as id ,
			oic.deduct_amount AS fee,
			oic.audit_time AS audit_time,
			o.payment_time as payment_time,
			oic.type as type,
			check_type.label as type_name,
			o.order_no as order_no,
			oi.supplier_id as supplier_id
			from t_order_item_check oic
			left join t_order_item oi
			on oic.order_item_id=oi.id
			left join t_order o
			on oi.order_id=o.id
			left join t_code_value check_type
			on check_type.value=oic.type and check_type.type_code='CHECK_TYPE'
			where o.deleted=0
			and oic.type in ('reduce')
			and o.status_backend not in ('PENDING','CANCEL','REFUND')
			and oic.deleted=0 and oic.audit_status='AGREED' and oi.deleted=0 and o.deleted=0
			and o.payment_time >= #{dto.walletOnlineTime}
			<if test="dto.supplierId != null">
			and oi.supplier_id = #{dto.supplierId}
			</if>
			<!-- <if test="dto.startDate != null">-->
			<!-- and DATE_FORMAT(oic.audit_time, '%Y-%m-%d') >= #{dto.startDate}-->
			<!-- </if>-->
			<!-- <if test="dto.endDate != null">-->
			<!-- and DATE_FORMAT(oic.audit_time, '%Y-%m-%d') <= #{dto.endDate}-->
			<!-- </if>-->
			<if test="dto.startDate != null">
			and DATE_FORMAT(o.payment_time, '%Y-%m-%d') >= #{dto.startDate}
			</if>
			<if test="dto.endDate != null">
			and DATE_FORMAT(o.payment_time, '%Y-%m-%d') <= #{dto.endDate}
			</if>

			) t

			order by audit_time desc
			</select>
			<select id="getCheckReduceAmount" resultType="java.math.BigDecimal">
			<select id="getCheckLackReplaceAmount" resultType="java.math.BigDecimal">
			select sum(oic.num*oi.supplier_price)
			from t_order_item_check oic
			left join t_order_item oi
			@@ -86,6 +123,7 @@
			left join t_code_value check_type
			on check_type.value=oic.type and check_type.type_code='CHECK_TYPE'
			where o.deleted=0
			and oic.type in ('lack','replace')
			and o.status_backend not in ('PENDING','CANCEL','REFUND')
			and oic.deleted=0 and oic.audit_status='AGREED' and oi.deleted=0 and o.deleted=0
			and oi.supplier_id = #{dto.supplierId}
			@@ -103,6 +141,7 @@
			and oi.supplier_id = #{dto.supplierId}
			and o.payment_time >= #{dto.startTime}
			</select>

			<select id="getStationFeeAmount" resultType="java.math.BigDecimal">
			SELECT sum(ois.station_fee)
			FROM t_order_item_settlement ois
			@@ -114,4 +153,21 @@
			and oi.supplier_id = #{dto.supplierId}
			and o.payment_time >= #{dto.startTime}
			</select>
			<select id="getCheckReduceAmount" resultType="java.math.BigDecimal">
			select sum(oic.deduct_amount)
			from t_order_item_check oic
			left join t_order_item oi
			on oic.order_item_id=oi.id
			left join t_order o
			on oi.order_id=o.id
			left join t_code_value check_type
			on check_type.value=oic.type and check_type.type_code='CHECK_TYPE'
			where o.deleted=0
			and oic.type in ('reduce')
			and o.status_backend not in ('PENDING','CANCEL','REFUND')
			and oic.deleted=0 and oic.audit_status='AGREED' and oi.deleted=0 and o.deleted=0
			and oi.supplier_id = #{dto.supplierId}
			and o.payment_time >= #{dto.startTime}

			</select>
			</mapper>