From 7da58964755c5c97fb1bd1f31a11827ff698fa2b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Dec 2021 16:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

---
 src/main/java/cc/mrbird/febs/blockchain/job/PoolJob.java                    |   41 +
 src/main/java/cc/mrbird/febs/blockchain/model/EthUsdtChargeDto.java         |   31 +
 src/main/java/cc/mrbird/febs/pay/controller/PayController.java              |   11 
 src/main/resources/mapper/blockchain/MemberCoinAddressDao.xml               |  108 ++++
 src/main/java/cc/mrbird/febs/common/configure/RabbitMqConfig.java           |   92 +++
 src/main/java/cc/mrbird/febs/blockchain/service/TransformUtil.java          |  215 ++++++++
 src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java        |   84 +++
 src/main/java/cc/mrbird/febs/blockchain/mapper/MemberCoinAddressDao.java    |   29 +
 src/main/java/cc/mrbird/febs/blockchain/entity/MemberCoinAddressEntity.java |   55 ++
 src/main/resources/application-prod.yml                                     |   13 
 src/main/java/cc/mrbird/febs/pay/service/IPayService.java                   |    2 
 src/main/resources/application-test.yml                                     |   13 
 pom.xml                                                                     |   36 +
 src/main/java/cc/mrbird/febs/blockchain/enumerates/CoinTypeEnum.java        |   10 
 src/main/java/cc/mrbird/febs/blockchain/job/BlockCoinUpdateJob.java         |   76 +++
 src/main/java/cc/mrbird/febs/video/controller/ApiVideoController.java       |    2 
 src/main/java/cc/mrbird/febs/rabbit/producer/UsdtUpdateProducer.java        |   52 ++
 src/main/java/cc/mrbird/febs/blockchain/service/Trc20Service.java           |  105 ++++
 src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsData.java    |   29 +
 src/main/java/cc/mrbird/febs/blockchain/service/TrxUsdtUpdateService.java   |  377 +++++++++++++++
 src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java           |   36 +
 src/main/resources/application-dev.yml                                      |   13 
 src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsResult.java  |   12 
 src/main/java/cc/mrbird/febs/common/configure/ScheduleConfig.java           |   17 
 24 files changed, 1,449 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 896a51a..34ed72e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,6 +235,42 @@
             <artifactId>IJPay-AliPay</artifactId>
             <version>${ijapy.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>abi</artifactId>
+            <version>0.3.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/abi-0.3.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>utils</artifactId>
+            <version>0.3.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/utils-0.3.0.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>core</artifactId>
+            <version>0.3.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/core-0.3.0.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sunlight</groupId>
+            <artifactId>tron-sdk</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/tron-sdk-1.0.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/cc/mrbird/febs/blockchain/entity/MemberCoinAddressEntity.java b/src/main/java/cc/mrbird/febs/blockchain/entity/MemberCoinAddressEntity.java
new file mode 100644
index 0000000..bb0a3a7
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/entity/MemberCoinAddressEntity.java
@@ -0,0 +1,55 @@
+package cc.mrbird.febs.blockchain.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 会员币地址
+ * @author Administrator
+ *
+ */
+@Data
+@TableName("member_coin_address")
+public class MemberCoinAddressEntity extends BaseEntity {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	/**
+     * 会员ID
+     */
+    private Long memberId;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 私钥
+     */
+    private String privateKey;
+    /**
+     * 币种
+     */
+    private String symbol;
+    /**
+     * 是否是本平台地址1:是  0:否
+     */
+    private String isBiyict;
+    public static final String IS_BIYICT_YES = "1";
+    public static final String IS_BIYICT_NO = "2";
+    /**
+     * 
+     */
+    private String label;
+    /**
+     * 
+     */
+    private String tag;
+    /**
+     * 币种ID
+     */
+    private Long symbolscoinId;
+    
+
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/enumerates/CoinTypeEnum.java b/src/main/java/cc/mrbird/febs/blockchain/enumerates/CoinTypeEnum.java
new file mode 100644
index 0000000..662cca2
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/enumerates/CoinTypeEnum.java
@@ -0,0 +1,10 @@
+package cc.mrbird.febs.blockchain.enumerates;
+
+/**
+ * 币种枚举数据
+ *
+ * @author wzy
+ */
+public enum CoinTypeEnum {
+    USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC, XCC
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/job/BlockCoinUpdateJob.java b/src/main/java/cc/mrbird/febs/blockchain/job/BlockCoinUpdateJob.java
new file mode 100644
index 0000000..5d39878
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/job/BlockCoinUpdateJob.java
@@ -0,0 +1,76 @@
+package cc.mrbird.febs.blockchain.job;
+
+import cc.mrbird.febs.blockchain.service.TrxUsdtUpdateService;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.rabbit.producer.UsdtUpdateProducer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * 链上币种同步任务
+ *
+ * @author wzy
+ * @date 2020-07-02
+ **/
+@Component
+@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+public class BlockCoinUpdateJob {
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private TrxUsdtUpdateService trxUsdtUpdateService;
+
+    @Autowired
+    private UsdtUpdateProducer usdtUpdateProducer;
+
+
+    public static ConcurrentLinkedQueue<Long> TRC_BLOCK = new ConcurrentLinkedQueue<>();
+
+    /**
+     * TRC20_USDT 同步
+     */
+    @Scheduled(cron = "0/2 * * * * ? ")
+    public void usdtTc20Update() {
+        // 波场3秒出一个块
+        Long blocnNum = TRC_BLOCK.poll();
+        if (blocnNum == null) {
+            return;
+        }
+        usdtUpdateProducer.sendTrc20BlockMsg(blocnNum.toString());
+        redisUtils.set("USDT_TRC20_CURRENT_BLOCK_NUM", blocnNum);
+    }
+
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    public void usdtTc20UpdateQueue() {
+        // 查询最新区块号
+        long getnowblock = trxUsdtUpdateService.getnowblockFromTronScan() - 25;
+        // 拿到redis里最新区块
+        Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
+        if (trc20BlockNum == null) {
+            // 没有则取最新的块
+            trc20BlockNum = getnowblock;
+            redisUtils.set("USDT_TRC20_BLOCK_NUM", getnowblock);
+        }
+        Long blockNum = Long.valueOf(trc20BlockNum.toString());
+        if (getnowblock <= blockNum) {
+            // 如果当前区块比最新已确认区块还大,则不继续执行
+            return;
+        }
+        // 得到最新区块和当前区块的差值
+        Long diff = getnowblock-blockNum;
+        for(long i=1;i<=diff;i++){
+            blockNum++;
+            TRC_BLOCK.add(blockNum);
+        }
+        // 将最新的最大区块放入redis
+        redisUtils.set("USDT_TRC20_BLOCK_NUM", blockNum);
+    }
+
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/job/PoolJob.java b/src/main/java/cc/mrbird/febs/blockchain/job/PoolJob.java
new file mode 100644
index 0000000..914c772
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/job/PoolJob.java
@@ -0,0 +1,41 @@
+package cc.mrbird.febs.blockchain.job;
+
+import cc.mrbird.febs.blockchain.service.TrxUsdtUpdateService;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author wzy
+ * @date 2021-12-17
+ **/
+@Slf4j
+@Component
+@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+public class PoolJob {
+
+    @Resource
+    private RedisUtils redisUtils;
+    @Resource
+    private TrxUsdtUpdateService trxUsdtUpdateService;
+
+    /**
+     *  归集TRC20
+     */
+    @Scheduled(cron = "0 1/5 * * * ? ")
+    public void poolUsdtTrc20() {
+        Object trc20_pool = redisUtils.get("TRC20_POOL");
+        if(trc20_pool==null){
+            return;
+        }
+        List<String> list = (List)trc20_pool;
+        for(String address: list){
+            trxUsdtUpdateService.poolByAddress(address);
+        }
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/mapper/MemberCoinAddressDao.java b/src/main/java/cc/mrbird/febs/blockchain/mapper/MemberCoinAddressDao.java
new file mode 100644
index 0000000..8cc139a
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/mapper/MemberCoinAddressDao.java
@@ -0,0 +1,29 @@
+package cc.mrbird.febs.blockchain.mapper;
+
+import cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MemberCoinAddressDao extends BaseMapper<MemberCoinAddressEntity> {
+
+    MemberCoinAddressEntity selectAddressByMemberIdAndSymbol(Long memberId, String symbol);
+
+    MemberCoinAddressEntity selectBlockAddressWithTag(@Param("memberId") Long memberId, @Param("symbol") String symbol, @Param("tag") String tag);
+
+    MemberCoinAddressEntity selectBlockAddress(@Param("memberId") Long memberId, @Param("symbol") String symbol);
+
+    MemberCoinAddressEntity selectCoinAddressByAddressAndSymbol(@Param("address") String address, @Param("symbol") String symbol);
+
+    List<MemberCoinAddressEntity> selectCoinAddressListByMap(@Param("symbol") String symbol, @Param("memberId") Long memberId);
+
+    List<MemberCoinAddressEntity> selectAllBlockAddressBySymbolAndTag(@Param("symbol") String symbol, @Param("tag") String tag);
+
+    List<MemberCoinAddressEntity> selectAllBlockAddressBySymbol(@Param("symbol") String symbol);
+
+    List<String> selectAllSymbolAddress(@Param("symbol")String symbol,@Param("tag") String tag);
+
+    MemberCoinAddressEntity selectCoinAddressByAddressAndSymbolTag(@Param("address") String address, @Param("symbol") String symbol,@Param("tag") String tag);
+
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/model/EthUsdtChargeDto.java b/src/main/java/cc/mrbird/febs/blockchain/model/EthUsdtChargeDto.java
new file mode 100644
index 0000000..f8265da
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/model/EthUsdtChargeDto.java
@@ -0,0 +1,31 @@
+package cc.mrbird.febs.blockchain.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *  充值扫块dto
+ */
+@Data
+public class EthUsdtChargeDto {
+
+    private String address;
+    private String hash;
+    private BigDecimal balance;
+    private String symbol;
+
+    public interface Symbol{
+        String USDT_ERC20 = "USDT_ERC20";
+        String USDT_TRC20 = "USDT_TRC20";
+    }
+
+    public EthUsdtChargeDto() {
+    }
+
+    public EthUsdtChargeDto(String address, String hash, BigDecimal balance) {
+        this.address = address;
+        this.hash = hash;
+        this.balance = balance;
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsData.java b/src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsData.java
new file mode 100644
index 0000000..3697ac7
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsData.java
@@ -0,0 +1,29 @@
+package cc.mrbird.febs.blockchain.model;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class Trc20TransactionsData {
+    //  "from":"TM1zzNDZD2DPASbKcgdVoTYhfmYgtfwx9R",
+    private String from;
+    //            "to":"TPSPfAZ8UG9WiXDNX6SbYHNpX46oLV6xAs",
+    private String to;
+    //            "block_timestamp":1599234837000,
+    private Long block_timestamp;
+    //            "value":"10000000",
+    private String value;
+    //            "type":"Transfer",
+    private String type;
+    //            "transaction_id":"b1ea5fd1e1ddde4d60656bd77061b28d7dd209e5890e237a95cd49dd182405f1",
+    private String transaction_id;
+
+    private Map<String,Object> token_info;
+    //            "token_info":{
+    //                "name":"Tether USD",
+    //                "symbol":"USDT",
+    //                "decimals":6,
+    //                "address":"TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
+    //            }
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsResult.java b/src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsResult.java
new file mode 100644
index 0000000..201175f
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/model/Trc20TransactionsResult.java
@@ -0,0 +1,12 @@
+package cc.mrbird.febs.blockchain.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Trc20TransactionsResult {
+
+    private boolean success;
+    private List<Trc20TransactionsData> data;
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/service/TransformUtil.java b/src/main/java/cc/mrbird/febs/blockchain/service/TransformUtil.java
new file mode 100644
index 0000000..69b91a4
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/service/TransformUtil.java
@@ -0,0 +1,215 @@
+package cc.mrbird.febs.blockchain.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Auther: little liu
+ * @Date: 2020/09/03/16:03
+ * @Description:
+ */
+public class TransformUtil {
+
+
+    /**
+     * 长度不够前面补0
+     *
+     * @param str
+     * @param strLength
+     * @return
+     */
+    public static String addZeroForNum(String str, int strLength) {
+        int strLen = str.length();
+        if (strLen < strLength) {
+            while (strLen < strLength) {
+                StringBuffer sb = new StringBuffer();
+                sb.append("0").append(str);// 左补0
+                // sb.append(str).append("0");//右补0
+                str = sb.toString();
+                strLen = str.length();
+            }
+        }
+        return str;
+    }
+
+    public static String delZeroForNum(String str) {
+        return str.replaceAll("^(0+)", "");
+    }
+
+    public static String getSeqNumByLong(Long l, int bitCount) {
+        return String.format("%0" + bitCount + "d", l);
+    }
+
+
+    /**
+     * 字符串转换为16进制字符串
+     *
+     * @param s
+     * @return
+     */
+    public static String stringToHexString(String s) {
+        String str = "";
+        for (int i = 0; i < s.length(); i++) {
+            int ch = s.charAt(i);
+            String s4 = Integer.toHexString(ch);
+            str = str + s4;
+        }
+        return str;
+    }
+
+    /**
+     * 16进制字符串转换为字符串
+     *
+     * @param s
+     * @return
+     */
+    public static String hexStringToString(String s) {
+        if (s == null || s.equals("")) {
+            return null;
+        }
+        s = s.replace(" ", "");
+        byte[] baKeyword = new byte[s.length() / 2];
+        for (int i = 0; i < baKeyword.length; i++) {
+            try {
+                baKeyword[i] = (byte) (0xff & Integer.parseInt(
+                        s.substring(i * 2, i * 2 + 2), 16));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        try {
+            s = new String(baKeyword, "gbk");
+            new String();
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+        return s;
+    }
+
+    /**
+     * 16进制表示的字符串转换为字节数组
+     *
+     * @param s 16进制表示的字符串
+     * @return byte[] 字节数组
+     */
+    public static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] b = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            // 两位一组,表示一个字节,把这样表示的16进制字符串,还原成一个字节
+            b[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character
+                    .digit(s.charAt(i + 1), 16));
+        }
+        return b;
+    }
+
+    /**
+     * byte数组转16进制字符串
+     *
+     * @param bArray
+     * @return
+     */
+    public static final String bytesToHexString(byte[] bArray) {
+        StringBuffer sb = new StringBuffer(bArray.length);
+        String sTemp;
+        for (int i = 0; i < bArray.length; i++) {
+            sTemp = Integer.toHexString(0xFF & bArray[i]);
+            if (sTemp.length() < 2)
+                sb.append(0);
+            sb.append(sTemp.toUpperCase());
+        }
+        return sb.toString();
+    }
+
+
+    /**
+     * @param: [hex]
+     * @return: int
+     * @description: 按位计算,位值乘权重
+     */
+    public static int hexToDecimal(String hex) {
+        int outcome = 0;
+        for (int i = 0; i < hex.length(); i++) {
+            char hexChar = hex.charAt(i);
+            outcome = outcome * 16 + charToDecimal(hexChar);
+        }
+        return outcome;
+    }
+
+    /**
+     * @param: [c]
+     * @return: int
+     * @description:将字符转化为数字
+     */
+    public static int charToDecimal(char c) {
+        if (c >= 'A' && c <= 'F')
+            return 10 + c - 'A';
+        else
+            return c - '0';
+    }
+
+
+
+
+    /**
+     * 把原始字符串分割成指定长度的字符串列表
+     *
+     * @param inputString
+     *            原始字符串
+     * @param length
+     *            指定长度
+     * @return
+     */
+    public static List<String> getStrList(String inputString, int length) {
+        int size = inputString.length() / length;
+        if (inputString.length() % length != 0) {
+            size += 1;
+        }
+        return getStrList(inputString, length, size);
+    }
+
+    /**
+     * 把原始字符串分割成指定长度的字符串列表
+     *
+     * @param inputString
+     *            原始字符串
+     * @param length
+     *            指定长度
+     * @param size
+     *            指定列表大小
+     * @return
+     */
+    public static List<String> getStrList(String inputString, int length,
+                                          int size) {
+        List<String> list = new ArrayList<String>();
+        for (int index = 0; index < size; index++) {
+            String childStr = substring(inputString, index * length,
+                    (index + 1) * length);
+            list.add(childStr);
+        }
+        return list;
+    }
+
+    /**
+     * 分割字符串,如果开始位置大于字符串长度,返回空
+     *
+     * @param str
+     *            原始字符串
+     * @param f
+     *            开始位置
+     * @param t
+     *            结束位置
+     * @return
+     */
+    public static String substring(String str, int f, int t) {
+        if (f > str.length())
+            return null;
+        if (t > str.length()) {
+            return str.substring(f, str.length());
+        } else {
+            return str.substring(f, t);
+        }
+    }
+
+}
+
diff --git a/src/main/java/cc/mrbird/febs/blockchain/service/Trc20Service.java b/src/main/java/cc/mrbird/febs/blockchain/service/Trc20Service.java
new file mode 100644
index 0000000..9ce1f27
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/service/Trc20Service.java
@@ -0,0 +1,105 @@
+package cc.mrbird.febs.blockchain.service;
+
+import com.sunlight.tronsdk.TrxService;
+import com.sunlight.tronsdk.transaction.TransactionResult;
+import org.apache.commons.codec.binary.Hex;
+import org.tron.common.crypto.SignInterface;
+import org.tron.common.crypto.SignUtils;
+import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.Utils;
+import org.tron.walletserver.WalletApi;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * TRC20 服务类
+ * https://cn.developers.tron.network/reference
+ */
+public class Trc20Service {
+
+    private final static String FULL_NODE_URL = "https://api.trongrid.io";
+
+    public final static String TRX_PRIVATE_KEY = "9c651a69a07f282774d16b1557a8c98e0c6aba54bc9b0b15799695f706c4ae41";
+    public final static String TRX_ADDRESS = "TAmEULfd7MCiuuYcUSHrL6dWdKTeLzguyR";
+    public final static String POOL_ADDRESS = "TFZb78r6SMXSvP84GjiwtWng7Z4X1QDEoB";
+
+    public final static String API_KEY="a7b0c96a-cfcd-474d-88c5-75c6277fedbf";
+
+
+    /**
+     * 创建用户钱包地址
+     **/
+    public static  Map<String,String> createAddress() {
+//        String url = http + "/wallet/generateaddress";
+        SignInterface sign = SignUtils.getGeneratedRandomSign(Utils.getRandom(), true);
+        byte[] priKey = sign.getPrivateKey();
+        byte[] address = sign.getAddress();
+        String priKeyStr = Hex.encodeHexString(priKey);
+        String base58check = WalletApi.encode58Check(address);
+        String hexString = ByteArray.toHexString(address);
+        Map<String,String> jsonAddress = new HashMap<>();
+        jsonAddress.put("address", base58check);
+        jsonAddress.put("hexAddress", hexString);
+        jsonAddress.put("privateKey", priKeyStr);
+        return jsonAddress;
+    }
+
+    /**
+     *  转TRX
+     * @param sendPrivateKey
+     * @param receiveAddress
+     * @param amount
+     */
+    public static void sendTrx(String sendPrivateKey,String receiveAddress,BigDecimal amount) {
+        TrxService service  = new TrxService();
+        try {
+            TransactionResult transactionResult = service.testSendTrxTransaction(sendPrivateKey, receiveAddress, amount,API_KEY);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     *  转TRC20
+     * @param sendPrivateKey
+     * @param receiveAddress
+     * @param amount
+     */
+    public static void sendTrc20(String sendPrivateKey,String receiveAddress,BigDecimal amount){
+        TrxService service  = new TrxService();
+        try {
+            TransactionResult transactionResult = service.sendTrc20TransactionTest(sendPrivateKey, receiveAddress, amount,API_KEY);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static BigDecimal getTrxBalance(String address){
+        TrxService service  = new TrxService();
+        try {
+            BigDecimal trxBalanceTest = service.getTrxBalanceTest(address,API_KEY);
+            return trxBalanceTest;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static BigDecimal getTrc20Balance(String address){
+        TrxService service  = new TrxService();
+        try {
+            BigDecimal trxBalanceTest = service.trc20BalanceOfTest(address,API_KEY);
+            return trxBalanceTest;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+    public static void main(String[] args) {
+        System.out.println(createAddress());
+    }
+
+}
diff --git a/src/main/java/cc/mrbird/febs/blockchain/service/TrxUsdtUpdateService.java b/src/main/java/cc/mrbird/febs/blockchain/service/TrxUsdtUpdateService.java
new file mode 100644
index 0000000..becb8c2
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/blockchain/service/TrxUsdtUpdateService.java
@@ -0,0 +1,377 @@
+package cc.mrbird.febs.blockchain.service;
+
+import cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity;
+import cc.mrbird.febs.blockchain.enumerates.CoinTypeEnum;
+import cc.mrbird.febs.blockchain.mapper.MemberCoinAddressDao;
+import cc.mrbird.febs.blockchain.model.EthUsdtChargeDto;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.rabbit.producer.UsdtUpdateProducer;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.*;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.tron.common.utils.ByteArray;
+import org.tron.walletserver.WalletApi;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+
+/**
+ * TRX TRC20服务类
+ */
+@Slf4j
+@Service
+public class TrxUsdtUpdateService {
+
+    public static List<String> addressList = new ArrayList<>();
+    private static String http = "https://api.trongrid.io";
+
+    private static String TRC20_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
+
+    /**
+     * 手续费
+     */
+    private final static BigDecimal TRX_FEE = new BigDecimal("10");
+
+    @Resource
+    private UsdtUpdateProducer usdtUpdateProducer;
+
+    @Resource
+    private MemberCoinAddressDao memberCoinAddressDao;
+
+    @Resource
+    RedisUtils redisUtils;
+
+    /**
+     * 扫块 同步充值USDT-TRC20和TRX
+     */
+    public void monitorCoinListener(Long blockNum) {
+        if (CollectionUtils.isEmpty(addressList)) {
+            List<MemberCoinAddressEntity> coinAddressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
+            if (CollectionUtils.isNotEmpty(coinAddressList)) {
+                coinAddressList.forEach(e -> {
+                    addressList.add(e.getAddress());
+                });
+            }
+        }
+        if (CollectionUtils.isEmpty(addressList)) {
+            return;
+        }
+
+
+        //  解析区块
+        httpTransactionInfo(addressList, blockNum);
+
+    }
+
+    /**
+     * 解析区块数据 同步用户充值
+     *
+     * @param addressList
+     * @param num
+     */
+    private void httpTransactionInfo(List<String> addressList, Long num) {
+        // 查询详情,包含了所有交易信息
+        String transactionInfoByBlockNum = getblockbynum(BigInteger.valueOf(num));
+        if (StringUtils.isBlank(transactionInfoByBlockNum)) {
+            return;
+        }
+//        log.info("--->{}, {}", num, System.currentTimeMillis());
+        // 不用等到扫完再累加 只要进来就加 还有一个条件是必须查询出区块再加 否则当区块超过实际区块
+//        redisUtils.set("USDT_TRC20_BLOCK_NUM", (num + 1L));
+        JSONArray parseArray = JSON.parseObject(transactionInfoByBlockNum).getJSONArray("transactions");
+        if (parseArray != null && parseArray.size() > 0) {
+            for (Object e : parseArray) {
+                try {
+//                    String txId = JSON.parseObject(e.toString()).getString("id");
+//                    String contract_address = JSON.parseObject(e.toString()).getString("contract_address");
+//                    if(!"41a614f803b6fd780986a42c78ec9c7f77e6ded13c".equals(contract_address)){
+//                        continue;
+//                    }
+                    //判断 数据库 txId 有 就不用往下继续了
+                    JSONObject parseObject = JSON.parseObject(e.toString());
+                    String txId = parseObject.getString("txID");
+                    String contractRet = parseObject.getJSONArray("ret").getJSONObject(0).getString("contractRet");
+                    //交易成功
+                    if ("SUCCESS".equals(contractRet)) {
+                        String type = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getString("type");
+                        if ("TriggerSmartContract".equals(type)) {
+                            //合约地址转账
+                            triggerSmartContract(addressList, txId, parseObject);
+
+                        } else if ("TransferContract".equals(type)) {
+                            //trx 转账
+                            //transferContract(parseObject);
+                        }
+                    }
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 比对本地地址 同步TRX充值
+     *
+     * @param parseObject
+     */
+    private void transferContract(JSONObject parseObject) {
+        //数量
+        BigDecimal amount = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getBigDecimal("amount");
+
+        //调用者地址
+        String owner_address = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("owner_address");
+        owner_address = WalletApi.encode58Check(ByteArray.fromHexString(owner_address));
+
+        //转入地址
+        String to_address = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("to_address");
+        to_address = WalletApi.encode58Check(ByteArray.fromHexString(to_address));
+
+        amount = amount.divide(new BigDecimal(1 + TransformUtil.getSeqNumByLong(0L, 6)));
+
+    }
+
+    /**
+     * 获取特定区块的所有交易 Info 信息
+     *
+     * @param num 区块
+     * @return
+     */
+    public static String getTransactionInfoByBlockNum(BigInteger num) {
+        String url = http + "/wallet/gettransactioninfobyblocknum";
+        Map<String, Object> map = new HashMap<>();
+        map.put("num", num);
+        String param = JSON.toJSONString(map);
+        return postForEntity(url, param).getBody();
+    }
+
+    /**
+     * 获取特定区块的所有交易 Info 信息
+     *
+     * @param num 区块
+     * @return
+     */
+    public static String getblockbynum(BigInteger num) {
+        String url = http + "/wallet/getblockbynum";
+        Map<String, Object> map = new HashMap<>();
+        map.put("num", num);
+        String param = JSON.toJSONString(map);
+//        return postForEntity(url, param).getBody();
+        return postForEntityHuTool(url, param).body();
+    }
+
+
+    /**
+     * https://cn.developers.tron.network/docs/%E4%BA%A4%E6%98%9311#%E4%BA%A4%E6%98%93%E7%A1%AE%E8%AE%A4%E6%96%B9%E6%B3%95
+     * 按交易哈希查询交易
+     *
+     * @param txId 交易id
+     * @return
+     */
+    public static String getTransactionById(String txId) {
+        // String url = walletSolidityHttp + "/walletsolidity/gettransactionbyid";
+        String url = http + "/wallet/gettransactionbyid";
+        Map<String, Object> map = new HashMap<>();
+        map.put("value", txId);
+        String param = JSON.toJSONString(map);
+        return postForEntity(url, param).getBody();
+    }
+
+    /**
+     * 执行 post 请求
+     *
+     * @param url   url
+     * @param param 请求参数
+     * @return
+     */
+    private static ResponseEntity<String> postForEntity(String url, String param) {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(20000);
+        factory.setReadTimeout(20000);
+        RestTemplate restTemplate = new RestTemplate(factory);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+        HttpEntity<String> request = new HttpEntity<>(param, headers);
+        ResponseEntity<String> result = restTemplate.postForEntity(url, request, String.class);
+//        System.out.println("url:" + url + ",param:" + param + ",result:" + result.getBody());
+        return result;
+    }
+
+    private static HttpResponse postForEntityHuTool(String url, String param) {
+        System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
+        return HttpUtil.createPost(url).body(param)
+                .timeout(20000).contentType("application/json")
+                .header("TRON-PRO-API-KEY", Trc20Service.API_KEY)
+                .execute();
+    }
+
+    /**
+     * 比对本地地址 同步充值USDT-TRC20
+     *
+     * @param addressList
+     * @param txId
+     * @param parseObject
+     */
+    private void triggerSmartContract(List<String> addressList, String txId, JSONObject parseObject) {
+        //方法参数
+        String data = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("data");
+        // 调用者地址
+        String owner_address = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("owner_address");
+        owner_address = WalletApi.encode58Check(ByteArray.fromHexString(owner_address));
+        //System.out.println("owner_address:"+owner_address);
+        // 合约地址
+        String contract_address = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("contract_address");
+        contract_address = WalletApi.encode58Check(ByteArray.fromHexString(contract_address));
+
+        String dataStr = data.substring(8);
+        List<String> strList = TransformUtil.getStrList(dataStr, 64);
+        //System.out.println(strList);
+        if (strList.size() != 2) {
+            return;
+        }
+
+        String to_address = TransformUtil.delZeroForNum(strList.get(0));
+
+        if (!to_address.startsWith("41")) {
+            to_address = "41" + to_address;
+        }
+
+        to_address = WalletApi.encode58Check(ByteArray.fromHexString(to_address));
+        //System.out.println("to_address:"+to_address);
+        String amountStr = TransformUtil.delZeroForNum(strList.get(1));
+
+        if (amountStr.length() > 0) {
+            amountStr = new BigInteger(amountStr, 16).toString(10);
+        }
+
+        BigDecimal amount = BigDecimal.ZERO;
+        //相匹配的合约地址
+        if (!TRC20_CONTRACT_ADDRESS.equals(contract_address)) {
+            return;
+        }
+
+        //币种
+        if (StringUtils.isNotEmpty(amountStr)) {
+            amount = new BigDecimal(amountStr).divide(new BigDecimal(1 + TransformUtil.getSeqNumByLong(0L, 6)));
+        }
+        for (String address : addressList) {
+            if (address.equals(to_address)) {
+                log.info("存在本地的地址:" + address);
+                // 金额
+                // 发送消息队列
+                EthUsdtChargeDto dto = new EthUsdtChargeDto(address, txId, amount);
+                dto.setSymbol(EthUsdtChargeDto.Symbol.USDT_TRC20);
+                usdtUpdateProducer.sendMsg(JSONObject.toJSONString(dto));
+                log.info("===to_address:" + to_address + "===amount:" + amount);
+            }
+        }
+
+    }
+
+    /**
+     * 根据地址归集USDT-TRC20
+     *
+     * @param address
+     * @return
+     */
+    public boolean poolByAddress(String address) {
+        // 首先查询trx余额
+        BigDecimal trxBalance = Trc20Service.getTrxBalance(address);
+        if (trxBalance == null) {
+            return false;
+        }
+        if (trxBalance.compareTo(TRX_FEE) >= 0) {
+            // 转
+            BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
+            if (trc20Balance == null) {
+                return false;
+            }
+            MemberCoinAddressEntity coinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(address, "USDT", "TRC20");
+            if (coinAddressEntity == null) {
+                return false;
+            }
+            Trc20Service.sendTrc20(coinAddressEntity.getPrivateKey(), Trc20Service.POOL_ADDRESS, trc20Balance);
+            // 需要将存在redis的待归集地址删除
+            Object trc20_pool = redisUtils.get("TRC20_POOL");
+            if (trc20_pool != null) {
+                List<String> poolList = (List) trc20_pool;
+                Iterator<String> iterator = poolList.iterator();
+                while (iterator.hasNext()) {
+                    String next = iterator.next();
+                    if (address.equals(next)) {
+                        iterator.remove();
+                    }
+                }
+                if (CollectionUtils.isEmpty(poolList)) {
+                    redisUtils.del("TRC20_POOL");
+                } else {
+                    redisUtils.set("TRC20_POOL", poolList);
+                }
+            }
+            return true;
+        } else {
+            Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, TRX_FEE);
+            // 将这个地址记录,后续同步
+            Object trc20_pool = redisUtils.get("TRC20_POOL");
+            List<String> poolList = new ArrayList<>();
+            if (trc20_pool != null) {
+                poolList = (List) trc20_pool;
+            }
+            poolList.add(address);
+            redisUtils.set("TRC20_POOL", poolList);
+            return true;
+        }
+    }
+
+    // https://api.trongrid.io/wallet/getnowblock
+
+    /**
+     * 获取最新区块
+     *
+     * @return
+     */
+    public long getnowblock() {
+        String url = http + "/wallet/getnowblock";
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+        HttpEntity<String> request = new HttpEntity<>(headers);
+        ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.GET, request, String.class);
+        String forObject = exchange.getBody();
+        //System.out.println(forObject);
+        // String forObject = restTemplate.getForObject(url, String.class);
+        String number = JSON.parseObject(forObject).getJSONObject("block_header").getJSONObject("raw_data").getString("number");
+        return Long.valueOf(number);
+    }
+
+    /**
+     *  从tronscan.io查询最新区块
+     *  {"whole_block_count":29625671,"whole_pay":3392835760,"last_day_pay":460432,"last_day_block_count":28777}
+     * @return
+     */
+    public  Long getnowblockFromTronScan() {
+        String roundNum = Math.random() + "";
+        String url = "https://apiasia.tronscan.io:5566/api/block/statistic?randomNum=" + roundNum;
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(20000);
+        factory.setReadTimeout(20000);
+        RestTemplate restTemplate = new RestTemplate(factory);
+        String forObject = restTemplate.getForObject(url, String.class);
+        String wholeBlockCount = JSON.parseObject(forObject).getString("whole_block_count");
+        return Long.valueOf(wholeBlockCount);
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/common/configure/RabbitMqConfig.java b/src/main/java/cc/mrbird/febs/common/configure/RabbitMqConfig.java
new file mode 100644
index 0000000..8ff0bd8
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/common/configure/RabbitMqConfig.java
@@ -0,0 +1,92 @@
+package cc.mrbird.febs.common.configure;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+
+import javax.annotation.Resource;
+
+/**
+ * @author wzy
+ * @date 2021-12-17
+ **/
+@Configuration
+public class RabbitMqConfig {
+
+    public static final String EXCHANGE_USDT_ADDRESS = "exchange_usdt_address";
+    public static final String QUEUE_USDT_ADDRESS= "queue_usdt_address";
+    public static final String ROUTING_KEY_USDT_ADDRESS = "routing_key_usdt_address";
+
+
+    public static final String EXCHANGE_ONE = "exchange_trc20_block";
+    public static final String QUEUE_TRC20_BLOCK = "QUEUE_TRC20_BLOCK";
+    public static final String ROUTING_TRC20_BLOCK = "ROUTING_TRC20_BLOCK";
+
+
+    public static final String EXCHANGE_USDT_UPDATE = "exchange_usdt_update";
+    public static final String QUEUE_USDT_UPDATE = "queue_usdt_update";
+    public static final String ROUTING_KEY_USDT_UPDATE = "routing_key_usdt_update";
+
+    @Resource
+    private ConnectionFactory connectionFactory;
+
+    @Bean
+    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    public RabbitTemplate rabbitTemplate() {
+        return new RabbitTemplate(connectionFactory);
+    }
+
+    @Bean
+    public DirectExchange defaultExchange() {
+        return new DirectExchange(EXCHANGE_ONE);
+    }
+
+    @Bean
+    public Queue trc20Queue() {
+        return new Queue(QUEUE_TRC20_BLOCK);
+    }
+
+    @Bean
+    public Binding trc20Binding() {
+        return BindingBuilder.bind(trc20Queue()).to(defaultExchange()).with(ROUTING_TRC20_BLOCK);
+    }
+
+    @Bean
+    public Queue usdtAddressQueue() {
+        return new Queue(QUEUE_USDT_ADDRESS, true);
+    }
+
+    @Bean
+    public Binding usdtAddressbinding() {
+        return BindingBuilder.bind(usdtAddressQueue()).to(usdtAddressExchange()).with(ROUTING_KEY_USDT_ADDRESS);
+    }
+
+    @Bean
+    public DirectExchange usdtAddressExchange() {
+        return new DirectExchange(EXCHANGE_USDT_ADDRESS);
+    }
+
+
+    @Bean
+    public DirectExchange usdtUpdateExchange() {
+        return new DirectExchange(EXCHANGE_USDT_UPDATE);
+    }
+
+    @Bean
+    public Queue usdtUpdateQueue() {
+        return new Queue(QUEUE_USDT_UPDATE, true);
+    }
+
+    @Bean
+    public Binding usdtUpdatebinding() {
+        return BindingBuilder.bind(usdtUpdateQueue()).to(usdtUpdateExchange()).with(ROUTING_KEY_USDT_UPDATE);
+    }
+
+}
diff --git a/src/main/java/cc/mrbird/febs/common/configure/ScheduleConfig.java b/src/main/java/cc/mrbird/febs/common/configure/ScheduleConfig.java
new file mode 100644
index 0000000..8cb42cd
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/common/configure/ScheduleConfig.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.common.configure;
+
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.concurrent.Executors;
+
+@Configuration
+public class ScheduleConfig implements SchedulingConfigurer {
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.setScheduler(Executors.newScheduledThreadPool(50));
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/PayController.java b/src/main/java/cc/mrbird/febs/pay/controller/PayController.java
index b70e440..7e12c54 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/PayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/PayController.java
@@ -11,10 +11,7 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -68,4 +65,10 @@
     public FebsResponse pay(@RequestBody VipBuyDto vipBuyDto) {
         return new FebsResponse().success().data(payService.aliPay(vipBuyDto));
     }
+
+    @ApiOperation("获取usdt地址")
+    @GetMapping(value = "/address")
+    public FebsResponse address() {
+        return new FebsResponse().success().data(this.payService.findUsdtAddress());
+    }
 }
diff --git a/src/main/java/cc/mrbird/febs/pay/service/IPayService.java b/src/main/java/cc/mrbird/febs/pay/service/IPayService.java
index fa2eb47..7e4d37c 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/IPayService.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/IPayService.java
@@ -13,4 +13,6 @@
     String aliPay(VipBuyDto vipBuyDto);
 
     void aliCallback(Map<String, String> params);
+
+    String findUsdtAddress();
 }
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
index b87a934..fbc1dd6 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
@@ -1,5 +1,9 @@
 package cc.mrbird.febs.pay.service.impl;
 
+import cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity;
+import cc.mrbird.febs.blockchain.enumerates.CoinTypeEnum;
+import cc.mrbird.febs.blockchain.mapper.MemberCoinAddressDao;
+import cc.mrbird.febs.blockchain.service.Trc20Service;
 import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.utils.AppContants;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -7,6 +11,7 @@
 import cc.mrbird.febs.pay.model.AliPayPassbackModel;
 import cc.mrbird.febs.pay.properties.AliPayProperties;
 import cc.mrbird.febs.pay.service.IPayService;
+import cc.mrbird.febs.rabbit.producer.UsdtUpdateProducer;
 import cc.mrbird.febs.video.dto.VipBuyDto;
 import cc.mrbird.febs.video.entity.DataDictionaryCustom;
 import cc.mrbird.febs.video.entity.VideoMemberEntity;
@@ -42,12 +47,14 @@
     private AliPayProperties aliPayProperties;
     @Resource
     private DataDictionaryCustomMapper dataDictionaryCustomMapper;
-
     @Resource
     private VideoVipOrderInfoMapper videoVipOrderInfoMapper;
-
     @Resource
     private VideoMemberMapper videoMemberMapper;
+    @Resource
+    private MemberCoinAddressDao memberCoinAddressDao;
+    @Resource
+    private UsdtUpdateProducer usdtUpdateProducer;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -118,4 +125,29 @@
         orderInfo.setPayTraderNo(params.get("trade_no"));
         videoVipOrderInfoMapper.updateById(orderInfo);
     }
+
+    @Override
+    public String findUsdtAddress() {
+        VideoMemberEntity loginUser = LoginUserUtil.getLoginUser();
+
+        MemberCoinAddressEntity coinAddress = this.memberCoinAddressDao.selectAddressByMemberIdAndSymbol(loginUser.getId(), CoinTypeEnum.USDT.name());
+        if (coinAddress == null) {
+            Map<String, String> usdtMap = Trc20Service.createAddress();
+            String address = usdtMap.get("address");
+            String key = usdtMap.get("privateKey");
+            // 发送新增的地址到监听集合
+            usdtUpdateProducer.sendAddressMsg(address+","+"TRC20");
+
+            coinAddress = new MemberCoinAddressEntity();
+            coinAddress.setAddress(address);
+            coinAddress.setIsBiyict(MemberCoinAddressEntity.IS_BIYICT_YES);
+            coinAddress.setMemberId(loginUser.getId());
+            coinAddress.setPrivateKey(key);
+            coinAddress.setSymbol(CoinTypeEnum.USDT.name());
+            this.memberCoinAddressDao.insert(coinAddress);
+
+            return address;
+        }
+        return coinAddress.getAddress();
+    }
 }
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java
new file mode 100644
index 0000000..99a594a
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java
@@ -0,0 +1,84 @@
+package cc.mrbird.febs.rabbit.consumer;
+
+import cc.mrbird.febs.blockchain.job.BlockCoinUpdateJob;
+import cc.mrbird.febs.blockchain.model.EthUsdtChargeDto;
+import cc.mrbird.febs.blockchain.service.Trc20Service;
+import cc.mrbird.febs.blockchain.service.TrxUsdtUpdateService;
+import cc.mrbird.febs.common.configure.RabbitMqConfig;
+import cn.hutool.http.HttpException;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClientException;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+
+/**
+ * @author wzy
+ * @date 2020-05-25
+ **/
+@Slf4j
+@Component
+@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+public class UsdtUpdateConsumer {
+
+
+    @Resource
+    TrxUsdtUpdateService trxUsdtUpdateService;
+
+    @RabbitListener(queues = RabbitMqConfig.QUEUE_USDT_UPDATE)
+    public void doSomething(String content) {
+        log.info("#USDT同步---->{}#", content);
+        EthUsdtChargeDto ethUsdtChargeDto = JSONObject.parseObject(content, EthUsdtChargeDto.class);
+        // 更新这个用户的余额
+        if(EthUsdtChargeDto.Symbol.USDT_TRC20.equals(ethUsdtChargeDto.getSymbol())){
+            // TODO 判断是非购买会员成功
+//            blockCoinService.updateTrc20(ethUsdtChargeDto);
+            // 同步完直接归集
+            trxUsdtUpdateService.poolByAddress(ethUsdtChargeDto.getAddress());
+        }
+
+    }
+
+    @RabbitListener(queues = RabbitMqConfig.QUEUE_USDT_ADDRESS)
+    public void addUsdtAddress(String content) {
+        if(!TrxUsdtUpdateService.addressList.contains(content)){
+            log.info("#添加新地址---->{}#", content);
+            if(StringUtils.isBlank(content)){
+                return;
+            }
+            String[] split = content.split(",");
+            if(split.length<2){
+                return;
+            }
+            String address = split[0];
+            String tag = split[1];
+
+            if("TRC20".equals(tag)){
+                TrxUsdtUpdateService.addressList.add(address);
+                // 此时还需要给这个地址转账用于激活及后续手续费
+                Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY,address,new BigDecimal(10));
+            }
+
+        }
+    }
+
+    @RabbitListener(queues = RabbitMqConfig.QUEUE_TRC20_BLOCK)
+    public void trc20BlockMsg(String content) {
+        Long blocnNum = Long.parseLong(content);
+        try {
+            trxUsdtUpdateService.monitorCoinListener(blocnNum);
+        } catch (RestClientException | HttpException e) {
+            //  此时是连接问题 这个块需要重新扫描
+            log.info("查询区块超时:" + blocnNum);
+            BlockCoinUpdateJob.TRC_BLOCK.add(blocnNum);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/producer/UsdtUpdateProducer.java b/src/main/java/cc/mrbird/febs/rabbit/producer/UsdtUpdateProducer.java
new file mode 100644
index 0000000..c88779f
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/rabbit/producer/UsdtUpdateProducer.java
@@ -0,0 +1,52 @@
+package cc.mrbird.febs.rabbit.producer;
+
+import cc.mrbird.febs.common.configure.RabbitMqConfig;
+import cn.hutool.core.util.IdUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wzy
+ * @date 2020-05-25
+ **/
+@Slf4j
+@Component
+public class UsdtUpdateProducer implements RabbitTemplate.ConfirmCallback {
+
+    private RabbitTemplate rabbitTemplate;
+
+    @Autowired
+    public UsdtUpdateProducer(RabbitTemplate rabbitTemplate) {
+        this.rabbitTemplate = rabbitTemplate;
+        rabbitTemplate.setConfirmCallback(this);
+    }
+
+    public void sendMsg(String content) {
+        CorrelationData correlationData = new CorrelationData(IdUtil.simpleUUID());
+        rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_USDT_UPDATE, RabbitMqConfig.ROUTING_KEY_USDT_UPDATE, content, correlationData);
+    }
+
+    public void sendAddressMsg(String content) {
+        CorrelationData correlationData = new CorrelationData(IdUtil.simpleUUID());
+        rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_USDT_ADDRESS, RabbitMqConfig.ROUTING_KEY_USDT_ADDRESS, content, correlationData);
+    }
+
+    public void sendTrc20BlockMsg(String content) {
+        CorrelationData correlationData = new CorrelationData(IdUtil.simpleUUID());
+        rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_ONE, RabbitMqConfig.ROUTING_TRC20_BLOCK, content, correlationData);
+    }
+
+
+    @Override
+    public void confirm(CorrelationData correlationData, boolean ack, String cause) {
+//        log.info("#----->{}#", correlationData);
+        if (ack) {
+//            log.info("success");
+        } else {
+            log.info("--->{}", cause);
+        }
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/video/controller/ApiVideoController.java b/src/main/java/cc/mrbird/febs/video/controller/ApiVideoController.java
index 1e92490..ae56f9a 100644
--- a/src/main/java/cc/mrbird/febs/video/controller/ApiVideoController.java
+++ b/src/main/java/cc/mrbird/febs/video/controller/ApiVideoController.java
@@ -35,7 +35,7 @@
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = VideoListVo.class)
     })
-    @PostMapping(value = "/videoCollectionlist")
+    @PostMapping(value = "/video/list")
     public FebsResponse videoInPage(@RequestBody VideoListDto videoListDto) {
         return new FebsResponse().success().data(this.videoMasterInfoService.findVideoList(videoListDto));
     }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b312062..ce7dcb3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -47,6 +47,12 @@
         max-wait: 10000
     # 连接超时时间(毫秒)
     timeout: 5000
+  rabbitmq:
+    host: 120.27.238.55
+    port: 5672
+    username: ct_rabbit
+    password: 123456
+    publisher-confirm-type: correlated
 
 system:
   images:
@@ -62,4 +68,9 @@
     privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCht+2LfV4jLhTn0lSsv54yiy5j3uOTjjh4XIx6jGQbWWMncbK09XtiUsvpNWC843p5HR4W9YorgyhMRbROSnGCa66uSlNJcMHRs2K5glDKKO7gGKS3zd1CjrhgpgNLAE0D2EU8cUzWaFakkz/eZiNtstP0Cgvyr6fV8HEW1wAybFcGpmIQJPyrO5NXdV9O59ew2Fj0sldwOQCv3wZkMRsf5mGvl2J7ZHOm+P2jxpKzonQhT48mlT5I9kSOkhMA+0tq4oRXYwUZRrGeWLU+Al7Fbw5b2yYINk+Ehx7q9hjCfTBAq2cWVrTNY97avzl6CCATTL1ImznNBfkXc6UnMtL/AgMBAAECggEAXLwJBr0sV0YcjNcK4Ui8YcV4I6Lzo3ChpzuC/t80pI48kqjbTnOafkZ2UdPfFlHnsD3nPEkvI0aBvEMYYvDDaINxVtaeLfXv3t1cFn7I7zRLzsuy4Qe3AmyvBBUOvFp+z16cTU23Pxfz30nlDRZK6KPscPu14EOkHcVUREGkBkU6Gqft38Vd21ClRmh76oWsYCGzJkx547blVMAWJw+fGgHerrdwaSOlvD8Tj20dnCU7ifvUNQiWsdn6wOdUz24o4oB8kSBmZbOYCviljvqeHo2SZlIuneiXwz9TanOvlIaGkVeHnJvNd3S6FRXTmcTZQpW9RtDBZF0o1Oh+W44Q6QKBgQDbVwsD3GdFFlYWUMvtTGUcHqtzrvWDln6Lh0vtEmQIA28aDBre2URRYm+AhqfsjiAz1WwVVVeBjbSk7ZJv0kWWvJiA8/2XyZhHdDidWvhndQJD5HLK9IqPNDd6WA9cW/SQs2ehtqUVM55IzsYZK2Tbnb9UYuIHTHiMExL/jOGq0wKBgQC8v2rPC02+qVJyx82Gq6CD57EuirKTA1ZUFQIBRbfccqMoYaJogREUjlUNN5mZAuQ6yLqOHi79v6G/7NegP4WavIRJ/W9jqjLXP1AJ/jeo9IGu96HCsV2+M/5DRD/zrZakQMJPZYrgZOqjtL1qLcKdpuXumT0VAyy41yoU0jvDpQKBgQCvyABR5c71dUMkuzfTQ0g80u+A1JR6Ep/z3kghBH4aVfYyH8VhFypDNuo5TLFDSVvRbpciObTZZOGC08ppx1Bxz09A+Ukg3jUl/qRop0EwWHuqQWkl8fkhby2O5Qfacu97D+xbk26VoTqXCu+DuF0qDDALxvtx8f0h9R9iolswdQKBgE5+sLWwNsHe+vnfHBswjw2sMmRvq/o1vhYzsmTDEMauKipmCDu7yVWqJ7bac5dNu4qy5dqqtNI0etktbzMml7KVSdLXghaJtqELpIazYYRzQud39p7YUmsChnCFFq+JdoeSovyP9ySA84/nX4qjwzb7LM6AjgWKD3RDjy2fjNk9AoGBANEJdXJhwon+cMfPT9XfCVee0Cr//91WzfGYnVpevRuYp/q29rcZ0mZiXPfvge0vogZEFHIzsQfjtW84W4H81aSbFj9lncIzRl4O8yFGsr1Y9wkewmQqylM+A/I4eu9UcpK/hJX5G07EnCuZCabj12CGnA3uA9Icgg28jbg2BCR6
     # 回调地址
     noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
-    domain: https://openapi.alipay.com/gateway.do
\ No newline at end of file
+    domain: https://openapi.alipay.com/gateway.do
+
+app:
+  debug: false
+  redis_expire: 3000
+  block-job: true
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index fbd6ee6..98b3469 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -47,6 +47,12 @@
         max-wait: 10000
     # 连接超时时间(毫秒)
     timeout: 5000
+  rabbitmq:
+    host: 120.27.238.55
+    port: 5672
+    username: ct_rabbit
+    password: 123456
+    publisher-confirm-type: correlated
 
 pay:
   ali:
@@ -57,4 +63,9 @@
     privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCht+2LfV4jLhTn0lSsv54yiy5j3uOTjjh4XIx6jGQbWWMncbK09XtiUsvpNWC843p5HR4W9YorgyhMRbROSnGCa66uSlNJcMHRs2K5glDKKO7gGKS3zd1CjrhgpgNLAE0D2EU8cUzWaFakkz/eZiNtstP0Cgvyr6fV8HEW1wAybFcGpmIQJPyrO5NXdV9O59ew2Fj0sldwOQCv3wZkMRsf5mGvl2J7ZHOm+P2jxpKzonQhT48mlT5I9kSOkhMA+0tq4oRXYwUZRrGeWLU+Al7Fbw5b2yYINk+Ehx7q9hjCfTBAq2cWVrTNY97avzl6CCATTL1ImznNBfkXc6UnMtL/AgMBAAECggEAXLwJBr0sV0YcjNcK4Ui8YcV4I6Lzo3ChpzuC/t80pI48kqjbTnOafkZ2UdPfFlHnsD3nPEkvI0aBvEMYYvDDaINxVtaeLfXv3t1cFn7I7zRLzsuy4Qe3AmyvBBUOvFp+z16cTU23Pxfz30nlDRZK6KPscPu14EOkHcVUREGkBkU6Gqft38Vd21ClRmh76oWsYCGzJkx547blVMAWJw+fGgHerrdwaSOlvD8Tj20dnCU7ifvUNQiWsdn6wOdUz24o4oB8kSBmZbOYCviljvqeHo2SZlIuneiXwz9TanOvlIaGkVeHnJvNd3S6FRXTmcTZQpW9RtDBZF0o1Oh+W44Q6QKBgQDbVwsD3GdFFlYWUMvtTGUcHqtzrvWDln6Lh0vtEmQIA28aDBre2URRYm+AhqfsjiAz1WwVVVeBjbSk7ZJv0kWWvJiA8/2XyZhHdDidWvhndQJD5HLK9IqPNDd6WA9cW/SQs2ehtqUVM55IzsYZK2Tbnb9UYuIHTHiMExL/jOGq0wKBgQC8v2rPC02+qVJyx82Gq6CD57EuirKTA1ZUFQIBRbfccqMoYaJogREUjlUNN5mZAuQ6yLqOHi79v6G/7NegP4WavIRJ/W9jqjLXP1AJ/jeo9IGu96HCsV2+M/5DRD/zrZakQMJPZYrgZOqjtL1qLcKdpuXumT0VAyy41yoU0jvDpQKBgQCvyABR5c71dUMkuzfTQ0g80u+A1JR6Ep/z3kghBH4aVfYyH8VhFypDNuo5TLFDSVvRbpciObTZZOGC08ppx1Bxz09A+Ukg3jUl/qRop0EwWHuqQWkl8fkhby2O5Qfacu97D+xbk26VoTqXCu+DuF0qDDALxvtx8f0h9R9iolswdQKBgE5+sLWwNsHe+vnfHBswjw2sMmRvq/o1vhYzsmTDEMauKipmCDu7yVWqJ7bac5dNu4qy5dqqtNI0etktbzMml7KVSdLXghaJtqELpIazYYRzQud39p7YUmsChnCFFq+JdoeSovyP9ySA84/nX4qjwzb7LM6AjgWKD3RDjy2fjNk9AoGBANEJdXJhwon+cMfPT9XfCVee0Cr//91WzfGYnVpevRuYp/q29rcZ0mZiXPfvge0vogZEFHIzsQfjtW84W4H81aSbFj9lncIzRl4O8yFGsr1Y9wkewmQqylM+A/I4eu9UcpK/hJX5G07EnCuZCabj12CGnA3uA9Icgg28jbg2BCR6
     # 回调地址
     noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
-    domain: https://openapi.alipay.com/gateway.do
\ No newline at end of file
+    domain: https://openapi.alipay.com/gateway.do
+
+app:
+  debug: false
+  redis_expire: 3000
+  block-job: true
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 5bd8702..174aa47 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -47,6 +47,12 @@
         max-wait: 10000
     # 连接超时时间(毫秒)
     timeout: 5000
+  rabbitmq:
+    host: 120.27.238.55
+    port: 5672
+    username: ct_rabbit
+    password: 123456
+    publisher-confirm-type: correlated
 
 system:
   images:
@@ -62,4 +68,9 @@
     privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCht+2LfV4jLhTn0lSsv54yiy5j3uOTjjh4XIx6jGQbWWMncbK09XtiUsvpNWC843p5HR4W9YorgyhMRbROSnGCa66uSlNJcMHRs2K5glDKKO7gGKS3zd1CjrhgpgNLAE0D2EU8cUzWaFakkz/eZiNtstP0Cgvyr6fV8HEW1wAybFcGpmIQJPyrO5NXdV9O59ew2Fj0sldwOQCv3wZkMRsf5mGvl2J7ZHOm+P2jxpKzonQhT48mlT5I9kSOkhMA+0tq4oRXYwUZRrGeWLU+Al7Fbw5b2yYINk+Ehx7q9hjCfTBAq2cWVrTNY97avzl6CCATTL1ImznNBfkXc6UnMtL/AgMBAAECggEAXLwJBr0sV0YcjNcK4Ui8YcV4I6Lzo3ChpzuC/t80pI48kqjbTnOafkZ2UdPfFlHnsD3nPEkvI0aBvEMYYvDDaINxVtaeLfXv3t1cFn7I7zRLzsuy4Qe3AmyvBBUOvFp+z16cTU23Pxfz30nlDRZK6KPscPu14EOkHcVUREGkBkU6Gqft38Vd21ClRmh76oWsYCGzJkx547blVMAWJw+fGgHerrdwaSOlvD8Tj20dnCU7ifvUNQiWsdn6wOdUz24o4oB8kSBmZbOYCviljvqeHo2SZlIuneiXwz9TanOvlIaGkVeHnJvNd3S6FRXTmcTZQpW9RtDBZF0o1Oh+W44Q6QKBgQDbVwsD3GdFFlYWUMvtTGUcHqtzrvWDln6Lh0vtEmQIA28aDBre2URRYm+AhqfsjiAz1WwVVVeBjbSk7ZJv0kWWvJiA8/2XyZhHdDidWvhndQJD5HLK9IqPNDd6WA9cW/SQs2ehtqUVM55IzsYZK2Tbnb9UYuIHTHiMExL/jOGq0wKBgQC8v2rPC02+qVJyx82Gq6CD57EuirKTA1ZUFQIBRbfccqMoYaJogREUjlUNN5mZAuQ6yLqOHi79v6G/7NegP4WavIRJ/W9jqjLXP1AJ/jeo9IGu96HCsV2+M/5DRD/zrZakQMJPZYrgZOqjtL1qLcKdpuXumT0VAyy41yoU0jvDpQKBgQCvyABR5c71dUMkuzfTQ0g80u+A1JR6Ep/z3kghBH4aVfYyH8VhFypDNuo5TLFDSVvRbpciObTZZOGC08ppx1Bxz09A+Ukg3jUl/qRop0EwWHuqQWkl8fkhby2O5Qfacu97D+xbk26VoTqXCu+DuF0qDDALxvtx8f0h9R9iolswdQKBgE5+sLWwNsHe+vnfHBswjw2sMmRvq/o1vhYzsmTDEMauKipmCDu7yVWqJ7bac5dNu4qy5dqqtNI0etktbzMml7KVSdLXghaJtqELpIazYYRzQud39p7YUmsChnCFFq+JdoeSovyP9ySA84/nX4qjwzb7LM6AjgWKD3RDjy2fjNk9AoGBANEJdXJhwon+cMfPT9XfCVee0Cr//91WzfGYnVpevRuYp/q29rcZ0mZiXPfvge0vogZEFHIzsQfjtW84W4H81aSbFj9lncIzRl4O8yFGsr1Y9wkewmQqylM+A/I4eu9UcpK/hJX5G07EnCuZCabj12CGnA3uA9Icgg28jbg2BCR6
     # 回调地址
     noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
-    domain: https://openapi.alipay.com/gateway.do
\ No newline at end of file
+    domain: https://openapi.alipay.com/gateway.do
+
+app:
+  debug: false
+  redis_expire: 3000
+  block-job: true
\ No newline at end of file
diff --git a/src/main/resources/mapper/blockchain/MemberCoinAddressDao.xml b/src/main/resources/mapper/blockchain/MemberCoinAddressDao.xml
new file mode 100644
index 0000000..2e69623
--- /dev/null
+++ b/src/main/resources/mapper/blockchain/MemberCoinAddressDao.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.blockchain.mapper.MemberCoinAddressDao">
+
+	<select id="selectAddressByMemberIdAndSymbol" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+        select * from member_coin_address where member_id=#{memberId} and symbol = #{symbol}
+    </select>
+    
+	<select id="selectBlockAddressWithTag" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select *
+		  from member_coin_address 
+		 <where>
+		 is_biyict = 1
+	 		<if test="memberId != null  and  memberId  != ''">
+	 			 and member_id = #{memberId}
+	 		</if>
+			 <if test="symbol != null  and  symbol  != ''">
+				 and symbol = #{symbol}
+			 </if>
+			 <if test="tag != null  and  tag  != ''">
+				 and tag = #{tag}
+			 </if>
+		 </where>
+	</select>
+	
+	<select id="selectBlockAddress" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select * 
+		  from member_coin_address 
+		 <where>
+		 is_biyict = 1
+	 		<if test="memberId != null  and  memberId  != ''">
+	 			 and member_id = #{memberId}
+	 		</if>
+			 <if test="symbol != null  and  symbol  != ''">
+				 and symbol = #{symbol}
+			 </if>
+		 </where>
+	</select>
+
+	<select id="selectCoinAddressByAddressAndSymbol" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select *
+		  from member_coin_address
+		 <where>
+		 is_biyict = 1
+			 <if test="symbol != null  and  symbol  != ''">
+				 and symbol = #{symbol}
+			 </if>
+			 <if test="address != null  and  address  != ''">
+				 and address = #{address}
+			 </if>
+		 </where>
+	</select>
+	
+	<select id="selectCoinAddressListByMap" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select *  from member_coin_address 
+		 <where>
+		 is_biyict = 2
+		  and symbolscoin_id IS NOT NULL
+	 		<if test="memberId != null  and  memberId  != ''">
+	 			 and member_id = #{memberId}
+	 		</if>
+			 <if test="symbol != null  and  symbol  != ''">
+				 and symbol = #{symbol}
+			 </if>
+		 </where>
+	</select>
+
+
+	<select id="selectAllBlockAddressBySymbolAndTag" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select * from member_coin_address
+		where is_biyict = 1
+		<if test="symbol != null  and  symbol  != ''">
+			and symbol = #{symbol}
+		</if>
+		<if test="tag != null  and  tag  != ''">
+			and tag = #{tag}
+		</if>
+	</select>
+
+	<select id="selectAllBlockAddressBySymbol" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select * from member_coin_address
+		where symbol=#{symbol}
+	</select>
+
+	<select id="selectAllSymbolAddress" resultType="string" parameterType="map">
+		select address from member_coin_address where symbol =#{symbol}
+		<if test="tag!=null and tag !=''">
+			and tag = #{tag}
+		</if>
+	</select>
+
+	<select id="selectCoinAddressByAddressAndSymbolTag" resultType="cc.mrbird.febs.blockchain.entity.MemberCoinAddressEntity">
+		select *
+		from member_coin_address
+		<where>
+			is_biyict = 1
+			<if test="symbol != null  and  symbol  != ''">
+				and symbol = #{symbol}
+			</if>
+			<if test="address != null  and  address  != ''">
+				and address = #{address}
+			</if>
+			<if test="tag != null  and  tag  != ''">
+				and tag = #{tag}
+			</if>
+		</where>
+	</select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.1