From d1b7fd85615a78a476650e5acfc8b165a5deb3aa Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:41:05 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index babaae4..93964aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -252,6 +252,10 @@
<!-- 鏁翠釜璁㈠崟澶辨晥 -->
AND co.co_state_whole_order = 3
</if>
+ <if test="orderState != null and orderState == 4">
+ <!-- 宸叉敹璐ц鍗� -->
+ AND co.co_state = 2
+ </if>
</sql>
<sql id="SELECT_PARAM_ORDER_CREATE_TIME">
<if test="startTime != null and startTime != '' ">AND <![CDATA[co.co_third_create_time >= #{startTime}]]>
--
Gitblit v1.8.0