Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

xiaoyong931011

2022-09-22 7cf7a80569d3cb907e0260abc3b2dbd36ec6c4c2

 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,6 +144,9 @@
        <result column="address_pic" property="addressPic" />
        <result column="address_area" property="addressArea" />
        <result column="province" property="province" />
        <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" />
        <result column="detail_address" property="detailAddress" />
@@ -150,38 +163,28 @@
            <result property="price" column="price" />
            <result property="amount" column="amount" />
            <result property="isNormal" column="is_normal" />
            <result property="state" column="state" />
        </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.cnt,
               b.price,
               b.amount,
               c.name leader_name,
               c.phone leader_phone,
               c.address_pic,
               c.address_area,
               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
        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
        <where>
            a.del_flag=2
            <if test="record.query != null and record.query != ''">
                and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
            <if test="record.memberId != null">
                and a.member_id=#{record.memberId}
            </if>
            <if test="record.status == 4 and record.status != 0">
                and a.status = 4
@@ -190,10 +193,10 @@
                and a.status = #{record.status}
            </if>
            <if test="record.status == 5">
                and a.status = 7
                and a.status = 7 or b.state in (2,3)
            </if>
            <if test="record.memberId != null">
                and a.member_id=#{record.memberId}
            <if test="record.query != null and record.query != ''">
                and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
            </if>
            <if test="record.orderType != null">
                and a.order_type=#{record.orderType}
@@ -213,6 +216,7 @@
            b.style_name,
            b.sku_name,
            b.sku_image,
            b.state,
            b.cnt,
            b.price,
            b.amount,
@@ -224,6 +228,8 @@
            c.province,
            c.city,
            c.township,
            c.longitude leaderLongitude,
            c.latitude leaderLatitude,
            c.detail_address
        from mall_order_info a
             inner join mall_order_item b on a.id=b.order_id
@@ -233,11 +239,12 @@

    <select id="selectMemberOrderStatusCnt" resultType="java.util.Map">
        select
            status,
            a.status,
            count(1) cnt
        from mall_order_info
        where del_flag=2 and member_id=#{memberId}
        group by status
        from mall_order_info a
                 inner join mall_team_leader c on a.take_unique_code=c.unique_code
        where a.del_flag=2 and a.member_id=#{memberId}
        group by a.status
    </select>

    <select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
@@ -324,7 +331,7 @@
    <update id="updateOrderConfirmStatus">
        update mall_order_info
        set status=4,
            receiving_time=new Date()
            receiving_time=#{updateTime}
        where status=3 and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
    </update>

@@ -354,4 +361,9 @@
        where del_flag = 2 and take_unique_code = #{uniqueCode}
        group by status
    </select>

    <select id="selectOrderByStatusAndPayTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info where status=#{status}
         and date_format(pay_time, '%Y-%m-%d') = date_format(#{paytime}, '%Y-%m-%d')
    </select>
</mapper>