From acc6c0773bc959be6aa8cf6b9e767593a2d066f4 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 08 Mar 2021 11:20:39 +0800 Subject: [PATCH] Merge branch 'api' into hive2.0 --- zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 a857e67..6844dff 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml @@ -678,7 +678,7 @@ and company_id=#{companyId} </if> ) refundCardPay, - (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}]]> @@ -689,7 +689,7 @@ and c.company_id=#{companyId} </if> ) productAchieve, - (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}]]> @@ -847,7 +847,7 @@ and shop_id=#{shopId} </if> ) refundCardPay, - (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}]]> @@ -855,7 +855,7 @@ and c.shop_id=#{shopId} </if> ) productAchieve, - (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}]]> -- Gitblit v1.9.1