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/ShopCouponRecordDao.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponRecordDao.xml
index 808f1a7..4a915c2 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponRecordDao.xml
@@ -270,7 +270,7 @@
sc.min_amount minAmount, sc.offset_amount offsetAmount, sc.is_all isAll,
sc.product_ids productIds, sc.attr_ids attrIds, scr.is_using isUsing
from shop_coupon sc, shop_coupon_record scr
- where sc.shop_id=#{shopId} and sc.id = scr.c_id and scr.user_id = #{userId} and is_using = #{status}
+ where sc.company_id=#{companyId} and sc.id = scr.c_id and scr.user_id = #{userId} and is_using = #{status}
and is_open = 1
<if test="status == 2">
and now() >= begin_time and end_time >= now()
@@ -296,7 +296,7 @@
sc.min_amount minAmount, sc.offset_amount offsetAmount, sc.is_all isAll,
sc.product_ids productIds, sc.attr_ids attrIds, scr.is_using isUsing
from shop_coupon sc, shop_coupon_record scr
- where sc.shop_id=#{shopId} and sc.id = scr.c_id and scr.user_id = #{userId}
+ where sc.company_id=#{companyId} and sc.id = scr.c_id and scr.user_id = #{userId}
and (isnull(order_id) or order_id = 0)
and now() > end_time and is_open = 1
<if test="pageVo != null"><!-- 判断pageVo对象是否为空 -->
@@ -311,4 +311,8 @@
</if>
</select>
+ <select id="countUnuseCouponRecord" resultType="java.lang.Integer">
+ select count(*) from shop_coupon_record where user_id = #{userId} and is_using = 2
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1