fix

Helius

2022-06-02 55810dbe3aa36eb2bbcc4113eb2c85fc3b11b48d

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

@@ -96,6 +96,7 @@
        <result column="longitude" property="longitude" />
        <result column="latitude" property="latitude" />
        <result column="order_type" property="orderType" />
        <result column="carriage" property="carriage" />
        <result column="remark" property="remark" />
        <result column="del_flag" property="delFlag" />
        <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
@@ -219,7 +220,7 @@

    <select id="selectTotalAmount" resultType="java.math.BigDecimal">
        select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
        where member_id=#{memberId} and status = 4
        where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
    </select>

    <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -233,6 +234,25 @@
        </if>
    </select>

    <select id="selectTotalAmountUnCostForDate" resultType="java.math.BigDecimal">
        select IFNULL(sum(IFNULL(b.amount,0) - IFNULL(b.cost_price*b.cnt, 0)),0)
        from mall_order_info a
        inner join mall_order_item b on a.id=b.order_id
        where a.status in (2, 3, 4) and a.is_normal = 2 and a.order_type=1
        <if test="member != null">
            and member_id=#{memberId}
        </if>
        <if test="date != null and type == 'D'">
            and date_format(a.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
        </if>
        <if test="date != null and type == 'M'">
            and date_format(a.receving_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
        </if>
        <if test="date != null and type == 'Y'">
            and date_format(a.receving_time, '%Y') = date_format(#{date}, '%Y')
        </if>
    </select>

    <select id="selectByOrderNo" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info where order_no=#{orderNo}
    </select>