fix

Helius

2022-09-22 ad22a1e5595b76436d005ba9f1f928ea094fe5c0

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

@@ -65,7 +65,8 @@
        select a.*,
               b.name memberName,
               b.bind_phone memberBindPhone,
               b.phone memberPhone
               b.phone memberPhone,
               c.name leaderName
        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
@@ -84,6 +85,9 @@
                <if test="record.deliveryType != null and record.deliveryType != ''">
                    and a.delivery_type = #{record.deliveryType}
                </if>
                <if test="record.isHome != null and record.isHome != ''">
                    and a.is_home = #{record.isHome}
                </if>
                <if test="record.orderNo != null and record.orderNo != ''">
                    and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
                </if>
@@ -92,6 +96,12 @@
                </if>
                <if test="record.uniqueCode != null and record.uniqueCode != ''">
                    and a.take_unique_code = #{record.uniqueCode}
                </if>
                <if test="record.startTime != null and record.startTime != ''">
                    and a.order_time &gt;= #{record.startTime}
                </if>
                <if test="record.endTime != null and record.endTime != ''">
                    and a.order_time &lt;= #{record.endTime}
                </if>
            </if>
        </where>
@@ -134,8 +144,8 @@
        <result column="address_pic" property="addressPic" />
        <result column="address_area" property="addressArea" />
        <result column="province" property="province" />
        <result column="longitude" property="leaderLongitude" />
        <result column="latitude" property="leaderLatitude" />
        <result column="leaderLongitude" property="leaderLongitude" />
        <result column="leaderLatitude" property="leaderLatitude" />
        <result column="province" property="province" />
        <result column="city" property="city" />
        <result column="township" property="township" />
@@ -157,29 +167,29 @@
        </collection>
    </resultMap>

    <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
    <select id="selectApiOrderListInPage" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select
               a.*,
               b.id item_id,
               b.order_id,
               b.goods_id,
               b.sku_id,
               b.goods_name,
               b.style_name,
               b.sku_name,
               b.sku_image,
               b.state,
               b.cnt,
               b.price,
               b.amount,
               c.name leader_name,
               c.phone leader_phone,
               c.address_pic,
               c.address_area,
--                b.id item_id,
--                b.order_id,
--                b.goods_id,
--                b.sku_id,
--                b.goods_name,
--                b.style_name,
--                b.sku_name,
--                b.sku_image,
--                b.state,
--                b.cnt,
--                b.price,
--                b.amount,
               c.name leaderName,
               c.phone leaderPhone,
               c.address_pic addressPic,
               c.address_area addressArea,
               c.province,
               c.city,
               c.township,
               c.detail_address
               c.detail_address detailAddress
        from mall_order_info a
         inner join mall_order_item b on a.id=b.order_id
         inner join mall_team_leader c on a.take_unique_code=c.unique_code