From d6b6e87b3f77cd0abefb439abe97feef23efb2e7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:30:46 +0800
Subject: [PATCH] modify
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 11 +++++++++--
1 files changed, 9 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..f9a450d 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -5,19 +5,26 @@
<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
from xzx_jhy_order a
inner join xzx_jhy_order_items b on a.id=b.order_id
<where>
- <if test="record.status != 1">
- and jhy_id=#{record.userId}
+ <if test="record.type == 1">
+ and user_id=#{record.userId}
+ </if>
+ <if test="record.type == 2">
+ <if test="record.status != 1">
+ and jhy_id=#{record.userId}
+ </if>
</if>
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
--
Gitblit v1.9.1