web socket

支付
会员

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9889
+#  port: 9889
   servlet:
     context-path: /cashierService/
 wx:
@@ -10,6 +10,9 @@ wx:
     custom:
       appId: wxd88fffa983758a30
       secrete: a34a61adc0602118b49400baa8812454
+#      卓尔
+#      appId: wx0dcea6001b0a8fb4
+#      secrete: ba42423cce61f93f02519ff3030ceb1c
 #
 spring:
   profiles:

src/main/resources/mapper/TbShopUserFlowMapper.xml

@@ -122,6 +122,10 @@
     FROM
       tb_shop_user_flow f
         LEFT JOIN tb_shop_user u ON f.shop_user_id = u.id
+    where 1=1
+    <if test="memberId != null and memberId!=''">
+      and u.id = #{memberId}
+    </if>
     order by f.id desc
     </select>
 </mapper>

src/main/resources/mapper/TbShopUserMapper.xml

@@ -44,6 +44,13 @@
     from tb_shop_user
     where id = #{id,jdbcType=VARCHAR}
   </select>
+  <select id="selectByPhone" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tb_shop_user
+    where telephone = #{phone,jdbcType=VARCHAR}
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from tb_shop_user
     where id = #{id,jdbcType=VARCHAR}
@@ -386,11 +393,13 @@
 
   <select id="selectByUserId" resultType="java.util.Map">
     SELECT
+      u.id as memberId,
       i.id as shopId,
       i.shop_name as shopName,
       i.chain_name as chainName,
       i.logo,
       i.detail,
+      u.level_consume as levelConsume,
       u.amount,
       u.`code`,
       u.is_vip