From baa79615425b71521e67ec8a9344b88ce53fc5de Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 13:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
index aa09081..7a46366 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
@@ -285,7 +285,7 @@
<foreach collection="list" index="index" item="item" separator="," >
(
select IFNULL(count(1),0) from sys_order
- where STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where STATU in ('已付款', '欠款') and orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and shop_id=#{shopId}
</if>
@@ -304,7 +304,7 @@
select case a.perCustomCnt when 0 then 0 else a.totalSaleCnt/a.perCustomCnt end from (
select
(select IFNULL(count(1),0) from sys_order
- where STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where STATU in ('已付款', '欠款') and orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and shop_id=#{shopId}
</if>
@@ -313,7 +313,7 @@
</if>
) perCustomCnt,
(select IFNULL(sum(b.COUNT),0) from sys_order a inner join sys_order_item b on a.ID=b.ORDER_ID
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and shop_id=#{shopId}
</if>
@@ -334,7 +334,7 @@
select case a.perCustomCnt when 0 then 0 else a.totalPay/a.perCustomCnt end from (
select
(select IFNULL(count(1),0) from sys_order
- where STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where STATU in ('已付款', '欠款') and orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and shop_id=#{shopId}
</if>
@@ -369,7 +369,7 @@
inner join sys_store_info d on c.store_id = d.ID
inner join sys_order_item e on a.ID=e.ORDER_ID
inner join shopping_goods f on e.goods_id=f.id and f.good_type='家居产品'
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and a.shop_id=#{shopId}
</if>
@@ -380,7 +380,7 @@
(select IFNULL(sum(b.COUNT * IFNULL(c.price, 0)),0) from sys_order a
inner join sys_order_item b on a.ID=b.ORDER_ID
inner join shopping_goods c on c.good_type != '家居产品' and b.goods_id=c.id
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and a.shop_id=#{shopId}
</if>
@@ -406,7 +406,7 @@
inner join sys_store_info d on c.store_id = d.ID
inner join sys_order_item e on a.ID=e.ORDER_ID
inner join shopping_goods f on e.goods_id=f.id and f.good_type='家居产品'
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and a.shop_id=#{shopId}
</if>
@@ -417,7 +417,7 @@
(select IFNULL(sum(b.COUNT * IFNULL(c.price, 0)),0) from sys_order a
inner join sys_order_item b on a.ID=b.ORDER_ID
inner join shopping_goods c on c.good_type != '家居产品' and b.goods_id=c.id
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and a.shop_id=#{shopId}
</if>
@@ -452,7 +452,7 @@
inner join sys_store_info d on c.store_id = d.ID
inner join sys_order_item e on a.ID=e.ORDER_ID
inner join shopping_goods f on e.goods_id=f.id and f.good_type='家居产品'
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and a.shop_id=#{shopId}
</if>
@@ -463,7 +463,7 @@
(select IFNULL(sum(b.COUNT * IFNULL(c.price, 0)),0) from sys_order a
inner join sys_order_item b on a.ID=b.ORDER_ID
inner join shopping_goods c on c.good_type != '家居产品' and b.goods_id=c.id
- where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
+ where a.STATU in ('已付款', '欠款') and a.orderType=1 and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and a.shop_id=#{shopId}
</if>
@@ -528,9 +528,18 @@
select
#{item.beginTime} time,
(select ifnull(sum(ifnull(card_cash,0) + ifnull(consume,0)),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) orderAmount,
- (select ifnull(sum(case t3 when '现金业绩' then card_cash else 0 end),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cashAmount,
- (select ifnull(sum(case t3 when '划扣业绩' then consume else 0 end),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardAmount,
- (select ifnull(sum(case t3 when '划扣业绩' then consume else 0 end),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardUseAmount,
+ (select ifnull(sum(case b.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 <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cashAmount,
+ (select ifnull(sum(case b.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 <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardAmount,
+ (select ifnull(sum(case b.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 <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardUseAmount,
(select ifnull(sum(ifnull(proj_percentage, 0)),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]> and order_type='订单') goodsAmount,
(select ifnull(sum(ifnull(his_consume, 0)),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) hisConsume,
(select ifnull(sum(ifnull(free_consume, 0)),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) freeConsume,
@@ -560,14 +569,14 @@
<select id="selectStaffCashAchieve" resultType="java.util.TreeMap">
select
<foreach collection="list" index="index" item="item" separator="," >
- (select ifnull(sum(case t3 when '现金业绩' then card_cash else 0 end),0)
+ (select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0)
from achieve_new a
- where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>
- <if test="staffId != null and staffId != 0">
- and a.beault_id=#{staffId}
- </if>
+ inner join sys_order_item b on a.order_item_id=b.ID
+ where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>
+ <if test="staffId != null and staffId != 0">
+ and a.beault_id=#{staffId}
+ </if>
) as t${index}
-
</foreach>
from area where id=1
</select>
@@ -575,8 +584,9 @@
<select id="selectStaffCardAchieve" resultType="java.util.TreeMap">
select
<foreach collection="list" index="index" item="item" separator="," >
- (select ifnull(sum(case t3 when '划扣业绩' then consume else 0 end),0)
- from achieve_new a
+ (select ifnull(sum(case b.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 <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>
<if test="staffId != null and staffId != 0">
and a.beault_id=#{staffId}
--
Gitblit v1.9.1