From 37f0bbe5f120e083469b293779bbea1e106b97c2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 19 Nov 2020 16:55:13 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 8 +++++++-
src/main/resources/mapper/member/SrcAddressDao.xml | 4 ++++
src/main/java/com/xcong/excoin/modules/coin/dao/TrcAddressDao.java | 2 ++
src/main/resources/application.yml | 9 ++++++---
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/TrcAddressDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/TrcAddressDao.java
index c0d5a23..2580cb2 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/TrcAddressDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/TrcAddressDao.java
@@ -13,4 +13,6 @@
TrcAddressEntity selectSrcAddressByMemberId(@Param("memberId") Long memberId);
TrcAddressEntity selectOneSrcAddressUnUse();
+
+ TrcAddressEntity selectTrcAddressByAddress(@Param("address") String address);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index cc40335..9f54516 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -14,7 +14,9 @@
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
+import com.xcong.excoin.modules.coin.dao.TrcAddressDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
+import com.xcong.excoin.modules.coin.entity.TrcAddressEntity;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
@@ -109,6 +111,9 @@
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
+
+ @Resource
+ private TrcAddressDao trcAddressDao;
@Transactional()
@Override
@@ -950,7 +955,8 @@
columnMap.put("is_biyict", MemberCoinAddressEntity.IS_BIYICT_YES);
List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
TdCoinWallet tdCoinWallet = memberCoinAddressDao.selectTdCoinWalletByAddress(memberSubmitCoinApplyDto.getAddress(), CoinTypeEnum.USDT.name());
- if (CollUtil.isEmpty(selectByMap) && tdCoinWallet == null) {
+ TrcAddressEntity trcAddressEntity = trcAddressDao.selectTrcAddressByAddress(memberSubmitCoinApplyDto.getAddress());
+ if (CollUtil.isEmpty(selectByMap) && tdCoinWallet == null && trcAddressEntity == null) {
memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
} else {
memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c873d74..c687974 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,12 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://180.215.221.145:3306/db_pilot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: pilot
- password: pilot123!@#
+# url: jdbc:mysql://180.215.221.145:3306/db_pilot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+# username: pilot
+# password: pilot123!@#
+ url: jdbc:mysql://120.27.238.55:3306/pilot_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/src/main/resources/mapper/member/SrcAddressDao.xml b/src/main/resources/mapper/member/SrcAddressDao.xml
index b873023..3f68088 100644
--- a/src/main/resources/mapper/member/SrcAddressDao.xml
+++ b/src/main/resources/mapper/member/SrcAddressDao.xml
@@ -9,4 +9,8 @@
<select id="selectOneSrcAddressUnUse" resultType="com.xcong.excoin.modules.coin.entity.TrcAddressEntity">
select * from trc_address where is_use=2 limit 1
</select>
+
+ <select id="selectTrcAddressByAddress" resultType="com.xcong.excoin.modules.coin.entity.TrcAddressEntity">
+ select * from trc_address where address = #{address} and is_use = 1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1