From 28898d7621b8739e3edd935f96ab3086dc642fd5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Mar 2021 16:18:48 +0800
Subject: [PATCH] 20210226 分销设置页
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 3be128f..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}]]>
@@ -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}]]> and pay_method!='欠款'
- <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,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}]]>
@@ -848,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}]]>
@@ -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>
--
Gitblit v1.9.1