From 4c31405418bdd063605f1e5821d99f85be02f23c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 19 七月 2019 15:54:12 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinOriginMapper.java |  196 +++++++++++++++++++++++++-----------------------
 1 files changed, 102 insertions(+), 94 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinOriginMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinOriginMapper.java
index f160916..7f8778f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinOriginMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinOriginMapper.java
@@ -1,95 +1,103 @@
-package com.yeshi.fanli.dao.mybatis.tlj;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
-
-public interface UserTaoLiJinOriginMapper extends BaseMapper<UserTaoLiJinOrigin> {
-
-	/**
-	 * 鏍规嵁鏃ユ湡绫诲瀷缁熻閲戦
-	 * @param uid
-	 * @param dateType 1浠婃棩 銆�2鏄ㄦ棩銆�3鏈湀銆�4涓婃湀
-	 * @return
-	 */
-	BigDecimal countMoneyByDate(@Param("uid")long uid, @Param("dateType")int dateType);
-	
-	
-	/**
-	 * 鏍规嵁鐢ㄦ埛銆佹潵婧愮粺璁�
-	 * @param uid
-	 * @param origin
-	 * @return
-	 */
-	long countByUidAndOrigin(@Param("uid")long uid, @Param("origin")String origin);
-	
-	/**
-	 * 鏍规嵁鐢ㄦ埛銆佹潵婧愮粺璁�
-	 * @param uid
-	 * @param origin
-	 * @return
-	 */
-	UserTaoLiJinOrigin getByUidAndOrigin(@Param("uid")long uid, @Param("origin")String origin);
-	
-	/**
-	 *  缁熻鏈湀绛夌骇绾㈠寘
-	 * @param uid
-	 * @param origin
-	 * @return
-	 */
-	long countRankByThisMonth(@Param("uid")long uid);
-	
-	
-	/**
-	 *  缁熻鏈湀绛夌骇绾㈠寘
-	 * @param uid
-	 * @param origin
-	 * @return
-	 */
-	UserTaoLiJinOrigin  getRankByThisMonth(@Param("uid")long uid, @Param("type")String type);
-	
-	
-	/**
-	 * 鏌ヨ杩囨湡鐨勭孩鍖�
-	 * @param date
-	 * @return
-	 */
-	List<UserTaoLiJinOrigin> getOverdueTaoLiJin(@Param("uid")long uid, @Param("date")Date date);
-	
-	/**
-	 * 鏌ヨ鍓╀綑娣樼ぜ閲�
-	 * @param uid
-	 * @return
-	 */
-	List<UserTaoLiJinOrigin> getSurplusLiJin(@Param("uid")long uid);
-	
-	
-	/**
-	 * 缁熻鐢ㄦ埛绾㈠寘璁板綍
-	 * @param uid
-	 * @return
-	 */
-	long countByUidAndType(@Param("uid")long uid, @Param("type")String type);
-	
-	
-	/**
-	 * 缁熻閲戦
-	 * @param rightsId
-	 * @param origin
-	 * @return
-	 */
-	BigDecimal countMoneyByOrigin(@Param("rightsId")String rightsId, @Param("origin")String origin);
-	
-	/**
-	 * 鏍规嵁娣樼ぜ閲慽d鏌ヨ
-	 * @param rightsId
-	 * @return
-	 */
-	UserTaoLiJinOrigin getOriginByRightsId(@Param("rightsId")String rightsId);
-	
+package com.yeshi.fanli.dao.mybatis.tlj;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
+
+public interface UserTaoLiJinOriginMapper extends BaseMapper<UserTaoLiJinOrigin> {
+
+	/**
+	 * 鏍规嵁鏃ユ湡绫诲瀷缁熻閲戦
+	 * @param uid
+	 * @param dateType 1浠婃棩 銆�2鏄ㄦ棩銆�3鏈湀銆�4涓婃湀
+	 * @return
+	 */
+	BigDecimal countMoneyByDate(@Param("uid")long uid, @Param("dateType")int dateType);
+	
+	
+	/**
+	 * 鏍规嵁鐢ㄦ埛銆佹潵婧愮粺璁�
+	 * @param uid
+	 * @param origin
+	 * @return
+	 */
+	long countByUidAndOrigin(@Param("uid")long uid, @Param("origin")String origin);
+	
+	/**
+	 * 鏍规嵁鐢ㄦ埛銆佹潵婧愮粺璁�
+	 * @param uid
+	 * @param origin
+	 * @return
+	 */
+	UserTaoLiJinOrigin getByUidAndOrigin(@Param("uid")long uid, @Param("origin")String origin);
+	
+	/**
+	 *  缁熻鏈湀绛夌骇绾㈠寘
+	 * @param uid
+	 * @param origin
+	 * @return
+	 */
+	long countRankByThisMonth(@Param("uid")long uid);
+	
+	
+	/**
+	 *  缁熻鏈湀绛夌骇绾㈠寘
+	 * @param uid
+	 * @param origin
+	 * @return
+	 */
+	UserTaoLiJinOrigin  getRankByThisMonth(@Param("uid")long uid, @Param("type")String type);
+	
+	
+	/**
+	 * 鏌ヨ杩囨湡鐨勭孩鍖� 鎺掗櫎绛夌骇
+	 * @param date
+	 * @return
+	 */
+	List<UserTaoLiJinOrigin> getOverdueTaoLiJin(@Param("uid")long uid, @Param("date")Date date);
+	
+	
+	/**
+	 * 鏌ヨ杩囨湡鐨勭孩鍖�-绛夌骇
+	 * @param date
+	 * @return
+	 */
+	List<UserTaoLiJinOrigin> getOverdueTaoLiJinByRank(@Param("uid")long uid, @Param("date")Date date);
+	
+	/**
+	 * 鏌ヨ鍓╀綑娣樼ぜ閲�
+	 * @param uid
+	 * @return
+	 */
+	List<UserTaoLiJinOrigin> getSurplusLiJin(@Param("uid")long uid);
+	
+	
+	/**
+	 * 缁熻鐢ㄦ埛绾㈠寘璁板綍
+	 * @param uid
+	 * @return
+	 */
+	long countByUidAndType(@Param("uid")long uid, @Param("type")String type);
+	
+	
+	/**
+	 * 缁熻閲戦
+	 * @param rightsId
+	 * @param origin
+	 * @return
+	 */
+	BigDecimal countMoneyByOrigin(@Param("rightsId")String rightsId, @Param("origin")String origin);
+	
+	/**
+	 * 鏍规嵁娣樼ぜ閲慽d鏌ヨ
+	 * @param rightsId
+	 * @return
+	 */
+	UserTaoLiJinOrigin getOriginByRightsId(@Param("rightsId")String rightsId);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0