fix

Helius

2021-11-10 c4d8357ad30bb39968279957d1fb594ef8dfdf5f

 gc-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -42,6 +42,8 @@
        <result column="order_fast_flag"  property="orderFastFlag"/>
        <result column="home_appliance_id"  property="homeApplianceId"/>
        <result column="change_receiver_flag"  property="changeReceiverFlag"/>
        <result column="unit_name"  property="unitName"/>
        <result column="house_number"  property="houseNumber"/>
    </resultMap>

    <resultMap id="StorageInfoMap" type="com.xzx.gc.model.order.OrderStorageVo">
@@ -147,6 +149,8 @@
        a.cancel_user_id,
        a.address_area,
        a.rela_name,
        a.unit_name,
        a.house_number,
        a.order_second_status,
        a.create_type,
        a.store_id,
@@ -1525,6 +1529,37 @@

    <select id="selectOrderNoWaitAndCancel" resultType="com.xzx.gc.entity.OrderInfo">
        select * from xzx_order_info
        where order_status not in ('1', '6') and create_user_id=#{userId}
        where order_status not in ('1', '2', '6') and create_user_id=#{userId}
    </select>

    <select id="selectInviteUserOrderList" resultType="com.xzx.gc.order.vo.InviteUserOrderVo">
        select
            a.order_id orderNo,
            a.username,
            a.mobile_phone phone,
            a.rela_name orderName,
            a.rela_phone orderPhone,
            a.reserve_time time,
            a.address,
            a.order_status status,
            group_concat(a.title) recycleType,
            sum(a.money) coin
        from (
           select c.order_id, b.mobile_phone, from_base64(b.nick_name) username, c.order_status, c.reserve_time, c.rela_name, c.rela_phone, concat(address_area, address, house_name, house_number, unit_name) address, d.money, e.title
           from xzx_user_share_info a
                inner join xzx_user_info b on a.register_mobile_phone=b.mobile_phone
                inner join xzx_order_info c on b.user_id=c.create_user_id
                left join xzx_order_item_info d on c.order_id=d.order_id and d.weight!='0.0'
                left join xzx_sys_environmental_info e on d.item_type=e.item_type
           where a.mobile_phone=#{record.phone}
           group by c.order_id,c.create_time, d.item_type
           order by c.create_time desc
           ) a
        group by a.order_id
    </select>

    <select id="selectOrderWithWaitAndIng" resultType="com.xzx.gc.entity.OrderInfo">
        select * from xzx_order_info
        where order_status in ('1', '2') and create_user_id=#{userId}
    </select>
</mapper>