From 217970e78188737cb560fd364a3ef2969687271f Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 22 Sep 2022 17:40:13 +0800 Subject: [PATCH] 20220902 --- src/main/resources/mapper/modules/MallTeamLeaderMapper.xml | 64 ++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml index f95435a..816713b 100644 --- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml +++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml @@ -74,6 +74,7 @@ <result column="comment_state" property="commentState" /> <result column="delivery_state" property="deliveryState" /> <result column="carriage" property="carriage" /> + <result column="take_code" property="takeCode" /> <result column="remark" property="remark" /> <result column="del_flag" property="delFlag" /> <result column="is_home" property="isHome" /> @@ -144,6 +145,69 @@ order by a.created_time desc </select> + <resultMap id="NewOrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo"> + <id column="id" property="id" /> + <result column="order_no" property="orderNo" /> + <result column="member_id" property="memberId" /> + <result column="order_time" property="orderTime" /> + <result column="pay_time" property="payTime" /> + <result column="amount" property="amount" /> + <result column="pay_method" property="payMethod" /> + <result column="pay_order_no" property="payOrderNo" /> + <result column="pay_result" property="payResult" /> + <result column="status" property="status" /> + <result column="cancel_type" property="cancelType" /> + <result column="name" property="name" /> + <result column="phone" property="phone" /> + <result column="address" property="address" /> + <result column="longitude" property="longitude" /> + <result column="latitude" property="latitude" /> + <result column="order_type" property="orderType" /> + <result column="comment_state" property="commentState" /> + <result column="delivery_state" property="deliveryState" /> + <result column="carriage" property="carriage" /> + <result column="take_code" property="takeCode" /> + <result column="remark" property="remark" /> + <result column="del_flag" property="delFlag" /> + <result column="is_home" property="isHome" /> + </resultMap> + + <select id="selectNewApiLeaderOrderListInPage" resultMap="NewOrderInfoMap"> + select + a.* + from mall_order_info a + inner join mall_member c on a.take_unique_code=c.invite_id + <where> + c.id=#{record.memberId} + <if test="record.status == 4 and record.status != 0"> + and a.status = 4 + </if> + <if test="record.status != 4 and record.status != 1 and record.status != 0 and record.status != 5"> + and a.status = #{record.status} + </if> + <if test="record.status == 5"> + and (a.status = 6 or b.state = 2) + </if> + <if test="record.status == 1"> + and a.status = 2 + </if> + <if test="record.status == 0"> + and a.status in (2,3,4) + </if> + <if test="record.query != null and record.query != ''"> + and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%')) + or a.phone like CONCAT('%', CONCAT(#{record.query}, '%')) + or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%')) + ) + </if> + <if test="record.orderType != null"> + and a.order_type=#{record.orderType} + </if> + and a.delivery_type = 1 + </where> + order by a.created_time desc + </select> + <select id="getMallTeamLeaderList" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader"> select a.* -- Gitblit v1.9.1