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

zxl

昨天 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

@@ -53,6 +53,8 @@
        <result column="user_id" property="userId"/>
        <result column="coupon_name" property="couponName"/>
        <result column="claimTime" property="claimTime"/>
        <result column="order_status" property="orderStatus"/>

    </resultMap>

    <select id="getPage" resultMap="BaseResultMapByManager">
@@ -75,14 +77,18 @@
        lsccr.user_id,
        lsccr.coupon_name,
        lsccr.create_time AS claimTime,
        lsccr.coupon_id
        lsccr.coupon_id,
        lo.order_status
        FROM
        lmk_store_coupon_claim_record lsccr
        INNER JOIN
        li_member_coupon lmc ON lmc.member_coupon_id = lsccr.member_coupon_id
        li_member_coupon lmc ON lmc.id = lsccr.member_coupon_id
        LEFT JOIN li_order lo ON lo.use_platform_member_coupon_id = lmc.id AND lo.delete_flag = 0
        WHERE
        lmc.delete_flag = 0
        AND lsccr.delete_flag = 0
        AND lmc.member_id = lsccr.user_id

        <!-- 1. 会员名称模糊查询（关联li_member_coupon表） -->
        <if test="query.memberName != null and query.memberName != ''">
            AND lmc.member_name LIKE CONCAT('%', #{query.memberName}, '%')
@@ -131,15 +137,19 @@
        lsccr.user_id,
        lsccr.coupon_name,
        lsccr.create_time AS claimTime,
        lsccr.coupon_id
        lsccr.coupon_id,
        lo.order_status
        FROM
        lmk_store_coupon_claim_record lsccr
        INNER JOIN
        li_member_coupon lmc ON lmc.member_coupon_id = lsccr.member_coupon_id
        li_member_coupon lmc ON lmc.id = lsccr.member_coupon_id
        LEFT JOIN li_order lo ON lo.use_platform_member_coupon_id = lmc.id AND lo.delete_flag = 0

        WHERE
        lmc.delete_flag = 0
        AND lsccr.delete_flag = 0
        AND lmc.member_id = lsccr.user_id

        <!-- 1. 会员名称模糊查询（关联li_member_coupon表） -->
        <if test="query.memberName != null and query.memberName != ''">
            AND lmc.member_name LIKE CONCAT('%', #{query.memberName}, '%')