From e068c9acf06cff7673fadfca686128f6d6d66e20 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 12 八月 2019 11:12:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
index 406539a..fb91377 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
@@ -65,7 +65,7 @@
FROM (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho
LEFT JOIN (
SELECT * FROM yeshi_ec_hongbao_v2 v2
- WHERE v2.`hb_uid`= ${uid} AND (v2.`hb_type` = 1 OR v2.`hb_type` = 2)
+ WHERE v2.`hb_uid`= ${uid} and v2.hb_state!=4 AND (v2.`hb_type` = 1 OR v2.`hb_type` = 2)
) hb ON hb.hb_id=ho.`ho_hongbao_id` <!-- 鑷喘璁㈠崟 -->
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
WHERE hb.hb_id IS NOT NULL
@@ -95,11 +95,11 @@
FROM (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho
LEFT JOIN (
SELECT * FROM yeshi_ec_hongbao_v2 v2
- WHERE v2.`hb_uid`= ${uid} AND v2.`hb_type` = 20
+ WHERE v2.`hb_uid`= ${uid} AND v2.`hb_type` = 20 and v2.hb_state!=4
) hb ON hb.hb_id=ho.`ho_hongbao_id` <!-- 鍒嗕韩璁㈠崟 -->
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
- WHERE hb.hb_id IS NOT NULL
+ WHERE hb.hb_id IS NOT NULL and hb.hb_state!=4
<if test="state != null">
AND co.`co_state` = ${state}
</if>
@@ -128,10 +128,10 @@
SELECT * FROM yeshi_ec_hongbao_v2 v2
WHERE v2.`hb_uid`= ${uid}
AND (v2.`hb_type` = 5 OR v2.`hb_type` = 6 OR v2.`hb_type` = 7
- OR v2.`hb_type` = 21 OR v2.`hb_type` = 22 )
+ OR v2.`hb_type` = 21 OR v2.`hb_type` = 22 ) and v2.hb_state!=4
) hbp ON hbp.hb_pid=ho.`ho_hongbao_id`
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
- WHERE hbp.hb_id IS NOT NULL
+ WHERE hbp.hb_id IS NOT NULL and hbp.hb_state!=4
<if test="state != null">
AND co.`co_state` = ${state}
</if>
--
Gitblit v1.8.0