Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-02-15 17:38:24 +08:00
6 changed files with 12 additions and 11 deletions

View File

@@ -119,8 +119,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser>
}
@Override
public Page<ShopUser> vipCard(long userInfoId) {
Page<ShopUserVipCardDTO> infos = mapper.selectVipCard(PageUtil.buildPage(), userInfoId);
return null;
public Page<ShopUserVipCardDTO> vipCard(long userInfoId) {
return mapper.selectVipCard(PageUtil.buildPage(), userInfoId);
}
}

View File

@@ -39,6 +39,7 @@
</if>
</select>
<select id="selectVipCard" resultType="com.czg.account.dto.shopuser.ShopUserVipCardDTO">
select b.logo, b.shop_name shopName, a.amount, a.shop_id shopId from tb_shop_user as a left join tb_shop_info as b on a.shop_id=b.id
where a.user_id=#{userInfoId}
</select>
</mapper>