Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

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

@@ -5,21 +5,19 @@
   <resultMap id="BaseResultMap"
      type="com.yeshi.fanli.entity.goods.RecommendUserGoods">
      <id column="rug_id" property="id" jdbcType="BIGINT" />
      <result column="rug_recommend_desc" property="recommendDesc"
         jdbcType="VARCHAR" />
      <result column="rug_create_time" property="createTime"
         jdbcType="TIMESTAMP" />
      <result column="rug_update_time" property="updateTime"
         jdbcType="TIMESTAMP" />
      <association property="user"
         javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
      <result column="rug_device" property="device" jdbcType="VARCHAR"/>
      <result column="rug_recommend_desc" property="recommendDesc" jdbcType="VARCHAR" />
      <result column="rug_create_time" property="createTime" jdbcType="TIMESTAMP" />
      <result column="rug_update_time" property="updateTime" jdbcType="TIMESTAMP" />
		
      <association property="user" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
         <id column="rug_uid" property="id" jdbcType="BIGINT" />
      </association>
      <association property="goodsList" column="rug_id"
         select="com.yeshi.fanli.dao.mybatis.goods.RecommendUserGoodsMapMapper.selectGoodsByRecommendId">
      </association>
   </resultMap>
   <sql id="Base_Column_List">rug_id,rug_uid,rug_recommend_desc,rug_create_time,rug_update_time
   <sql id="Base_Column_List">rug_id,rug_uid,rug_device,rug_recommend_desc,rug_create_time,rug_update_time
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
@@ -58,7 +56,25 @@
   </select>


   <select id="getLatestRecommendUserGoodsByDevice" resultMap="BaseResultMap" parameterType="java.lang.String">
      select   * from yeshi_ec_recommend_user_goods
      where rug_device =   #{0} 
      order by rug_create_time desc 
      limit 1
   </select>

   <select id="listRecommendGoodsByDevice" resultMap="BaseResultMap">
      select    <include refid="Base_Column_List" /> from yeshi_ec_recommend_user_goods 
      where rug_device =   #{device,jdbcType=VARCHAR} 
      order by rug_create_time desc 
      limit #{start},#{count}
   </select>

   <select id="countRecommendGoodsByDevice" resultType="java.lang.Long" parameterType="java.lang.String">
      select count(rug_id) from yeshi_ec_recommend_user_goods
      where  rug_device =   #{device,jdbcType=VARCHAR} 
   </select>
	


   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
@@ -67,9 +83,9 @@
   <insert id="insert" parameterType="com.yeshi.fanli.entity.goods.RecommendUserGoods"
      useGeneratedKeys="true" keyProperty="id">insert into
      yeshi_ec_recommend_user_goods
      (rug_id,rug_uid,rug_recommend_desc,rug_create_time,rug_update_time)
      (rug_id,rug_uid,rug_device,rug_recommend_desc,rug_create_time,rug_update_time)
      values
      (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{recommendDesc,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
      (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{device,jdbcType=VARCHAR},#{recommendDesc,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.goods.RecommendUserGoods"
      useGeneratedKeys="true" keyProperty="id">
@@ -77,6 +93,7 @@
      <trim prefix="(" suffix=")" suffixOverrides=",">
         <if test="id != null">rug_id,</if>
         <if test="user != null">rug_uid,</if>
         <if test="device != null">rug_device,</if>
         <if test="recommendDesc != null">rug_recommend_desc,</if>
         <if test="createTime != null">rug_create_time,</if>
         <if test="updateTime != null">rug_update_time,</if>
@@ -85,24 +102,27 @@
      <trim prefix="(" suffix=")" suffixOverrides=",">
         <if test="id != null">#{id,jdbcType=BIGINT},</if>
         <if test="user != null">#{user.id,jdbcType=BIGINT},</if>
         <if test="device != null">#{device,jdbcType=VARCHAR},</if>
         <if test="recommendDesc != null">#{recommendDesc,jdbcType=VARCHAR},</if>
         <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
         <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
      </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.goods.RecommendUserGoods">update
      yeshi_ec_recommend_user_goods set rug_uid =
      #{user.id,jdbcType=BIGINT},rug_recommend_desc =
      #{recommendDesc,jdbcType=VARCHAR},rug_create_time =
      #{createTime,jdbcType=TIMESTAMP},rug_update_time =
      #{updateTime,jdbcType=TIMESTAMP} where rug_id = #{id,jdbcType=BIGINT}
      yeshi_ec_recommend_user_goods set 
      rug_uid = #{user.id,jdbcType=BIGINT},
      rug_device = #{device,jdbcType=VARCHAR},
      rug_recommend_desc = #{recommendDesc,jdbcType=VARCHAR},
      rug_create_time = #{createTime,jdbcType=TIMESTAMP},
      rug_update_time = #{updateTime,jdbcType=TIMESTAMP} 
      where rug_id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.goods.RecommendUserGoods">
      update yeshi_ec_recommend_user_goods
      <set>
         <if test="user != null">rug_uid=#{user.id,jdbcType=BIGINT},</if>
         <if test="recommendDesc != null">rug_recommend_desc=#{recommendDesc,jdbcType=VARCHAR},
         </if>
         <if test="device != null">rug_device=#{device,jdbcType=VARCHAR},</if>
         <if test="recommendDesc != null">rug_recommend_desc=#{recommendDesc,jdbcType=VARCHAR},</if>
         <if test="createTime != null">rug_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
         <if test="updateTime != null">rug_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
      </set>