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/ShopActivitiesGroupInfoDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
index 877aa14..4660ac1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml
@@ -274,7 +274,7 @@
left join shop_product t3 on t2.goods_id=t3.id
left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1 and t1.act_type=1
- and company_id=#{companyId}
+ and t1.company_id=#{record.companyId}
<if test="record !=null"><!-- 判断pageVo对象是否为空 -->
<if test="record.sort !=null and record.order !=null">
order by
@@ -294,7 +294,7 @@
left join shop_product t3 on t2.goods_id=t3.id
left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1
- and company_id=#{companyId}
+ and t1.company_id=#{record.companyId}
</select>
<select id="selectGroupInfoByActId" resultMap="ShopActivitiesGroupInfoMap">
--
Gitblit v1.9.1