From c5e6a16b70b5d119428fd621bfc2871a94c89d30 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 17 Sep 2021 16:45:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml |  106 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
index 7a46366..56a7c07 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
@@ -90,13 +90,14 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			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}]]>
+			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 <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
 			<if test="shopId != null">
-				and shop_id=#{shopId}
+				and a.shop_id=#{shopId}
 			</if>
 			<if test="companyId != null">
-				and company_id=#{companyId}
+				and a.company_id=#{companyId}
 			</if>
 			) as t${index}
 
@@ -126,13 +127,14 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			select IFNULL(sum(amount),0) from sys_order_flow
-			where pay_method = '欠款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+			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 = '欠款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
 			<if test="shopId != null">
-				and shop_id=#{shopId}
+				and a.shop_id=#{shopId}
 			</if>
 			<if test="companyId != null">
-				and company_id=#{companyId}
+				and a.company_id=#{companyId}
 			</if>
 			) as t${index}
 
@@ -230,10 +232,10 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			select IFNULL(sum(zk_price),0) from sys_order_item a
+			select IFNULL(sum(zk_price*count),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}]]>
+			inner join sys_order c on a.ORDER_ID=c.id and c.statu!='已取消'
+			where b.good_type='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
 			<if test="shopId != null">
 				and c.shop_id=#{shopId}
 			</if>
@@ -249,10 +251,10 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			select IFNULL(sum(zk_price),0) from sys_order_item a
+			select IFNULL(sum(zk_price*count),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}]]>
+			inner join sys_order c on a.ORDER_ID=c.id and c.statu!='已取消'
+			where b.good_type!='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
 			<if test="shopId != null">
 				and c.shop_id=#{shopId}
 			</if>
@@ -268,12 +270,14 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			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(a.amount),0) from sys_order_flow a
+			inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+			where a.flow_type = '还款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
 			<if test="shopId != null">
-				and shop_id=#{shopId}
+				and a.shop_id=#{shopId}
 			</if>
 			<if test="companyId != null">
-				and company_id=#{companyId}
+				and a.company_id=#{companyId}
 			</if>
 			) as t${index}
 		</foreach>
@@ -490,13 +494,14 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			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}]]>
+			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}]]>
 			<if test="shopId != null">
-				and shop_id=#{shopId}
+				and a.shop_id=#{shopId}
 			</if>
 			<if test="companyId != null">
-				and company_id=#{companyId}
+				and a.company_id=#{companyId}
 			</if>
 			) as t${index}
 
@@ -509,13 +514,54 @@
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
 			(
-			select IFNULL(sum(amount),0) from sys_order_flow
-			where pay_method in ('储值卡') and flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+			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 in ('储值卡') and a.flow_type = '退款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
 			<if test="shopId != null">
-				and shop_id=#{shopId}
+				and a.shop_id=#{shopId}
 			</if>
 			<if test="companyId != null">
-				and company_id=#{companyId}
+				and a.company_id=#{companyId}
+			</if>
+			) as t${index}
+
+		</foreach>
+		from area where id=1
+	</select>
+
+	<select id="selectCardAmount" resultType="java.util.TreeMap">
+		select
+		<foreach collection="list" index="index" item="item"   separator=","  >
+			(
+			select IFNULL(sum(IFNULL(amount, 0)), 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>
+			) as t${index}
+
+		</foreach>
+		from area where id=1
+	</select>
+
+	<select id="selectFreeAmount" resultType="java.util.TreeMap">
+		select
+		<foreach collection="list" index="index" item="item"   separator=","  >
+			(
+			select IFNULL(sum(IFNULL(amount, 0)), 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>
 			) as t${index}
 
@@ -528,15 +574,15 @@
 			select
 				#{item.beginTime} time,
 				(select ifnull(sum(ifnull(card_cash,0) + ifnull(consume,0)),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) orderAmount,
-				(select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0)
+				(select ifnull(sum(case a.pay_method when '现金' then goods_cash else 0 end),0)
 					from achieve_new a
 					inner join sys_order_item b on a.order_item_id=b.ID
 				where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cashAmount,
-				(select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0)
+				(select ifnull(sum(case a.pay_method when '划扣' then goods_cash else 0 end),0)
 					from achieve_new a
 					inner join sys_order_item b on a.order_item_id=b.ID
 				where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardAmount,
-				(select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0)
+				(select ifnull(sum(case a.pay_method when '划扣' then goods_cash else 0 end),0)
 					from achieve_new a
 					inner join sys_order_item b on a.order_item_id=b.ID
 				where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardUseAmount,
@@ -569,7 +615,7 @@
 	<select id="selectStaffCashAchieve" resultType="java.util.TreeMap">
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
-			(select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0)
+			(select ifnull(sum(case a.pay_method when '现金' then goods_cash else 0 end),0)
 				from achieve_new a
 				inner join sys_order_item b on a.order_item_id=b.ID
 			where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>
@@ -584,7 +630,7 @@
 	<select id="selectStaffCardAchieve" resultType="java.util.TreeMap">
 		select
 		<foreach collection="list" index="index" item="item"   separator=","  >
-			(select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0)
+			(select ifnull(sum(case a.pay_method when '划扣' then goods_cash else 0 end),0)
 				from achieve_new a
 				inner join sys_order_item b on a.order_item_id=b.ID
 			where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>

--
Gitblit v1.9.1