From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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..0a420e7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml
@@ -181,12 +181,12 @@
 			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}
 		<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -208,7 +208,7 @@
 		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}
 	</select>

--
Gitblit v1.9.1