From 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:36:19 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..a857e67 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
@@ -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}]]>
@@ -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