1

zj

2025-09-10 dac6081a627786eea0fb45b52a425bab75000e58

1

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java

@@ -56,7 +56,7 @@
        newsSerivce.pageNews(page,request.getTitle(),request.getLanguage(),request.getUserCode());
        for (NewsDto news:page.getRecords()){
            news.setLanguageText(Constants.LANGUAGE.get(news.getLanguage()));
            String nUrl = Constants.IMAGES_HTTP+news.getImgUrl();
            String nUrl = news.getImgUrl();
            news.setHttpImgUrl(nUrl);
        }
        return  Result.ok(page);

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

@@ -164,7 +164,7 @@
    /**
     * 交易所 转移账户冻结金额
     */
    @PostMapping(value = "resetFreeze")
    @PostMapping(value = "resetFreezess")
    @ApiOperation(("转移账户冻结金额"))
    public Result<Object> resetFreeze(@RequestBody ResetFreezeModel model) {


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

@@ -55,7 +55,7 @@

        }
        if (StringUtils.isNotEmpty(news.getImgUrl())) {
            news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
            news.setImgUrl(news.getImgUrl());
        }

        return Result.succeed(news);

 trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java

@@ -867,8 +867,32 @@
        if (accountType == 2) { //扣除
            moneyRevise = moneyRevise.negate();
        }
        walletService.updateMoney("", userId, moneyRevise, new BigDecimal(0), Constants.MONEYLOG_CATEGORY_COIN
                , coinType, accountType == 1 ? Constants.MONEYLOG_CONTENT_RECHARGE : Constants.MONEYLOG_CONTENT_WITHDRAW, "后台修改账号余额");
        if(coinType.equals("usdt")){
            walletService.updateMoney("", userId, moneyRevise, new BigDecimal(0), Constants.MONEYLOG_CATEGORY_COIN
                    , coinType, accountType == 1 ? Constants.MONEYLOG_CONTENT_RECHARGE : Constants.MONEYLOG_CONTENT_WITHDRAW, "后台修改账号余额");
        } else {
            coinType = coinType+"usdt";
            WalletExtend walletExtend = new WalletExtend();
            walletExtend = walletService.saveExtendByPara(user.getUserId(), coinType);

            double volume = moneyRevise.doubleValue();

            BigDecimal amountBefore =  new BigDecimal(walletExtend.getAmount());
            walletService.updateExtend(walletExtend.getPartyId().toString(), walletExtend.getWallettype(), volume);
            // 账变日志
            MoneyLog moneyLog = new MoneyLog();
            moneyLog.setCreateTime(new Date());
            moneyLog.setSymbol(coinType);
            moneyLog.setCategory(Constants.MONEYLOG_CATEGORY_COIN);
            moneyLog.setAmountBefore(amountBefore);
            moneyLog.setAmount(moneyRevise);
            moneyLog.setAmountAfter(amountBefore.add(moneyRevise));
            moneyLog.setUserId(userId);
            moneyLog.setWalletType(coinType);
            moneyLog.setContentType(accountType == 1 ? Constants.MONEYLOG_CONTENT_RECHARGE : Constants.MONEYLOG_CONTENT_WITHDRAW);
            moneyLog.setLog("后台修改账号余额");
            moneyLogService.save(moneyLog);
        }
    }

    public void checkGooleAuthAndSefeword(User user, String googleAuthCode, String loginSafeword) {