From d6c8cce305427ba64005d4e349e169446e0d1801 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 09:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 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 3f047b7..864000c 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
@@ -621,10 +621,8 @@
yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id` WHERE hb.hb_id
IS NOT NULL
<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
- <if test="day != null and day == 4">
- AND co.`co_state` = 2
- <!-- 涓婃湀 :缁熻宸叉敹璐� -->
- </if>
+ <if test="day != null and day == 4">AND co.`co_state` = 2</if> <!-- 涓婃湀 :缁熻宸叉敹璐� -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
<sql id="SELECT_HONGBAO_STATE">
--
Gitblit v1.8.0