From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponDao.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponDao.xml
index b1f72eb..4e833dc 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponDao.xml
@@ -526,6 +526,7 @@
<result property="tag" column="tag"/>
<result property="isUsing" column="is_using"/>
<result property="kind" column="kind"/>
+ <result property="companyId" column="company_id"/>
</resultMap>
<select id="selectUsableCouponByProductInfo" resultMap="WxShopCouponMap">
@@ -561,7 +562,8 @@
select *
from shop_coupon
where
- kind=2 and now() >= begin_time and end_time >= now()
+ company_id=#{companyId}
+ and kind=2 and now() >= begin_time and end_time >= now()
and is_open = 1
and (is_all = 1 or
(
--
Gitblit v1.9.1