From 14c1946eae86a86f8d1edee6cf3bdaf7572fc966 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 30 Oct 2025 19:44:38 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 8e0eb85..37f6804 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -112,7 +112,7 @@
@Override
public User cacheUserBy(String userId) {
- return null;
+ return getById(userId);
}
@Override
@@ -611,7 +611,7 @@
throw new YamiShopBindException("操作失败！修正后账户余额小于0。");
}
walletService.updateExtend(walletExtend.getPartyId().toString(), gift_symbol, gift_sum);
- BigDecimal amount = dataService.realtime(gift_symbol).get(0).getClose().multiply(new BigDecimal(gift_sum)).setScale(2, RoundingMode.HALF_UP);
+ BigDecimal amount = dataService.realtime(gift_symbol).get(0).getClose().multiply(new BigDecimal(gift_sum)).setScale(2, RoundingMode.DOWN);
userDataService.saveGiftMoneyHandle(wallet.getUserId(), amount.doubleValue());
/*
@@ -638,7 +638,7 @@
}
@Override
- public void saveRegister(String username, String password, String usercode, String safeword, String verifcode, String type) {
+ public void saveRegister(String username, String password,String phone, String usercode, String safeword, String verifcode, String type) {
username = username.trim();
password = password.trim();
if (!"null".equals(safeword) && !StringUtils.isEmptyString(safeword)) {
@@ -686,6 +686,8 @@
party.setUserLevel(userLevel);
party.setSafePassword(this.passwordEncoder.encode(safeword));
party.setRoleName(Constants.SECURITY_ROLE_MEMBER);
+ party.setLoginPassword(passwordEncoder.encode(password));
+ party.setUserMobile(phone);
save(party);
// if (reg.getUsername().indexOf("@") == -1) {
if (type.equals("1")) {
@@ -751,7 +753,7 @@
if (Arith.add(gift_sum, walletExtend.getAmount()) < 0.0D) {
throw new YamiShopBindException("操作失败！修正后账户余额小于0。");
}
- BigDecimal amount = dataService.realtime(gift_symbol).get(0).getClose().multiply(new BigDecimal(gift_sum)).setScale(2, RoundingMode.HALF_UP);
+ BigDecimal amount = dataService.realtime(gift_symbol).get(0).getClose().multiply(new BigDecimal(gift_sum)).setScale(2, RoundingMode.DOWN);
userDataService.saveGiftMoneyHandle(wallet.getUserId(), amount.doubleValue()); // 保存账变日志
// MoneyLog moneyLog = new MoneyLog();
// moneyLog.setCategory(Constants.MONEYLOG_CATEGORY_COIN);
@@ -1107,6 +1109,21 @@
lockMoney = Double.valueOf(map.get("lockMoney").toString());
freezeMoney = Double.valueOf(map.get("freezeMoney").toString());
walletService.updateWithLockAndFreeze(wallet.getUserId().toString(), changeMoney, lockMoney, freezeMoney);
+ }else if("capitalusdt".equals(coinType)){
+ CapitaltWallet capitaltWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
+ amount_before = capitaltWallet.getMoney().doubleValue();
+ lock_amount_before = capitaltWallet.getLockMoney().doubleValue();
+ freeze_amount_before = capitaltWallet.getFreezeMoney().doubleValue();
+ Map<String, Object> map = checkChangeMoney(moneyRevise, resetType, amount_before, lock_amount_before, freeze_amount_before);
+ changeMoney = Double.valueOf(map.get("changeMoney").toString());
+ lockMoney = Double.valueOf(map.get("lockMoney").toString());
+ freezeMoney = Double.valueOf(map.get("freezeMoney").toString());
+
+ capitaltWallet.setMoney(new BigDecimal(Arith.add(capitaltWallet.getMoney().doubleValue(), changeMoney)));
+ capitaltWallet.setLockMoney(new BigDecimal(Arith.add(capitaltWallet.getLockMoney().doubleValue(), lockMoney)));
+ capitaltWallet.setFreezeMoney(new BigDecimal(Arith.add(capitaltWallet.getFreezeMoney().doubleValue(), freezeMoney)));
+ capitaltWalletMapper.updateById(capitaltWallet);
} else {
WalletExtend walletExtend = this.walletService.saveExtendByPara(partyId, coinType);
amount_before = walletExtend.getAmount();
@@ -1415,7 +1432,7 @@
if (!walletExtendService.saveOrUpdate(walletExtend)) {
throw new YamiShopBindException("操作钱包失败！");
}
- BigDecimal amount = dataService.realtime(gift_symbol).get(0).getClose().multiply(new BigDecimal(gift_sum)).setScale(2, RoundingMode.HALF_UP);
+ BigDecimal amount = dataService.realtime(gift_symbol).get(0).getClose().multiply(new BigDecimal(gift_sum)).setScale(2, RoundingMode.DOWN);
userDataService.saveGiftMoneyHandle(wallet.getUserId(), amount.doubleValue());
// 保存账变日志
--
Gitblit v1.9.3