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/xcxShop/ShopCouponDao.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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 62b8923..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
(
@@ -584,7 +586,7 @@
ifnull(scr.is_using, 0) is_using
from shop_coupon sc left join shop_coupon_record scr
on sc.id = scr.c_id and user_id = #{userId}
- where sc.shop_id=#{shopId} and sc.kind=1 and now() >= begin_time and end_time >= now() and is_open = 1
+ where sc.company_id=#{companyId} and sc.kind=1 and now() >= begin_time and end_time >= now() and is_open = 1
<!--<if test="!isNewPeople">-->
<!--and get_limit = 1-->
<!--</if>-->
--
Gitblit v1.9.1