未知的修改功能

src/main/resources/mapper/TbShopUserMapper.xml

@@ -380,13 +380,30 @@
     select * from tb_shop_user where user_id=#{userId} and shop_id=#{shopId}
     </select>
 
-  <select id="selectByUserId" resultMap="BaseResultMap">
-    select * from tb_shop_user where user_id=#{userId}
-    </select>
     <select id="selectByOpenId" resultType="com.chaozhanggui.system.cashierservice.entity.TbShopUser">
       select * from tb_shop_user where mini_open_id = #{openId}
     </select>
   <select id="selectParams" resultType="com.chaozhanggui.system.cashierservice.entity.TbParams">
     select * from tb_params where id = 1
   </select>
+
+  <select id="selectByUserId" resultType="java.util.Map">
+    SELECT
+      i.id as shopId,
+      i.shop_name as shopName,
+      i.chain_name as chainName,
+      i.logo,
+      i.detail,
+      u.amount,
+      u.`code`,
+      u.is_vip
+    FROM
+      tb_shop_user u
+        left join tb_shop_info i on u.shop_id=i.id
+    WHERE
+      u.user_id = #{userId}
+    <if test="shopId != null and shopId !=''">
+     and  shop_id = #{shopId}
+    </if>
+  </select>
 </mapper>