Merge branch 'dev-msg'

admin

2019-01-22 0e552c5dba18d27622116a7d7a6e04fc99f8e8a7

 fanli/src/main/java/com/yeshi/fanli/mapping/goods/RecommendUserGoodsMapMapper.xml

@@ -35,6 +35,21 @@
   </select>


   <select id="listByUidAndCommonGoodsId" resultMap="BaseResultMap">
      SELECT m.* FROM
      yeshi_ec_recommend_user_goods_map m LEFT JOIN
      yeshi_ec_recommend_user_goods g ON m.`rugm_recommend_id`=g.`rug_id`
      WHERE g.`rug_uid`=#{uid} AND m.`rugm_common_goods_id`=#{commonGoodsId}
   </select>

   <select id="countByUidAndCommonGoodsId" resultType="java.lang.Long">
      SELECT
      count(m.id) FROM yeshi_ec_recommend_user_goods_map m LEFT JOIN
      yeshi_ec_recommend_user_goods g ON m.`rugm_recommend_id`=g.`rug_id`
      WHERE g.`rug_uid`=#{uid} AND m.`rugm_common_goods_id`=#{commonGoodsId}
   </select>


   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
      yeshi_ec_recommend_user_goods_map where rugm_id =
      #{id,jdbcType=BIGINT}