flowerbackend-v2.git

			@@ -44,8 +44,8 @@
			<select id="selectSettlementListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
			SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
			, ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
			, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee, ois.income_supplier
			, o.status_backend, o.create_time orderTime
			, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
			, ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time, o.order_no
			, (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
			FROM t_delivery_order_item doi
			join t_delivery_order q on q.id = doi.delivery_id
			@@ -101,9 +101,18 @@
			<select id="selectDoItemList4Check" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItem4CheckDTO">
			SELECT oi.id, q.delivery_id, oi.flower_name, oi.flower_unit, oi.flower_color
			, oi.flower_cover, oi.num , oi.supplier_price price, oi.flower_level, oi.status
			, (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace') replaceNum
			, (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce') reduceNum
			, (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack') lackNum
			, (select oic.num from t_order_item_check oic
			where oic.order_item_id = oi.id and oic.type = 'replace'
			and (oic.audit_status = 'AGREED' or oic.audit_status is null)
			) replaceNum
			, (select oic.num from t_order_item_check oic
			where oic.order_item_id = oi.id and oic.type = 'reduce'
			and (oic.audit_status = 'AGREED' or oic.audit_status is null)
			) reduceNum
			, (select oic.num from t_order_item_check oic
			where oic.order_item_id = oi.id and oic.type = 'lack'
			and (oic.audit_status = 'AGREED' or oic.audit_status is null)
			) lackNum
			FROM t_delivery_order_item q
			join t_order_item oi on oi.id = q.order_item_id
			WHERE q.deleted = 0 and oi.deleted = 0