From dd7d81348208226c4fc9a4d317c544b41a7abb02 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:35 +0800
Subject: [PATCH] 扣除用户积分

---
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 48bb959..f28efbf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -966,7 +966,7 @@
 			b.SHOP_IMAG photo,
 			sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume,0)) amount
 		from achieve_new a
-		left join sys_shop_info b on a.shop_id=b.ID
+		left join sys_shop_info b on a.shop_id=b.ID and b.shop_type!=1
 		<where>
 			<if test="record.companyId != null">
 				and a.company_id=#{record.companyId}
@@ -1067,7 +1067,7 @@
 			b.SHOP_IMAG photo,
 			sum(IFNULL(a.consume,0) + IFNULL(a.card_cash,0)) amount
 		from achieve_new a
-		left join sys_shop_info b on a.shop_id=b.ID
+		left join sys_shop_info b on a.shop_id=b.ID and shop_type!=1
 		<where>
 			<if test="record.companyId != null">
 				and a.company_id=#{record.companyId}

--
Gitblit v1.9.1