From 02b38bb7c08d68fffc6af25e4ba00a456d96e94e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:22:54 +0800
Subject: [PATCH] modify
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 8481b15..56177d4 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -5,19 +5,29 @@
<select id="selectJhyOrderList" resultType="com.xzx.gc.order.vo.JhyOrderListVo">
select
a.id orderid
+ ,a.phone
,a.username
,CONCAT(a.area, a.address) address
,a.longitude
,a.latitude
,a.weight
+ ,a.status
,a.remark
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
+ ,c.username jhyName
+ ,c.mobile jhyPhone
from xzx_jhy_order a
inner join xzx_jhy_order_items b on a.id=b.order_id
+ left join xzx_jhy_info c on a.jhy_id=c.user_id
<where>
- <if test="record.status != 1">
- and jhy_id=#{record.userId}
+ <if test="record.type == 1">
+ and a.user_id=#{record.userId}
+ </if>
+ <if test="record.type == 2">
+ <if test="record.status != 1">
+ and a.jhy_id=#{record.userId}
+ </if>
</if>
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
--
Gitblit v1.9.1