From 087cd794187727bf9a34fcef3027cd56f6dec436 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Mar 2021 15:20:54 +0800
Subject: [PATCH] Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponRecordDao.xml | 4 ++--
1 files changed, 2 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..cbb939b 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对象是否为空 -->
--
Gitblit v1.9.1