From b72be3656e4a381a60ada768a58fa8523719b10d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 19:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralDetailMapper.xml | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralDetailMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralDetailMapper.xml
index 94bc260..cfa55c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralDetailMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralDetailMapper.xml
@@ -109,16 +109,12 @@
LEFT JOIN (SELECT DATE_FORMAT(d.`td_create_time`,'%Y-%m') AS `time`,SUM(d.`td_money`)AS money
FROM `yeshi_ec_integral_detail` d
WHERE d.`td_uid`=#{uid} AND d.`td_money`<![CDATA[>=]]>0 AND DATE_FORMAT(d.`td_create_time`,'%Y-%m')=#{item}
- <if test="type == 1">AND d.td_money <![CDATA[>]]> 0</if>
- <if test="type == 2">AND d.td_money <![CDATA[<]]> 0</if>
GROUP BY DATE_FORMAT(d.`td_create_time`,'%Y-%m')
) a ON a.time=c.time
LEFT JOIN(SELECT DATE_FORMAT(d.`td_create_time`,'%Y-%m') AS `time`,SUM(d.`td_money`) AS money
FROM `yeshi_ec_integral_detail` d
WHERE d.`td_uid`=#{uid} AND d.`td_money` <![CDATA[<]]>0 AND DATE_FORMAT(d.`td_create_time`,'%Y-%m')=#{item}
- <if test="type == 1">AND d.td_money <![CDATA[>]]> 0</if>
- <if test="type == 2">AND d.td_money <![CDATA[<]]> 0</if>
GROUP BY DATE_FORMAT(d.`td_create_time`,'%Y-%m')
) b ON c.time=b.time
</trim>
--
Gitblit v1.8.0