zyy
2025-12-09 80047c63d7243c88cba50b217a86cf030aa2d62a
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
@@ -1,9 +1,11 @@
package com.yami.trading.api.controller.exchange;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.extra.qrcode.QrConfig;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.UD.*;
import com.yami.trading.UD.Address;
@@ -191,7 +193,7 @@
                        //缓存订单
                        RechargeBlockchainOrder recharge = new RechargeBlockchainOrder();
                        recharge.setBlockchainName(currencyEnum.getChain());
                        recharge.setSymbol(currencyEnum.getSymbol());
                        recharge.setSymbol(currencyEnum.getCoin());
                        recharge.setPartyId(partyId);
                        redisTemplate.opsForValue().set(rechargeAddressVo.getAddress(), recharge);
@@ -231,16 +233,15 @@
            double success_amount  = amounts / Math.pow(10, decimals);
            String address = map.get("address").toString();
            Integer status = Integer.valueOf(map.get("status").toString());
            /*RechargeBlockchainOrder blockchainOrder = rechargeBlockchainOrderService.getOne(new LambdaQueryWrapper<>(RechargeBlockchainOrder.class)
            Boolean isCaChe = false;
            RechargeBlockchainOrder blockchainOrder = rechargeBlockchainOrderService.getOne(new LambdaQueryWrapper<>(RechargeBlockchainOrder.class)
                    .eq(RechargeBlockchainOrder::getSucceeded, 0)
                    .eq(RechargeBlockchainOrder::getChannelAddress, address).last(" limit 1 "));
            if(ObjectUtil.isEmpty(blockchainOrder)) {
                resultMsg.setCode(200);
                return resultMsg;
            }*/
            //查询地址订单
            RechargeBlockchainOrder blockchainOrder = (RechargeBlockchainOrder)redisTemplate.opsForValue().get(address);
                isCaChe = true;
                //未提交订单取缓存订单
                blockchainOrder = (RechargeBlockchainOrder)redisTemplate.opsForValue().get(address);
            }
            if (blockchainOrder == null){
                resultMsg.setCode(200);
                return resultMsg;
@@ -251,7 +252,11 @@
            blockchainOrder.setSucceeded(0);
            blockchainOrder.setChannelAddress(address);
            blockchainOrder.setTx("");
            rechargeBlockchainOrderService.saveOrder(blockchainOrder);
            if (isCaChe) {
                rechargeBlockchainOrderService.saveOrder(blockchainOrder);
            } else {
                rechargeBlockchainOrderService.saveOrUpdate(blockchainOrder);
            }
            User user = userService.getById(blockchainOrder.getPartyId());
            log.info("===rechargeCallback==d=blockchainOrder:{}", blockchainOrder);