From a13a93a493e7e94e28b2225c26e7e13b52d3288c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:45 +0800
Subject: [PATCH] 20210412 tqq环境
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 0540354..4d98102 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -920,15 +920,13 @@
<select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
select
sale_id id,
- (select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0)
+ (select ifnull(sum(case 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 (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
) orderCash,
- (select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0)
+ (select ifnull(sum(case 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 (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
) cash,
@@ -979,7 +977,7 @@
select
b.su_name name,
b.su_id id,
- b.SHOP_IMAG photo,
+ b.su_photo photo,
sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) ) amount,
c.shop_short_name shopName
from achieve_new a
@@ -1056,21 +1054,23 @@
select
b.shop_short_name name,
b.SHOP_IMAG photo,
- sum(IFNULL(a.goods_cash,0)) amount
- from achieve_new a
- left join sys_shop_info b on a.shop_id=b.ID and shop_type!=1
+ sum(IFNULL(a.amount,0)) amount
+ from sys_order_flow a
+ inner join sys_order c on a.order_id=c.id and c.STATU != '已取消'
+ inner join sys_shop_info b on a.shop_id=b.id and shop_type!=1
<where>
+ a.pay_method not in ('储值卡', '欠款')
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
<if test='record.t1 == "1" and record.datatime != null'>
- and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
+ and date_format(a.create_time, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
</if>
<if test='record.t1 == "2" and record.datatime != null'>
- and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
+ and date_format(a.create_time, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
</if>
<if test='record.t1 == "3" and record.datatime != null'>
- and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
+ and date_format(a.create_time, '%Y') = date_format(#{record.datatime}, '%Y')
</if>
</where>
group by a.shop_id
--
Gitblit v1.9.1