Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-22 35a295dea9c62bca0157982e594e4917c2010334

 src/main/resources/mapper/modules/MallOrderInfoMapper.xml

@@ -6,6 +6,35 @@
        select * from mall_order_info where member_id=#{memberId} and id=#{id}
    </select>

    <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
        select *
        from mall_order_info a
        left join mall_member b on a.member_id = b.id
        <where>
            a.del_flag=2
            <if test="record != null">
                <if test="record.payResult != null and record.payResult != ''">
                    and a.pay_result = #{record.payResult}
                </if>
                <if test="record.status != null and record.status != ''">
                    and a.status = #{record.status}
                </if>
                <if test="record.orderNo != null and record.orderNo != ''">
                    and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
                </if>
                <if test="record.name != null and record.name != ''">
                    and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
                </if>
            </if>
        </where>
        order by a.created_time desc
    </select>

    <select id="getMallOrderInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderVo">
        select * from mall_order_info where id = #{id}
    </select>


    <resultMap id="OrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo">
        <id column="id" property="id" />
        <result column="order_no" property="orderNo" />