xiaoyong931011
2023-08-15 84c7afc62bb1eb6f5d80d2d9928d0d11a1ffbdda
src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -56,11 +56,9 @@
        select a.*,
               b.name memberName,
               b.bind_phone memberBindPhone,
               b.phone memberPhone,
               c.name leaderName
               b.phone memberPhone
        from mall_order_info a
        left join mall_member b on a.member_id = b.id
        left join mall_team_leader c on a.take_unique_code = c.unique_code
        <where>
            <if test="record != null">
                <if test="record.payResult != null and record.payResult != ''">
@@ -140,6 +138,7 @@
        <result column="city" property="city" />
        <result column="township" property="township" />
        <result column="detail_address" property="detailAddress" />
        <result column="delivery_type" property="deliveryType" />
        <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
            <id property="id" column="item_id" />
            <result property="orderId" column="order_id" />
@@ -231,7 +230,7 @@
    </select>
    <select id="selectOrderInfoUpTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 15 minute)
        select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 1440 minute)
    </select>
    <select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
@@ -261,6 +260,11 @@
    <select id="selectTotalAmount" resultType="java.math.BigDecimal">
        select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
        where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
    </select>
    <select id="selectTotalAmountListByMemberId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info
        where member_id=#{memberId} and status in (2, 3, 4)
    </select>
    <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -379,6 +383,7 @@
        <result column="city" property="city" />
        <result column="township" property="township" />
        <result column="detail_address" property="detailAddress" />
        <result column="delivery_type" property="deliveryType" />
    </resultMap>
    <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
@@ -414,12 +419,13 @@
        select
        a.*,
        b.goods_name,
        b.sku_name,
        b.cnt,
        b.price,
        b.amount
        from mall_order_info a
        inner join mall_order_item b on a.id=b.order_id
        where a.del_flag=2 and  a.id = #{orderId} and a.take_unique_code = #{takeUniqueCode}
        where a.del_flag=2 and  a.id = #{orderId}
        order by a.created_time desc
    </select>
@@ -429,6 +435,7 @@
        SUM(cnt) goodsCnt
    from mall_order_item
    <where>
    1=1
        <if test="record.orderIdsStr != null">
            and order_id in
                <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">