Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-06-24 d375fe94715d15bfa748991df5d922106a477e5d

 gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml

@@ -4,13 +4,24 @@

    <select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
        SELECT
               *
               a.*,
               b.name name,
               b.mobile_phone phone,
               d.express_com expressCom,
               d.express_no expressNo,
        FROM
        xzx_score_order a
        left join xzx_user_info b where b.user_id = a.user_id
--         left join xzx_score_order_details c where c.order_id = a.id
        left join xzx_score_express_info d where d.order_id = a.id
        WHERE 1 = 1
        <if test="orderNo != null and orderNo != ''">
            and a.order_no like concat('%',#{orderNo},'%')
        </if>

        <if test="name != null and name != ''">
            and b.name like concat('%',#{name},'%')
        </if>
        <if test="status != null and status != ''">
            and a.status = #{status}
        </if>