From 147999c063e913989a4b09f5e7884e11f680ace2 Mon Sep 17 00:00:00 2001
From: jiangyouyao <jiangyouyao>
Date: Wed, 06 Apr 2022 14:48:16 +0800
Subject: [PATCH] fix:修复赠送产品需要设置消耗金额的问题

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
index 7bc1f4c..4ad1d1f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -428,4 +428,15 @@
 			and a.act_type=#{activitiesTypeSign}
 			and a.act_status=#{actstatusStatusIng}
 	</select>
+
+	<select id="selectOneByCompanyIdAndActType" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
+		SELECT
+			*
+		FROM
+			shop_activities a
+		where
+			a.company_id=#{companyId}
+		  and a.act_type=#{activitiesTypeSign}
+		  and a.act_status != 5
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1