20200716 代码提交

xiaoyong931011

2020-07-16 71d0fae3ac7113f813a73fdbcd76a608fce30e38

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

@@ -3,30 +3,34 @@
<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberMapper">

    <select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
        select * from member
        SELECT
         *
      FROM
         member m
      LEFT JOIN member_authentication a ON m.id = a.member_id
        <where>
            <if test="record != null" >
                <if test="record.startTime!=null">
                    and create_time >=#{record.startTime}
                    and m.create_time >=#{record.startTime}
                </if>
                <if test="record.endTime!=null">
                    and #{record.endTime} >= create_time
                    and #{record.endTime} >= m.create_time
                </if>
                <if test="record.account!=null and record.account!=''">
                    and (phone = #{record.account} or email = #{record.account} or invite_id=#{record.account})
                <if test="record.account!=null">
                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
                </if>
                <if test="record.accountStatus!=null">
                    and account_status = #{record.accountStatus}
                    and m.account_status = #{record.accountStatus}
                </if>
                <if test="record.accountType != null" >
                    and account_type = #{record.accountType}
                    and m.account_type = #{record.accountType}
                </if>
                <if test="record.certifyStatus != null">
                    and certify_status = #{record.certifyStatus}
                    and m.certify_status = #{record.certifyStatus}
                </if>
            </if>
        </where>
        order by create_time desc
        order by m.create_time desc
    </select>
    
    <select id="findMemberAccountInfoListInPage" resultType="com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo">
@@ -140,22 +144,13 @@
   </select>
   <select id="selectReturnMoneyForBasicRealData" resultType="java.lang.String">
      SELECT
         IFNULL(SUM(s.amount),'0')
         IFNULL(SUM(s.amount), '0')
      FROM
         member_account_money_change s
      WHERE
         s.type = 3
      AND s.content LIKE '%佣金入账%'
      AND s.content LIKE '%佣金到账%'
      AND s. STATUS = '1'
      AND s.member_id NOT IN (
         SELECT
            id
         FROM
            member
         WHERE
            account_type = '2'
         AND account_status = '1'
      )
   </select>
   <select id="selectClosingpriceForBasicRealData" resultType="java.lang.String">
      SELECT
@@ -163,7 +158,7 @@
      FROM
         contract_order a
      WHERE
         a.closing_type IN (2, 3)
      a.closing_type = '0'
         and a.order_status = '1'
      AND a.member_id NOT IN (
         SELECT
@@ -181,7 +176,7 @@
      FROM
         contract_order a
      WHERE
         a.closing_type IN (4, 5, 6, 7, 8, 9)
         a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
         and a.order_status = '1'
      AND a.member_id NOT IN (
         SELECT
@@ -199,7 +194,7 @@
      FROM
         contract_order a
      WHERE
         a.closing_type IN (4, 5, 6, 7, 8, 9)
         a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
      AND a.order_status = '1'
      AND a.member_id NOT IN (
         SELECT
@@ -217,22 +212,20 @@
      FROM
         (
            SELECT
               a.id
               s.id
            FROM
               contract_order a
               contract_hold_order s
            WHERE
               a. closing_type IN (2, 3)
               AND a.member_id NOT IN (
               s.member_id IN (
                  SELECT
                     id
                  FROM
                     member
                  WHERE
                     account_type = '2'
                  AND account_status = '1'
                     account_type = '1'
               )
            GROUP BY
               a.member_id
               s.member_id
         ) b
   </select>
   <select id="selectBBZHForBasicRealData" resultType="java.lang.String">