From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml
index e008820..52b9f9f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml
@@ -278,6 +278,9 @@
LEFT JOIN `yeshi_ec_hongbao_v2` v2 ON ho.`ho_hongbao_id` = v2.`hb_id`
WHERE pr.`ucr_state` = 3 AND sp.`sc_type` = #{type}
AND TO_DAYS(v2.`hb_get_time`) = TO_DAYS(#{preDay})
+ <if test="source != null and source != ''">
+ AND c.`usc_source` = #{source}
+ </if>
</select>
<select id="countRebateMoneyByDay" resultType="BigDecimal">
@@ -289,6 +292,9 @@
SELECT COUNT(c.`usc_id`) FROM yeshi_ec_user_system_coupon c
LEFT JOIN yeshi_ec_system_coupon p ON p.`sc_id`= c.`usc_coupon_id`
WHERE p.`sc_type` = #{type} AND TO_DAYS(c.`usc_create_time`) = TO_DAYS(#{preDay})
+ <if test="source != null and source != ''">
+ AND c.`usc_source` = #{source}
+ </if>
</select>
--
Gitblit v1.8.0