Helius
2022-06-11 ec97abaae5a0d93e9b4d5f3f82de7b97f2b586b0
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">
@@ -110,6 +111,7 @@
            <result property="cnt" column="cnt" />
            <result property="price" column="price" />
            <result property="amount" column="amount" />
            <result property="isNormal" column="is_normal" />
        </collection>
    </resultMap>
@@ -166,7 +168,8 @@
            b.sku_image,
            b.cnt,
            b.price,
            b.amount
            b.amount,
            b.is_normal
        from mall_order_info a
             inner join mall_order_item b on a.id=b.order_id
        where a.id=#{id}
@@ -219,7 +222,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">
@@ -237,7 +240,7 @@
        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 status = 4
        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>