From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml
index f429e8c..2e74316 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml
@@ -247,7 +247,7 @@
t3.nick_name headName
from shop_activities_group_join t1
inner join shop_activities_group_price t2 on t1.gp_id=t2.id
- inner join biz_user t3 on t1.gj_head_id=t3.open_id
+ inner join sys_vip_info t3 on t1.gj_head_id=t3.id
where t1.act_id = #{record.actId}
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
<if test="pageVo.sort !=null and pageVo.order !=null">
@@ -310,7 +310,7 @@
t3.avatar_url avatarUrl
from shop_activities_group_join t1
inner join shop_activities_group_join_user t2 on t1.id=t2.gj_id and t2.is_has_cancel=2 and t2.is_has_pay=1
- left join biz_user t3 on t2.user_id=t3.open_id
+ left join sys_vip_info t3 on t2.user_id=t3.id
where t1.id=#{gjId}
</select>
@@ -327,7 +327,7 @@
t3.avatar_url avatarUrl
from shop_activities_group_join t1
inner join shop_activities_group_join_user t2 on t1.id=t2.gj_id and t2.is_has_cancel=2
- left join biz_user t3 on t2.user_id=t3.open_id
+ left join sys_vip_info t3 on t2.user_id=t3.id
where t1.id=#{gjId}
</select>
@@ -350,7 +350,7 @@
t3.avatar_url
from shop_activities_group_join t1
inner join shop_activities_group_price t2 on t1.gp_id=t2.id
- left join biz_user t3 on t1.gj_head_id=t3.open_id
+ left join sys_vip_info t3 on t1.gj_head_id=t3.id
where t1.act_id=#{actId} and t1.gj_status=3
</select>
--
Gitblit v1.9.1