From 440e1250dd4f265eb18493d32b458689d7b2bc7a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Jun 2020 16:06:09 +0800
Subject: [PATCH] 20200609   代码提交

---
 src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java |    6 +++---
 src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java            |    2 +-
 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml                 |   38 +++++++++++++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java
index 5de8d84..0eeda45 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java
@@ -21,12 +21,12 @@
 	List<MemberAccountMoneyChange> selectWalletAgentIntoRecordsByMemIdTypeSymbol(@Param("memberId")Long memberId);
 
 	IPage<MemberAccountMoneyChange> selectWalletCoinRecordsInPage(Page<OrderCoinsDealEntity> page,
-			MemberAccountMoneyChange memberAccountMoneyChange);
+			@Param("record") MemberAccountMoneyChange memberAccountMoneyChange);
 
 	IPage<MemberAccountMoneyChange> selectWalletContractRecordsInPage(Page<OrderCoinsDealEntity> page,
-			MemberAccountMoneyChange memberAccountMoneyChange);
+			@Param("record") MemberAccountMoneyChange memberAccountMoneyChange);
 	
 	IPage<MemberAccountMoneyChange> selectWalletAgentRecordsInPage(Page<OrderCoinsDealEntity> page,
-			MemberAccountMoneyChange memberAccountMoneyChange);
+			@Param("record") MemberAccountMoneyChange memberAccountMoneyChange);
 
 }
diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java
index d3719c3..ab900b8 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java
@@ -19,7 +19,7 @@
 	OrderCoinsDealEntity selectWalletCoinOrder(@Param("memberId")Long memberId,@Param("orderId")Long orderId);
 
 	IPage<OrderCoinsDealEntity> findAllWalletCoinOrderInPage(Page<OrderCoinsDealEntity> page,
-			OrderCoinsDealEntity orderCoinsDealEntity);
+			@Param("record") OrderCoinsDealEntity orderCoinsDealEntity);
 
 	
 }
diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index 2f8f323..aeb75cc 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -19,16 +19,40 @@
 	</select>
 	
 	<select id="selectWalletCoinRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
-		select * from member_account_money_change where type = 1 and member_id = #{memberId} order by id desc
-	</select>
+		select * from member_account_money_change
+		<if test="record != null">
+            <where>
+            	type = 1
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        order by id desc
+    </select>
 	
 	<select id="selectWalletContractRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
-		select * from member_account_money_change where type = 2 and member_id = #{memberId}  order by id desc
-	</select>
+		select * from member_account_money_change <if test="record != null">
+            <where>
+            	type = 2
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        order by id desc
+    </select>
 
 	<select id="selectWalletAgentRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
-		select * from member_account_money_change where type = 3 and member_id = #{memberId}  order by id desc
-	</select>
-
+		select * from member_account_money_change <if test="record != null">
+            <where>
+            	type = 3
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        order by id desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1