From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 e020304..56a7c07 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml
@@ -574,15 +574,15 @@
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 b.pay_method when '现金' then goods_cash else 0 end),0)
+ (select ifnull(sum(case a.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)
+ (select ifnull(sum(case a.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)
+ (select ifnull(sum(case a.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,
@@ -615,7 +615,7 @@
<select id="selectStaffCashAchieve" resultType="java.util.TreeMap">
select
<foreach collection="list" index="index" item="item" separator="," >
- (select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0)
+ (select ifnull(sum(case a.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} ]]>
@@ -630,7 +630,7 @@
<select id="selectStaffCardAchieve" resultType="java.util.TreeMap">
select
<foreach collection="list" index="index" item="item" separator="," >
- (select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0)
+ (select ifnull(sum(case a.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} ]]>
--
Gitblit v1.9.1