wzy
2020-11-29 18ec469960104139455f8a3863e3c9e8fb1f32d2
Merge branch 'pilot' of https://gitee.com/chonggaoxiao/new_excoin into pilot
7 files modified
30 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java 1 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/TrcAddressDao.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/entity/TrcAddressEntity.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 8 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/resources/application.yml 9 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/member/SrcAddressDao.xml 6 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
@@ -72,6 +72,7 @@
                        TrcAddressEntity address = trcAddressDao.selectOneSrcAddressUnUse();
                        address.setMemberId(member.getId());
                        address.setIsUse(1);
                        address.setSystemFlag(1);
                        TRC20ApiUtils.createWallet(member.getId(), member.getInviteId(), "USDT", address.getAddress());
                        trcAddressDao.updateById(address);
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);
}
src/main/java/com/xcong/excoin/modules/coin/entity/TrcAddressEntity.java
@@ -21,4 +21,6 @@
    private int isUse;
    private Long memberId;
    private Integer systemFlag;
}
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);
src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
@@ -147,7 +147,7 @@
        homeSymbolsVo.setSymbol(symbol);
        homeSymbolsVo.setCurrentPrice(newestPrice);
        homeSymbolsVo.setUpOrDown(upOrDown);
        homeSymbolsVo.setVolume(symbolObject.getAmount());
        homeSymbolsVo.setVolume(symbolObject.getVolume());
        if (cnyUsdtExchange != null) {
            BigDecimal cnyPrice = newestPrice.multiply(cnyUsdtExchange.getValue()).setScale(2, BigDecimal.ROUND_HALF_UP);
            homeSymbolsVo.setCnyPrice(cnyPrice);
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:
src/main/resources/mapper/member/SrcAddressDao.xml
@@ -3,10 +3,14 @@
<mapper namespace="com.xcong.excoin.modules.coin.dao.TrcAddressDao">
    <select id="selectSrcAddressByMemberId" resultType="com.xcong.excoin.modules.coin.entity.TrcAddressEntity">
        select * from trc_address where member_id=#{memberId} and is_use=1
        select * from trc_address where member_id=#{memberId} and is_use=1 and system_flag = 1
    </select>
    <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>