From e4ff7c372f5c3fe1c9a5fdd88b4d3e265573f7c8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 May 2022 14:18:34 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml
index b577b01..aa69d97 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml
@@ -181,14 +181,14 @@
t3.purchase_quantity,
t4.shop_short_name,
t5.nick_name userName,
- t5.phone_number phone
+ t5.phone
from shop_activities_seckill_record t1
inner join shop_activities_seckill_info t2 on t1.si_id=t2.id
inner join shop_order t3 on t1.order_id=t3.id
left join sys_shop_info t4 on t3.store_id=t4.id
- left join biz_user t5 on t1.user_id=t5.open_id
+ left join sys_vip_info t5 on t1.user_id=t5.id
left join shop_product t6 on t2.goods_id=t6.id
- where t2.act_id=#{record.actId}
+ where t2.act_id=#{record.actId} and (t5.IS_DELETE is null or t5.IS_DELETE = '')
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
<if test="pageVo.sort !=null and pageVo.order !=null">
order by
@@ -208,9 +208,9 @@
inner join shop_activities_seckill_info t2 on t1.si_id=t2.id
inner join shop_order t3 on t1.order_id=t3.id
left join sys_shop_info t4 on t3.store_id=t4.id
- left join biz_user t5 on t1.user_id=t5.open_id
+ left join sys_vip_info t5 on t1.user_id=t5.id
left join shop_product t6 on t2.goods_id=t6.id
- where t2.act_id=#{record.actId}
+ where t2.act_id=#{record.actId} and (t5.IS_DELETE is null or t5.IS_DELETE = '')
</select>
<!-- 根据id查询-->
--
Gitblit v1.9.1