beauty-erp.git - Gitblit

			@@ -636,7 +636,7 @@
			)totalPay,
			(select IFNULL(sum(a.amount),0) from sys_order_flow a
			inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
			where a.pay_method not in ('储值卡', '欠款') and a.flow_type != '退款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			where a.pay_method not in ('储值卡', '欠款') and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>
			@@ -716,8 +716,30 @@
			and a.company_id=#{companyId}
			</if>
			) refund,
			(select sum(IFNULL(amount, 0))
			from sys_order_flow a
			inner join sys_order b on a.order_id=b.id and b.STATU!='已取消'
			where a.pay_method='储值卡' and a.is_gift='N' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>
			<if test="companyId != null">
			and a.company_id=#{companyId}
			</if>
			) cardAmount,
			(select sum(IFNULL(amount, 0))
			from sys_order_flow a
			inner join sys_order b on a.order_id=b.id and b.STATU!='已取消'
			where a.pay_method='储值卡' and a.is_gift='Y' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>
			<if test="companyId != null">
			and a.company_id=#{companyId}
			</if>
			) cardFreeAmount,
			(select IFNULL(count(1),0) from sys_order
			where STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where STATU in ('已付款', '欠款') and orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			@@ -726,7 +748,7 @@
			</if>
			) perCustomCnt,
			(select IFNULL(sum(b.COUNT),0) from sys_order a inner join sys_order_item b on a.ID=b.ORDER_ID
			where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			@@ -740,7 +762,7 @@
			inner join sys_store_info d on c.store_id = d.ID
			inner join sys_order_item e on a.ID=e.ORDER_ID
			inner join shopping_goods f on e.goods_id=f.id and f.good_type='家居产品'
			where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>
			@@ -751,7 +773,7 @@
			(select IFNULL(sum(b.COUNT * IFNULL(c.price, 0)),0) from sys_order a
			inner join sys_order_item b on a.ID=b.ORDER_ID
			inner join shopping_goods c on c.good_type != '家居产品' and b.goods_id=c.id
			where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>
			@@ -814,7 +836,7 @@
			#{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}]]>
			where STATU in ('已付款', '欠款') and orderType=1 and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			@@ -877,13 +899,13 @@
			</if>
			) refund,
			(select IFNULL(count(1),0) from sys_order
			where STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where STATU in ('已付款', '欠款') and orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			) perCustomCnt,
			(select IFNULL(sum(b.COUNT),0) from sys_order a inner join sys_order_item b on a.ID=b.ORDER_ID
			where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and shop_id=#{shopId}
			</if>
			@@ -894,7 +916,7 @@
			inner join sys_store_info d on c.store_id = d.ID
			inner join sys_order_item e on a.ID=e.ORDER_ID
			inner join shopping_goods f on e.goods_id=f.id and f.good_type='家居产品'
			where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>
			@@ -902,7 +924,7 @@
			(select IFNULL(sum(b.COUNT * IFNULL(c.price, 0)),0) from sys_order a
			inner join sys_order_item b on a.ID=b.ORDER_ID
			inner join shopping_goods c on c.good_type != '家居产品' and b.goods_id=c.id
			where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
			<if test="shopId != null">
			and a.shop_id=#{shopId}
			</if>