From 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:50:55 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 4768a0a..480e24e 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -82,6 +82,6 @@
 
     <select id="selectJhyOrderNoWaitAndCancel" resultType="com.xzx.gc.entity.JhyOrder">
         select * from xzx_jhy_order
-        where status not in (1, 5) and user_id=#{userId}
+        where status not in (1, 2, 5) and user_id=#{userId}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1