Merge remote-tracking branch 'origin/div' into div

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml

@@ -247,6 +247,11 @@
      where uie_uid = #{userInfo.id,jdbcType=BIGINT}

   </update>



    <update id="updateGoldCoin">

      UPDATE yeshi_ec_user_info_extra 
      SET uie_gold_coin = IF(uie_gold_coin IS NULL,${goldCoin}, uie_gold_coin + ${goldCoin}) 		
      WHERE uie_id = #{id}

   </update>



   <select id="getInfoExtraByUid" resultMap="BaseResultMap">

      SELECT * FROM

@@ -254,6 +259,12 @@
      WHERE uie_uid = #{uid}

   </select>



   <select id="getByUidForUpdate" resultMap="BaseResultMap">

      SELECT * FROM

      yeshi_ec_user_info_extra

      WHERE uie_uid = #{uid} FOR UPDATE

   </select>



   <select id="getInfoExtraVOByUid" resultMap="VOResultMap">

      SELECT

      u.`id`,u.`nick_name`,u.`portrait`,ue.*,rk.*