From 5a02b62b3b2b3663b89a1fb8be0c3f6ac1eb1d3f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Jun 2021 17:54:48 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 6d45814..d0c4f51 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -4,12 +4,23 @@
<select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime,
+ b.nick_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 on b.user_id = a.user_id
+ left join xzx_score_express_info d on 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.nick_name like concat('%',#{name},'%')
</if>
<if test="status != null and status != ''">
and a.status = #{status}
@@ -19,9 +30,56 @@
</if>
<if test="createdTimeEnd != null">
- and a.CREATED_TIME >= #{createdTimeEnd}
+ and a.CREATED_TIME <= #{createdTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
+ <select id="selectXcxOrderList" resultType="com.xzx.gc.shop.vo.XcxOrderListVo">
+ select
+ a.*,
+ b.unit_price,
+ b.sku,
+ b.style,
+ b.thumb
+ from xzx_score_order a
+ inner join xzx_score_order_details b on a.id=b.order_id
+ <where>
+ a.user_id=#{record.userId}
+ <if test="record.status == 1">
+ and a.status in (1, 2, 3)
+ </if>
+ <if test="record.status == 2">
+ and a.status = 4
+ </if>
+ <if test="record.status == 3">
+ and a.status = 6
+ </if>
+ </where>
+ order by a.created_time desc
+ </select>
+
+ <select id="selectXcxOrderDetails" resultType="com.xzx.gc.shop.vo.XcxOrderDetailsVo">
+ select
+ a.*
+ ,b.style
+ ,b.sku
+ ,b.thumb
+ ,b.unit_price
+ ,c.address
+ ,c.phone
+ ,c.username
+ ,c.express_com expressCompany
+ ,c.express_no
+ from xzx_score_order a
+ inner join xzx_score_order_details b on a.id=b.order_id
+ inner join xzx_score_express_info c on a.id=c.order_id
+ where a.id=#{id}
+ </select>
+
+ <update id="updateOrderStatus">
+ update xzx_score_order
+ set status=#{status}
+ where id=#{id} and user_id=#{userId}
+ </update>
</mapper>
--
Gitblit v1.9.1