From ff17cee3be7d429104233d4bb172867eb4f701b3 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 17 Jan 2021 19:56:33 +0800
Subject: [PATCH] 消息提醒
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
index bd84c02..3be128f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
@@ -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>
@@ -805,7 +805,7 @@
select
#{item.beginTime} dataTime,
(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>
@@ -840,20 +840,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}]]>
--
Gitblit v1.9.1