ERP_override.git

			@@ -279,6 +279,7 @@
			and date(d.create_time) <= #{endDate}
			and d.customer_id = #{orderDetail.order.customerId}
			and om.money is not null
			and om.money >0
			group by d.delivery_id, o.order_id, om.`column`

			UNION ALL
			@@ -318,7 +319,7 @@
			where date(o.create_time) >= #{startDate}
			and date(o.create_time) <= #{endDate}
			and o.customer_id = #{orderDetail.order.customerId}
			and o.create_order>0
			and o.order_review>0
			group by od.order_id,od.product_id

			UNION ALL
			@@ -338,7 +339,9 @@
			where date(o.create_time) >= #{startDate}
			and date(o.create_time) <= #{endDate}
			and o.customer_id = #{orderDetail.order.customerId}
			and o.order_review>0
			and om.money is not null
			and om.money >0
			group by o.order_id, om.`column`

			</select>