~jiangyouyao/beauty-erp.git

			@@ -625,7 +625,7 @@
			#{item.beginTime} dataTime,
			(select shop_short_name from sys_shop_info where id=#{shopId}) shopName,
			(select IFNULL(sum(amount),0) from sys_order_flow
			where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			@@ -678,29 +678,29 @@
			and company_id=#{companyId}
			</if>
			) refundCardPay,
			(select IFNULL(sum(amount),0) from sys_order_flow a
			inner join sys_order_item b on a.order_id=b.ORDER_ID
			inner join shopping_goods c on b.goods_id=c.id
			where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			(select IFNULL(sum(zk_price),0) from sys_order_item a
			inner join shopping_goods b on a.goods_id=b.id
			inner join sys_order c on a.ORDER_ID=c.id
			where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			and c.shop_id=#{shopId}
			</if>
			<if test="companyId != null">
			and a.company_id=#{companyId}
			and c.company_id=#{companyId}
			</if>
			) productAchieve,
			(select IFNULL(sum(amount),0) from sys_order_flow a
			inner join sys_order_item b on a.order_id=b.ORDER_ID
			inner join shopping_goods c on b.goods_id=c.id
			where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			(select IFNULL(sum(zk_price),0) from sys_order_item a
			inner join shopping_goods b on a.goods_id=b.id
			inner join sys_order c on a.ORDER_ID=c.id
			where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			and c.shop_id=#{shopId}
			</if>
			<if test="companyId != null">
			and a.company_id=#{companyId}
			and c.company_id=#{companyId}
			</if>
			) cardAchieve,
			(select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			(select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '还款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			@@ -804,11 +804,18 @@
			<foreach collection="list" index="index" item="item" separator="union all" >
			select
			#{item.beginTime} dataTime,
			(select shop_short_name from sys_shop_info where id=#{shopId}) shopName,
			(select sum(total) shouldPay from sys_order
			where STATU in ('已付款', '欠款') and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			) shouldPay,
			(select IFNULL(sum(amount),0) from sys_order_flow
			where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			)totalPay,
			(select IFNULL(sum(amount),0) from sys_order_flow
			where pay_method not in ('储值卡', '欠款') and flow_type != '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			@@ -840,20 +847,20 @@
			and shop_id=#{shopId}
			</if>
			) refundCardPay,
			(select IFNULL(sum(amount),0) from sys_order_flow a
			inner join sys_order_item b on a.order_id=b.ORDER_ID
			inner join shopping_goods c on b.goods_id=c.id
			where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			(select IFNULL(sum(zk_price),0) from sys_order_item a
			inner join shopping_goods b on a.goods_id=b.id
			inner join sys_order c on a.ORDER_ID=c.id
			where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			and c.shop_id=#{shopId}
			</if>
			) productAchieve,
			(select IFNULL(sum(amount),0) from sys_order_flow a
			inner join sys_order_item b on a.order_id=b.ORDER_ID
			inner join shopping_goods c on b.goods_id=c.id
			where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			(select IFNULL(sum(zk_price),0) from sys_order_item a
			inner join shopping_goods b on a.goods_id=b.id
			inner join sys_order c on a.ORDER_ID=c.id
			where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			and c.shop_id=#{shopId}
			</if>
			) cardAchieve,
			(select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			@@ -932,7 +939,7 @@
			from sys_order_flow
			where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime} ]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			and shop_id=#{shopId}
			</if>
			group by paymethod
			</sql>