From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
index 639f32c..3ceb70e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
@@ -16,7 +16,7 @@
<result column="adminId" property="adminId" jdbcType="BIGINT" />
<association property="userInfo" column="uid"
- select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey">
+ select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey">
</association>
<association property="system" column="sid"
@@ -416,4 +416,16 @@
AND FROM_UNIXTIME(t.extractTime/1000,'%Y-%m-%d') = #{day}
</select>
+
+ <select id="sumMoneyByUidAndState" resultType="java.math.BigDecimal">
+ SELECT IFNULL(SUM(t.`money`),0) FROM yeshi_ec_extract t
+ WHERE t.`uid` = #{uid}
+ <if test="stateList!=null">
+ <foreach collection="stateList" item="state" open="and (" close=")" separator=" or ">
+ `state`=#{state}
+ </foreach>
+ </if>
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0