20200716 代码提交

xiaoyong931011

2020-07-16 71d0fae3ac7113f813a73fdbcd76a608fce30e38

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

@@ -9,7 +9,15 @@
         contract_order s

      LEFT JOIN member m ON m.id = s.member_id

      <where>

      order_type in (3,4)

      s.closing_type in (2,3,4,5,6,7,8,9)

      AND s.member_id IN (

         SELECT

            id

         FROM

            member

         WHERE

            account_type = '1'

      )

         <if test="record != null" >

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

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

@@ -18,8 +26,27 @@
                    and s.closing_type = #{record.closingType}

                </if>

            </if>

      </where>	
      order by s.order_no DESC,s.create_time asc

      </where>

         order by s.opening_time desc

   </select>

   <select id="findMemberHistoryOrderInfoAllInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">

      SELECT

         *

      FROM

         contract_order s

      LEFT JOIN member m ON m.id = s.member_id

      <where>

      s.closing_type in (2,3,4,5,6,7,8,9)

         <if test="record != null" >

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

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

                </if>

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

                    and s.closing_type = #{record.closingType}

                </if>

            </if>

      </where>

         order by s.opening_time desc

   </select>

    

</mapper>