From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情

---
 fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml
index 07aaa6c..d47d404 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml
@@ -17,6 +17,8 @@
 		<result column="umd_beizhu" property="beiZhu" jdbcType="VARCHAR" />
 		<result column="umd_createtime" property="createTime" jdbcType="TIMESTAMP" />
 		<result column="umd_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
+		<!-- 鑰佺増鏄庣粏閫傜敤璇ュ瓧娈�  -->
+		<result column="state" property="state" jdbcType="INTEGER" />
 		<association property="userInfo" column="umd_uid"
 			javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
 			<id column="umd_uid" property="id" jdbcType="BIGINT" />
@@ -91,19 +93,24 @@
 	</select>
 
 	<select id="selectMonthMoneyByUid" resultMap="UserMonthMoneyMap">
-		<foreach collection="dateFormat" index="index" item="item"  separator="UNION ALL"  >
-			<trim prefix="(" suffix=")" >
+		<foreach collection="dateFormat" index="index" item="item"
+			separator="UNION ALL">
+			<trim prefix="(" suffix=")">
 				SELECT
-				a.time as dateFormate , if(a.money is null,0,a.money) as income ,if(b.money is null,0,b.money) as expend
+				a.time as dateFormate , if(a.money is null,0,a.money) as
+				income ,if(b.money is null,0,b.money) as expend
 				FROM
 				(
-				SELECT DATE_FORMAT(
+				SELECT
+				DATE_FORMAT(
 				d.`umd_createtime`,'%Y-%m') AS
-				`time`,SUM(d.`umd_money`) AS money
+				`time`,SUM(d.`umd_money`)
+				AS money
 				FROM
 				`yeshi_ec_user_money_detail`
 				d
-				WHERE d.`umd_uid`=#{uid} AND
+				WHERE d.`umd_uid`=#{uid}
+				AND
 				d.`umd_money`>=0 AND DATE_FORMAT(
 				d.`umd_createtime`,'%Y-%m')=#{item} GROUP BY DATE_FORMAT(
 				d.`umd_createtime`,'%Y-%m')
@@ -127,6 +134,71 @@
 	</select>
 
 
+	<select id="selectByUidWithState" resultMap="BaseResultMap">
+		SELECT a.* FROM
+		((SELECT d.*,-1 AS state FROM
+		`yeshi_ec_user_money_detail` d
+		WHERE
+		d.`umd_uid`=#{uid} AND (d.`umd_type`!='extract' AND
+		d.`umd_type`!='extractReject')
+		)
+		UNION ALL(
+		SELECT d.*,-1 AS
+		state
+		FROM
+		`yeshi_ec_user_money_detail` d LEFT JOIN
+		`yeshi_ec_extract` e
+		ON
+		e.`id`=d.umd_source_identify_id WHERE d.`umd_uid`=#{uid} AND
+		d.umd_type='extractReject'
+		)
+		UNION ALL(
+		SELECT
+		d.*,e.state FROM
+		`yeshi_ec_user_money_detail` d LEFT JOIN
+		`yeshi_ec_extract` e ON
+		e.`id`=d.`umd_source_identify_id` WHERE d.`umd_uid`=#{uid} AND
+		d.umd_type='extract'
+		)) a ORDER BY a.umd_createtime DESC LIMIT
+		#{start},#{count}
+
+	</select>
+
+
+	<select id="selectCountByUidWithState" resultType="java.lang.Long">
+		SELECT
+		count(*) FROM
+		((SELECT d.*,-1 AS state FROM
+		`yeshi_ec_user_money_detail` d
+		WHERE
+		d.`umd_uid`=#{uid} AND
+		(d.`umd_type`!='extract' AND d.`umd_type`!='extractReject')
+		)
+		UNION ALL(
+		SELECT d.*,-1 AS
+		state
+		FROM `yeshi_ec_user_money_detail` d LEFT JOIN
+		`yeshi_ec_extract` e
+		ON
+		e.`id`=d.umd_source_identify_id WHERE
+		d.`umd_uid`=#{uid} AND
+		d.umd_type='extractReject'
+		)
+		UNION ALL(
+		SELECT
+		d.*,e.state FROM `yeshi_ec_user_money_detail` d LEFT JOIN
+		`yeshi_ec_extract` e ON e.`id`=d.`umd_source_identify_id` WHERE
+		d.`umd_uid`=#{uid} AND
+		d.umd_type='extract'
+		)) a
+
+	</select>
+
+
+
+
+
+
 
 
 

--
Gitblit v1.8.0