Merge remote-tracking branch 'origin/div' into div

admin

2019-08-29 b72be3656e4a381a60ada768a58fa8523719b10d

 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>