From d1f64b7d4b316f58594999257bb9146f68a51355 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 18:25:04 +0800
Subject: [PATCH] modify

---
 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml |   10 ++++++++--
 1 files changed, 8 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..abb1a85 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -10,14 +10,20 @@
             ,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