change xct to xcc

Helius

2021-11-29 c8cd5a4e1891407c38bc63d4167f6288747e5eca

change xct to xcc

 src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java

@@ -6,5 +6,5 @@
 * @author wzy
 */
public enum CoinTypeEnum {
    USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC, XCT
    USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC, XCC
}

 src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java

@@ -7,7 +7,7 @@
 */
@Getter
public enum SymbolEnum {
    XCT("XCT", "XCT/USDT")
    XCC("XCC", "XCC/USDT")
    ,BTC("BTC", "BTC/USDT")
    ,ETH("ETH", "ETH/USDT")
    ,LTC("LTC", "LTC/USDT")

 src/main/java/com/xcong/excoin/modules/blackchain/model/EthUsdtChargeDto.java

@@ -18,7 +18,7 @@
    public interface Symbol{
        String USDT_ERC20 = "USDT_ERC20";
        String USDT_TRC20 = "USDT_TRC20";
        String COIN_TRC20 = "XCT_TRC20";
        String COIN_TRC20 = "XCC_TRC20";
    }

    public EthUsdtChargeDto() {

 src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java

@@ -191,7 +191,7 @@
                            // 发送新增的地址到监听集合

                            usdtUpdateProducer.sendAddressMsg(address+","+"ERC20");

                        } else if ("TRC20".equals(lable)) {

                            MemberCoinAddressEntity coinAddress = memberMapper.selectBlockAddress(Long.parseLong(mId), CoinTypeEnum.XCT.name());

                            MemberCoinAddressEntity coinAddress = memberMapper.selectBlockAddress(Long.parseLong(mId), CoinTypeEnum.XCC.name());

                            if (coinAddress != null) {

                                address = coinAddress.getAddress();

                                key = coinAddress.getPrivateKey();

@@ -209,7 +209,7 @@
                        address = RocService.createWallet();

                        map.put("address", address);

                        break;

                    case "XCT" :

                    case "XCC" :

                        MemberCoinAddressEntity trc20Usdt = memberMapper.selectBlockAddressWithTag(Long.parseLong(mId), CoinTypeEnum.USDT.name(), "TRC20");

                        if (trc20Usdt != null) {

                            address = trc20Usdt.getAddress();

@@ -234,7 +234,7 @@
                coinAddress.setPrivateKey(key);

                coinAddress.setSymbol(symbol);

                coinAddress.setLabel(uuid);

                if (symbol.equals("USDT") || "XCT".equals(symbol)) {

                if (symbol.equals("USDT") || "XCC".equals(symbol)) {

                    coinAddress.setTag(lable);

                }




 src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java

@@ -45,7 +45,7 @@
    /**
     * 代币合约地址
     */
    public static String COIN_CONTRACT_ADDRESS = "TRTE68V3TJBLduBoJPLMgBsvwkq8LJBin6";
    public static String COIN_CONTRACT_ADDRESS = "TL2pea32CTtxJ48pJmnLQuoRHeoX79dLCT";
    /**
     * 手续费
     */
@@ -360,7 +360,7 @@
    }

    public boolean poolCoin(String address) {
        MemberCoinAddressEntity coinAddress = memberCoinAddressDao.selectCoinAddressByAddressAndSymbol(address, CoinTypeEnum.XCT.name());
        MemberCoinAddressEntity coinAddress = memberCoinAddressDao.selectCoinAddressByAddressAndSymbol(address, CoinTypeEnum.XCC.name());
        if (coinAddress == null) {
            return false;
        }

 src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java

@@ -49,12 +49,12 @@
    @PostMapping(value = "/add")
    @Transactional(rollbackFor = Exception.class)
    public Result add(@RequestBody GbzAddDto gbzAddDto) {
//        String status = redisUtils.getString("xct_order_status");
//        String status = redisUtils.getString("xcc_order_status");
//        if ("1".equals(status)) {
//            return Result.fail("无法购买");
//        }

        String start = redisUtils.getString("xct_start");
        String start = redisUtils.getString("xcc_start");
        if ("2".equals(start)) {
            return Result.fail("暂无法购买");
        }
@@ -63,9 +63,9 @@
            return Result.fail("最少购买数量为10个");
        }

        String total = redisUtils.getString("xct_coin_total");
        String total = redisUtils.getString("xcc_coin_total");
        MemberEntity loginUser = LoginUserUtils.getAppLoginUser();
        BigDecimal price = new BigDecimal(redisUtils.getString("xct_order_new_price"));
        BigDecimal price = new BigDecimal(redisUtils.getString("xcc_order_new_price"));
        BigDecimal amount = BigDecimal.valueOf(gbzAddDto.getCount()).multiply(price);

        MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(loginUser.getId(), CoinTypeEnum.USDT.name());
@@ -74,7 +74,7 @@
        }

        if (Integer.parseInt(total) < gbzAddDto.getCount()) {
            return Result.fail("XCT数量不足");
            return Result.fail("XCC数量不足");
        }

        GbzOrderEntity gbzOrder = new GbzOrderEntity();
@@ -82,13 +82,13 @@
        gbzOrder.setAmount(amount);
        gbzOrder.setCnt(gbzAddDto.getCount());
        gbzOrder.setMemberId(loginUser.getId());
        gbzOrder.setSymbol(CoinTypeEnum.XCT.name());
        gbzOrder.setSymbol(CoinTypeEnum.XCC.name());
        gbzOrder.setStatus(1);

        gbzOrderDao.insert(gbzOrder);

        memberWalletCoinDao.updateBlockBalance(wallet.getId(), amount.negate(), BigDecimal.ZERO, 0);
        redisUtils.set("xct_coin_total", Integer.parseInt(total) - gbzAddDto.getCount());
        redisUtils.set("xcc_coin_total", Integer.parseInt(total) - gbzAddDto.getCount());
        LogRecordUtils.insertMemberAccountMoneyChange(loginUser.getId(), "购买BEA", amount, "USDT", 1, 1);
        return Result.ok("购买成功");
    }
@@ -113,14 +113,14 @@
    @GetMapping(value = "/findPrice")
    public Result findPrice() {
        PriceVo priceVo = new PriceVo();
        String newPriceStr = redisUtils.getString("xct_order_new_price");
        String newPriceStr = redisUtils.getString("xcc_order_new_price");
        priceVo.setNewPrice(StrUtil.isNotBlank(newPriceStr) ? new BigDecimal(newPriceStr) : AppContants.DEFAULT_PRICE);

        String status = redisUtils.getString("xct_order_status");
        String status = redisUtils.getString("xcc_order_status");
        priceVo.setStatus(StrUtil.isNotBlank(status) ? Integer.parseInt(status) : 2);


        String remain = redisUtils.getString("xct_coin_total");
        String remain = redisUtils.getString("xcc_coin_total");
        priceVo.setRemainCnt(280000);

        BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId());
@@ -131,7 +131,7 @@
    @ApiOperation(value = "提取到资产")
    @PostMapping(value = "/changeWallet")
    public Result changeWallet() {
        String status = redisUtils.getString("xct_order_status");
        String status = redisUtils.getString("xcc_order_status");
        if (!"1".equals(status)) {
            return Result.fail("暂无法划转");
        }
@@ -144,11 +144,11 @@
        }

        MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), CoinTypeEnum
                .XCT.name());
                .XCC.name());
        memberWalletCoinDao.updateBlockBalance(wallet.getId(), totalAmount, BigDecimal.ZERO, 0);

        gbzOrderDao.updateStatus(member.getId());
        LogRecordUtils.insertMemberAccountMoneyChange(member.getId(), "提取BEA到资产", totalAmount, "XCT", 1, 1);
        LogRecordUtils.insertMemberAccountMoneyChange(member.getId(), "提取BEA到资产", totalAmount, "XCC", 1, 1);
        return Result.ok("提取成功");
    }
}

 src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java

@@ -69,7 +69,7 @@
    @SubmitRepeat

    public Result submitSalesWalletCoinOrder(@RequestBody @Valid SubmitSalesWalletCoinOrderDto submitSalesWalletCoinOrderDto) {

        log.debug("买卖单参数[{}]", JSONObject.toJSONString(submitSalesWalletCoinOrderDto));

        String status = redisUtils.getString("xct_start");

        String status = redisUtils.getString("xcc_start");

        if ("1".equals(status)) {

            return Result.fail("暂未开放");

        }


 src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java

@@ -485,7 +485,7 @@
        }
        Long memberId = memberCoinAddress.getMemberId();
        // 查询钱包 并更新
        MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
        MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
        if (walletCoinEntity == null) {
            // 创建一个钱包
            // 创建这个钱包
@@ -501,15 +501,15 @@

        memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), balance, BigDecimal.ZERO, 0);

        String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.XCT.name(), "", BigDecimal.ZERO, null);
        String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.XCC.name(), "", BigDecimal.ZERO, null);
        // 插入财务记录
        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.XCT.name(), 1, 1);
        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.XCC.name(), 1, 1);

        try {
            ThreadPoolUtils.sendDingTalk(5);
            MemberEntity member = memberDao.selectById(memberId);
            if (StrUtil.isNotBlank(member.getPhone())) {
                String amount = balance.toPlainString() + "XCT";
                String amount = balance.toPlainString() + "XCC";
                Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
            } else {
                SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);

 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java

@@ -809,7 +809,7 @@


    @Override

    public Result findAllWalletCoinOrder() {

        List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.XCT.toString());

        List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.XCC.toString());

        return Result.ok(orderCoinsDealEntities);

    }




 src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java

@@ -66,7 +66,7 @@
        //1:金币兑换1代币 2：1代币兑换金币
        if(type == 1){
            MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
            if(balance.compareTo(memberAccountGold.getAvailableBalance()) > 0){
                return Result.fail("金币不足");
            }
@@ -88,7 +88,7 @@
            cannonAccountMoneyChangeDao.insert(cannonAccountMoneyChange);
        }else if(type == 2){
            MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
            if(balance.compareTo(memberWalletCoinEntity.getAvailableBalance()) > 0){
                return Result.fail("代币不足");
            }
@@ -269,12 +269,12 @@
    public Result getAccountAvaBanlace() {
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
        MemberWalletCoinEntity memberWalletCoinEntityXCT = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
        MemberWalletCoinEntity memberWalletCoinEntityXCC = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
        MemberWalletCoinEntity memberWalletCoinEntityUSDT = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
        AccountAvaBanlaceVo accountAvaBanlaceVo = new AccountAvaBanlaceVo();
//        accountAvaBanlaceVo.setMemberId(memberId);
        accountAvaBanlaceVo.setGoldAvailableBalance(memberAccountGold.getAvailableBalance() == null?BigDecimal.ZERO:memberAccountGold.getAvailableBalance());
        accountAvaBanlaceVo.setCoinAvailableBalance(memberWalletCoinEntityXCT.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityXCT.getAvailableBalance());
        accountAvaBanlaceVo.setCoinAvailableBalance(memberWalletCoinEntityXCC.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityXCC.getAvailableBalance());
        accountAvaBanlaceVo.setUsdtAvailableBalance(memberWalletCoinEntityUSDT.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityUSDT.getAvailableBalance());
        return Result.ok(accountAvaBanlaceVo);
    }

 src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java

@@ -5,8 +5,8 @@

public class SymbolsConstats {
    public final  static List<String> EXCHANGE_SYMBOLS = new ArrayList<>();
    public final  static String ROC = "XCT";
    public final  static String ROC = "XCC";
    static {
        EXCHANGE_SYMBOLS.add("XCT");
        EXCHANGE_SYMBOLS.add("XCC");
    }
}

 src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java

@@ -382,7 +382,7 @@
            kLine.setLow(kLine.getClose());
            kLine.setHigh(kLine.getClose());
            kLine.setVolume(BigDecimal.ZERO);
            redisUtils.set("XCT/USDT",kLine);
            redisUtils.set("XCC/USDT",kLine);
        }
    }


 src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java

@@ -52,7 +52,7 @@
    @RabbitListener(queues = RabbitMqConfig.QUEUE_TRADE_PLATE)
    public void tradePlate(String content) {
        //log.info("--发送盘口消息--");
        tradePlateSendWebSocket.sendMessagePlate("XCT/USDT",content,null);
        tradePlateSendWebSocket.sendMessagePlate("XCC/USDT",content,null);
    }

    /**

 src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java

@@ -22,8 +22,8 @@
                return "EOS/USDT";
            case "etcusdt":
                return "ETC/USDT";
            case "xctusdt":
                return "XCT/USDT";
            case "xccusdt":
                return "XCC/USDT";
            default:
                return null;
        }
@@ -33,8 +33,8 @@
        switch (symbol) {
            case "BTC/USDT":
                return "btcusdt";
            case "XCT/USDT":
                return "xctusdt";
            case "XCC/USDT":
                return "xccusdt";
            default:
                return null;
        }
@@ -56,7 +56,7 @@
                return "EOS_NEW_PRICE";
            case "ETC/USDT":
                return "ETC_NEW_PRICE";
            case "XCT/USDT":
            case "XCC/USDT":
                return "BEA_NEW_PRICE";
            default:
                return null;

 src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java

@@ -98,7 +98,7 @@
            // 发送订阅消息
            String nekk = factory.getTrader(SymbolsConstats.ROC).sendTradePlateMessage();
            SubResultModel subResultModel = new SubResultModel();
            subResultModel.setId("xctusdt");
            subResultModel.setId("xccusdt");
            subResultModel.setSubbed(sub);
            synchronized (session) {
                try {
@@ -220,7 +220,7 @@
            String key = "KINE_{}_{}";
            // 币币k线数据
            //key = StrUtil.format(key, symbol, period);
            key = StrUtil.format(key, "XCT/USDT", period);
            key = StrUtil.format(key, "XCC/USDT", period);
            RedisUtils bean = SpringContextHolder.getBean(RedisUtils.class);
            Object o = bean.get(key);
            List<CandlestickModel> candlestickModels = new ArrayList<>();

 src/main/resources/logback-spring.xml

@@ -2,7 +2,7 @@
<configuration>
    <contextName>logback</contextName>
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="XCT/logs" />
    <property name="log.path" value="XCC/logs" />
<!--    <springProperty scope="context" name="log.path" source="logging.file.path"/>-->

    <!-- 彩色日志 -->

 src/test/java/com/xcong/excoin/HuobiTest.java

@@ -73,7 +73,7 @@
        //1:金币兑换1代币 2：1代币兑换金币
        if(type == 1){
            MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
            if(balance.compareTo(memberAccountGold.getAvailableBalance()) > 0){
//                return Result.fail("金币不足");
            }
@@ -95,7 +95,7 @@
            cannonAccountMoneyChangeDao.insert(cannonAccountMoneyChange);
        }else if(type == 2){
            MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
            if(balance.compareTo(memberWalletCoinEntity.getAvailableBalance()) > 0){
//                return Result.fail("代币不足");
            }