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

peng

3 小时以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 framework/src/main/resources/mapper/lmk/ActivityRefPrizeMapper.xml

@@ -14,7 +14,41 @@
        <result column="remain_num" property="remainNum" />
    </resultMap>

    <resultMap id="activityRefPrizeInfoMap" type="cn.lili.modules.lmk.domain.vo.ActivityRefPrizeInfoVO">
        <id column="id" property="id"/>
        <result column="prize_activity_id" property="prizeActivityId" />
        <result column="prize_id" property="prizeId" />
        <result column="prize_content" property="prizeContent" />
        <result column="prize_num" property="prizeNum" />
        <result column="prize_probability" property="prizeProbability" />
        <result column="version" property="version" />
        <result column="remain_num" property="remainNum" />
        <result column="prize_name" property="prizeName" />
        <result column="prize_cover" property="prizeCover"/>
        <result column="prize_type" property="prizeType"/>
        <result column="max_pre_day" property="maxPreDay"/>
    </resultMap>
    <select id="getActivityRefPrizeByActivityId" resultMap="activityRefPrizeInfoMap">
        SELECT
            LARP.prize_activity_id,
            LARP.prize_id,
            LARP.prize_content,
            LARP.prize_num,
            LARP.prize_probability,
            LARP.version,
            LARP.remain_num,
            LARP.id,
            LARP.max_pre_day,
            LPD.prize_name,
            LPD.prize_cover,
            LPD.prize_type
        FROM
            lmk_activity_ref_prize LARP
                LEFT JOIN
            lmk_prize_draw LPD ON LARP.prize_id = LPD.id
        where LARP.prize_activity_id = #{prizeActivityId} AND LARP.delete_flag = 0

    </select>



@@ -52,5 +86,12 @@
        WHERE
            LARP.delete_flag = 0
    </select>
    <select id="lockPrizeRef" resultType="string">
        SELECT
            *
        FROM
            lmk_activity_ref_prize
        WHERE id = #{refId} FOR UPDATE;
    </select>

</mapper>