From 87cd3ee733c4658880de4ea4888d8414beb6dff4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Dec 2022 16:04:49 +0800
Subject: [PATCH] 20221213转币
---
src/main/resources/mapper/dapp/DappFundFlowDao.xml | 8 +++++---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/mapper/DappFundFlowDao.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
index 6d3a4a1..7ef1a14 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -109,7 +109,7 @@
//投注人是否加入
DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(dappMemberEntity.getId(), DappSystemProfit.STATE_IN);
if(ObjectUtil.isNotEmpty(dappSystemProfit)){
- List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListBySystemProfitIdAndState(dappSystemProfit.getId(),DappFundFlowEntity.WITHDRAW_STATUS_ING);
+ List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByState(DappFundFlowEntity.WITHDRAW_STATUS_ING);
if(CollUtil.isNotEmpty(dappFundFlowEntities)){
for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappFundFlowDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappFundFlowDao.java
index 3f73b6c..fd9888a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappFundFlowDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappFundFlowDao.java
@@ -37,5 +37,5 @@
DappFundFlowEntity selectBymemberIdAndType(@Param("memberId")Long id, @Param("type")int type);
- List<DappFundFlowEntity> selectListBySystemProfitIdAndState(@Param("systemProfitId")Long id, @Param("status")int status);
+ List<DappFundFlowEntity> selectListByState(@Param("status")int status);
}
diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 92574b1..17b12ed 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -120,10 +120,12 @@
and type = #{type}
</select>
- <select id="selectListBySystemProfitIdAndState" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+ <select id="selectListByState" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
select *
from dapp_fund_flow
- where system_profit_id = #{systemProfitId}
- and status = #{status}
+ where status = #{status}
+ and version = 1
+ and type != 1
+ and type != 6
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1