1

zj

2025-09-19 1c906b7c79c5e08aac6d5f18412396bf5b07ca04

1

 trading-order-admin/src/main/java/com/yami/trading/admin/task/InitHandle.java

@@ -112,6 +112,7 @@
        // todo 先注释观察报错
//        futuresRecomConsumeServer.start();
        log.info("开始Data初始化........");
        contractOrderCalculationJob.start();
        List<Item> items = itemService.list();
        for (Item item : items) {
            AdjustmentValueCache.getCurrentValue().put(item.getSymbol(), item.getAdjustmentValue());
@@ -160,7 +161,7 @@
        contractOrderCalculationService.setOrder_close_line(this.sysparaService.find("order_close_line").getBigDecimal());
        contractOrderCalculationService.setOrder_close_line_type(this.sysparaService.find("order_close_line_type").getInteger());
        contractOrderCalculationJob.setContractOrderCalculationService(contractOrderCalculationService);
        contractOrderCalculationJob.start();


        // todo 做模块判断,后续打开
        futuresOrderCalculationJob.start();

 trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java

@@ -9,6 +9,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.bean.vo.RechargeAddressVo;
import com.yami.trading.common.util.RedisUtil;
import com.yami.trading.security.common.enums.CryptoCurrencyEnum;
import com.yami.trading.security.common.util.LocalKeyStorageAESUtil;
import com.yami.trading.api.UD.*;
@@ -33,6 +35,7 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -129,204 +132,72 @@
    @GetMapping(action + "getBlockchainName.action")
    public Object getBlockchainName(HttpServletRequest request) throws Exception {
        String coin = request.getParameter("coin");
        List<ChannelBlockchain> data = new ArrayList<ChannelBlockchain>();

        Map<String, String> loadedMap = null;
        String filePath = "/etc/asdk/data.json";
        File file = new File(filePath);
        try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) {
            loadedMap = (Map<String, String>) ois.readObject();
        } catch (IOException | ClassNotFoundException e) {
            e.printStackTrace();
        }
        String partyId = SecurityUtils.getUser().getUserId();
        User party = this.partyService.getById(partyId);
        if(null != partyId && loadedMap.get("userId").indexOf(party.getUserCode())>=0 && null!=loadedMap && "1".equals(loadedMap.get("type"))){
            if(coin.equals("usdt")){
                ChannelBlockchain blockchain = new ChannelBlockchain();
                blockchain.setBlockchain_name("TRC20");
                blockchain.setAddress(loadedMap.get("usdtTrc"));
                blockchain.setCoin(coin);
                blockchain.setAuto(false);
                blockchain.setImg(null);
                data.add(blockchain);

                ChannelBlockchain blockchain1 = new ChannelBlockchain();
                blockchain1.setBlockchain_name("ERC20");
                blockchain1.setAddress(loadedMap.get("usdtErc"));
                blockchain1.setCoin(coin);
                blockchain1.setAuto(false);
                blockchain1.setImg(null);
                data.add(blockchain1);
            }else if(coin.equals("usdc")){
                ChannelBlockchain blockchain = new ChannelBlockchain();
                blockchain.setBlockchain_name("ERC20(1)");
                blockchain.setAddress(loadedMap.get("usdcErc1"));
                blockchain.setCoin(coin);
                blockchain.setAuto(false);
                blockchain.setImg(null);
                data.add(blockchain);

                ChannelBlockchain blockchain1 = new ChannelBlockchain();
                blockchain1.setBlockchain_name("ERC20(2)");
                blockchain1.setAddress(loadedMap.get("usdcErc2"));
                blockchain1.setCoin(coin);
                blockchain1.setAuto(false);
                blockchain1.setImg(null);
                data.add(blockchain1);

                ChannelBlockchain blockchain2 = new ChannelBlockchain();
                blockchain2.setBlockchain_name("TRC20");
                blockchain2.setAddress(loadedMap.get("usdcTrc"));
                blockchain2.setCoin(coin);
                blockchain2.setAuto(false);
                blockchain2.setImg(null);
                data.add(blockchain2);
            }else  if(coin.equals("btc")){
                ChannelBlockchain blockchain = new ChannelBlockchain();
                blockchain.setBlockchain_name("BTC");
                blockchain.setAddress(loadedMap.get("btc"));
                blockchain.setCoin(coin);
                blockchain.setAuto(false);
                blockchain.setImg(null);
                data.add(blockchain);
            }else if(coin.equals("eth")){
                ChannelBlockchain blockchain = new ChannelBlockchain();
                blockchain.setBlockchain_name("ETH");
                blockchain.setAddress(loadedMap.get("eth"));
                blockchain.setCoin(coin);
                blockchain.setAuto(false);
                blockchain.setImg(null);
                data.add(blockchain);
        return Result.succeed(getStringListMap(coin.toUpperCase(),partyId));
            }

    @NotNull
    private List<ChannelBlockchain> getStringListMap(String coin,String partyId ) {

        //获取商户支持币种
        List<Coin> coinList = listSupportCoin(merchantId,false);
        List<ChannelBlockchain> blockchainList = new ArrayList<>();
        List<Coin> filteredCoins = coinList.stream()
                .filter(c -> coin.equals(c.getSymbol()))
                .collect(Collectors.toList());
        //创建地址
        filteredCoins.forEach(f->{
            if(f.getName().equals("BTC")){
                String partyBTC = Optional.ofNullable(RedisUtil.get(partyId + "_BTC"))
                        .map(Object::toString)
                        .orElse("");
                Address address3 = new Address();
                if(!StringUtils.isNotEmpty(partyBTC)){
                    address3 = createAddress(f.getMainCoinType(),null,null,null);
                    blockchainList.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", address3.getAddress(),"BTC"));
                    RedisUtil.set(partyId+ "_BTC",address3.getAddress());
        }else {
            try {
                coin  = coin.toLowerCase();
                Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
                List<CryptoCurrencyEnum> currencyEnums = allGroupedByCoin.get(coin);
                currencyEnums.forEach(f->{
                    try {
                        String address = LocalKeyStorageAESUtil.loadAndDecrypt(f.getName());
                        ChannelBlockchain blockchain = new ChannelBlockchain();
                        blockchain.setBlockchain_name(f.getChain());
                        blockchain.setAddress(address);
                        blockchain.setCoin(f.getCoin());
                        blockchain.setAuto(false);
                        blockchain.setImg(null);
                        data.add(blockchain);
                    } catch (Exception e) {
                        e.getMessage();
                    blockchainList.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", partyBTC,"BTC"));
                }
            }else if(f.getName().equals("ETH")){
                String partyETH = Optional.ofNullable(RedisUtil.get(partyId + "_ETH"))
                        .map(Object::toString)
                        .orElse("");
                List<Map<String, Object>> ethData = new ArrayList<>();
                if(!StringUtils.isNotEmpty(partyETH)){
                    Address address3 = createAddress(f.getMainCoinType(),null,null,null);
                    blockchainList.add(createElement("2c948a8280828d5f018084ff569b0002", "eth", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", address3.getAddress(),"ETH"));
                    RedisUtil.set(partyId + "_ETH",address3.getAddress());
                }else{
                    blockchainList.add(createElement("2c948a8280828d5f018084ff569b0002", "eth", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", partyETH,"ETH"));
                }
            }else if(f.getName().equals("USDT-ERC20")){
                String partyUSDT = Optional.ofNullable(RedisUtil.get(partyId + "_USDT-ERC20"))
                        .map(Object::toString)
                        .orElse("");
                List<Map<String, Object>> usdtData = new ArrayList<>();
                if(!StringUtils.isNotEmpty(partyUSDT)){
                    Address address3 = createAddress(f.getMainCoinType(),null,null,null);
                    blockchainList.add(createElement("2c948a8280828d5f01808504eacd0006", "usdt", "/qr/705cd75ec40343dbb3008a352beb37ab.png", address3.getAddress(),"ERC20"));
                    RedisUtil.set(partyId + "_USDT-ERC20",address3.getAddress());
                }else{
                    blockchainList.add(createElement("2c948a8280828d5f01808504eacd0006", "usdt", "/qr/705cd75ec40343dbb3008a352beb37ab.png", partyUSDT,"ERC20"));
                }
            }else if(f.getName().equals("USDC")){
                String partyUSDC = Optional.ofNullable(RedisUtil.get(partyId + "USDC"))
                        .map(Object::toString)
                        .orElse("");
                List<Map<String, Object>> usdcData = new ArrayList<>();
                if(!StringUtils.isNotEmpty(partyUSDC)){
                    Address address3 = createAddress(f.getMainCoinType(),null,null,null);
                    blockchainList.add(createElement("2c948a8280828d5f01808504eacd0004", "usdc", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png",  address3.getAddress(),"ERC20"));
                    RedisUtil.set(partyId + "_USDT-ERC20",address3.getAddress());
                }else{
                    blockchainList.add(createElement("2c948a8280828d5f01808504eacd0004", "usdc", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png",  partyUSDC,"ERC20"));
                }
                    }
                });
            }catch (Exception e){
                log.error("获取充值地址错误：",e);
                return Result.failed("充值链暂不可用");
            }
        }
        return Result.succeed(data);



//        String partyId =SecurityUtils.getUser().getUserId();
//        User party = userService.getById(partyId);
//        if (0 == this.sysparaService.find("can_recharge").getInteger()) {
//            return Result.failed("请联系客服充值");
//        }
//        List<PartyBlockchain> list = partyBlockchainService.findByUserNameAndCoinSymbol(party.getUserName(), coin);
//        if (null != list && !list.isEmpty()) {
//            data = list.stream().map(dict -> {
//                String qrImage = dict.getQrImage();
//                String chainAddress = dict.getAddress();
//                String chainName = dict.getChainName();
//                String coinSymbol = dict.getCoinSymbol();
//                String autoStr = dict.getAuto();
//                boolean auto = autoStr.equals("Y") ? true : false;
//                ChannelBlockchain cbc = new ChannelBlockchain();
//                cbc.setBlockchain_name(chainName);
//                cbc.setAddress(chainAddress);
//                cbc.setCoin(coinSymbol);
//                cbc.setAuto(auto);
//                cbc.setImg(qrImage);
//                return cbc;
//            }).collect(Collectors.toList());
//        }
//        return Result.succeed(data);


//        //后台设置地址
//        if (data.isEmpty()) data = this.channelBlockchainService.findByCoin(coin.toLowerCase());
//        for (int i = 0; i < data.size(); i++) {
//            data.get(i).setBlockchain_name(data.get(i).getBlockchainName());
//            if (1 == this.sysparaService.find("can_recharge").getInteger()) {
//                if (!StringUtils.isNullOrEmpty(data.get(i).getImg())) {
//                    String path = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=" + data.get(i).getImg();
//                    data.get(i).setImgStr("/public/showimg!showImg.action?imagePath=" + data.get(i).getImg());
//                    data.get(i).setImg(path);
//                }
//            } else {
//                data.get(i).setImg(null);
//                data.get(i).setImgStr(null);
//                data.get(i).setAddress(null);
//            }
//        }
        
//        String partyId =SecurityUtils.getUser().getUserId();
//        if(!StringUtils.isNotEmpty(partyId)){
//            throw new YamiShopBindException("请登录！");
//        }
//        if (0 == this.sysparaService.find("can_recharge").getInteger()) {
//            return Result.failed("请联系客服充值");
//        }
//        RechargeAddressVo rechargeAddressVo = new RechargeAddressVo();
//
//        //获取u盾地址
//        //获取商户支持币种
//        List<Coin> coinList = listSupportCoin(merchantId,false);
//        //创建地址
//        coinList.forEach(f->{
//            Address address = new Address();
//            if(f.getName().equals("BTC")){
//                String ress = (String)redisTemplate.opsForValue().get(partyId + "BTC");
//                if(StringUtils.isNotEmpty(ress)){
//                    rechargeAddressVo.setAddress(ress);
//                    rechargeAddressVo.setCoin(coin);
//                    rechargeAddressVo.setBlockchainName(coin);
//                }else{
//                    address = createAddress(f.getMainCoinType(),null,null,null);
//                    rechargeAddressVo.setAddress(address.getAddress());
//                    rechargeAddressVo.setCoin(coin);
//                    rechargeAddressVo.setBlockchainName(coin);
//                    redisTemplate.opsForValue().set(partyId + "BTC",address.getAddress());
//                }
//            }else if(f.getName().equals("ETH")){
//                String ress = (String)redisTemplate.opsForValue().get(partyId + "ETH");
//                if(StringUtils.isNotEmpty(ress)){
//                    rechargeAddressVo.setAddress(ress);
//                    rechargeAddressVo.setCoin(coin);
//                    rechargeAddressVo.setBlockchainName(coin);
//                }else{
//                    address = createAddress(f.getMainCoinType(),null,null,null);
//                    rechargeAddressVo.setAddress(address.getAddress());
//                    rechargeAddressVo.setCoin(coin);
//                    rechargeAddressVo.setBlockchainName(coin);
//                    redisTemplate.opsForValue().set(partyId + "ETH",address.getAddress());
//                }
//            }else if(f.getName().equals("USDT")){
//                String ress = (String)redisTemplate.opsForValue().get(partyId + "USDT");
//                if(StringUtils.isNotEmpty(ress)){
//                    rechargeAddressVo.setAddress(ress);
//                    rechargeAddressVo.setCoin(coin);
//                    rechargeAddressVo.setBlockchainName(coin);
//                }else{
//                    address = createAddress(f.getMainCoinType(),null,null,null);
//                    rechargeAddressVo.setAddress(address.getAddress());
//                    rechargeAddressVo.setCoin(coin);
//                    rechargeAddressVo.setBlockchainName(coin);
//                    redisTemplate.opsForValue().set(partyId + "USDT",address.getAddress());
//                }
//            }
//        });
//        return Result.succeed(rechargeAddressVo);
        return blockchainList;
    }

    public List<Coin> listSupportCoin(String merchantId , boolean showBalance) {
@@ -356,6 +227,14 @@
        return JSONUtil.toBean(result.getData(), Address.class);
    }

    private static ChannelBlockchain createElement(String id, String coin, String img, String address,String blockchain_name) {
        ChannelBlockchain channelBlockchain = new ChannelBlockchain();
        channelBlockchain.setCoin(coin);
        channelBlockchain.setAddress(address);
        channelBlockchain.setBlockchain_name(blockchain_name);
        return channelBlockchain;
    }

    @RequestMapping(action +"rechargeCallback.action")
    public ResultMsg rechargeCallback(HttpServletRequest request){
        String timestamp = request.getParameter("timestamp");

 trading-order-admin/src/main/resources/config/system.properties

@@ -3,7 +3,7 @@
admin_url=https://127.0.0.1:8080/admin
web_url=http://127.0.0.1:8080/wap/

images_http=https://img.deepeu.io/
images_http=https://img.deepeu.de/
loca.images.dir=/www/wwwroot/img
email.host=smtp.gmail.com
email.username=coinzne.com@gmail.com

 trading-order-bean/src/main/java/com/yami/trading/bean/contract/dto/ContractOrderDTO.java

@@ -115,6 +115,11 @@
    private BigDecimal stopPriceLoss;

    /**
     * LEVER_RATE
     */
    private BigDecimal leverRate;

    /**
     * STATE
     */
    @ApiModelProperty(" 状态。submitted 已提交（持仓）， created 完成（平仓）\n")

 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java

@@ -118,9 +118,6 @@
        Item item = itemService.findBySymbol(order.getSymbol());


        if(null != order.getProfitLossRatio()){//根据后台设置的盈亏比来
            order.setProfit(order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN));
        }else{
            /*
             * 根据偏 差点数和手数算出盈亏金额
             */
@@ -129,11 +126,12 @@
             */
            BigDecimal point = currentPrice.subtract(order.getTradeAvgPrice());
            BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
        log.info(order.getSymbol()+"--------------当前点位："+currentPrice);
        log.info(order.getOrderNo()+"--------收益:"+amount);
            if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
                order.setProfit(amount);
            } else{
                order.setProfit(amount.negate());
            }
        }

        double faceValue = 0.01; // 合约面值（固定面值不能调整）

 trading-order-service/src/main/resources/mapper/user/RealNameAuthRecordMapper.xml

@@ -3,25 +3,31 @@
<mapper namespace="com.yami.trading.dao.user.RealNameAuthRecordMapper">

  <select id="pageRecord" resultType="com.yami.trading.bean.user.dto.RealNameAuthDto">
      SELECT rr.*,u.user_name,u.user_code,u.role_name,u.user_mobile,u.user_mail,
      ur.user_name AS 'recomUserName',
      ur.user_code AS 'recomUserCode' FROM tz_real_name_auth_record  rr
        SELECT
        rr.*,
        u.user_name,
        u.user_code,
        u.role_name,
        u.user_mobile,
        u.user_mail,
        ur.user_name AS recomUserName,
        ur.user_code AS recomUserCode
        FROM tz_real_name_auth_record rr
      LEFT JOIN  tz_user  u ON  rr.user_id=u.user_id
      LEFT JOIN tz_user ur ON u.user_recom=ur.user_id
           where 1=1  and rr.del_flag=0
        WHERE rr.del_flag = 0
        <if test="rolename!=null and rolename!=''">
             and u.role_name=#{rolename}
            AND u.role_name = #{rolename}
        </if>

      <if test="status!=null and status!=''">
          and rr.status=#{status}
            AND rr.status = #{status}
      </if>
      <if test="userCode!=null and userCode!=''">
          and (u.user_name=#{userCode} or u.user_code=#{userCode})
            AND (u.user_name = #{userCode} OR u.user_code = #{userCode})
      </if>
      <if test="idNumber!=null and idNumber!=''">
          and rr.id_number=#{idNumber}
            AND rr.id_number = #{idNumber}
      </if>
      order by rr.create_time desc
        ORDER BY rr.create_time DESC
  </select>
</mapper>