20200618 代码提交

xiaoyong931011

2020-06-18 22a1ada1fefc901e391279e01a251aa3c471e96a

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

@@ -9,7 +9,7 @@
        s.order_type = 'B' 

            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">

                    and (m.phone = #{record.account} or m.email = #{record.account} or s.member_id=#{record.account})

                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})

                </if>

                <if test="record.orderStatus!=null and record.orderStatus!= 0" >

                    and s.order_status = #{record.orderStatus}

@@ -32,6 +32,7 @@
         s.order_status orderStatus,

         m.name,

         m.account,

         a.invite_id inviteId,

         m.payment_qrcode paymentQrcode,

         m.bank,

         m.payment_type paymentType,

@@ -44,7 +45,7 @@
        s.order_type = 'S' 

            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">

                    and (a.phone = #{record.account} or a.email = #{record.account} or s.member_id=#{record.account}) 
                    and (a.phone = #{record.account} or a.email = #{record.account} or a.invite_id=#{record.account})

                </if>

                <if test="record.orderStatus!=null and record.orderStatus!= 0" >

                    and s.order_status = #{record.orderStatus}