From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 77c345c..95cb1f0 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
@@ -101,9 +101,9 @@
@Override
public Page<UserDto> listUser(Page page, List<String> roleNames, String userCode, String userName,
- String userMail, String userMobile, List<String> checkedList) {
+ String userMail, String userMobile, List<String> checkedList, String recomUserName) {
- Page<UserDto> userDtoPage = baseMapper.listUser(page, roleNames, userCode, userName, userMail, userMobile, checkedList);
+ Page<UserDto> userDtoPage = baseMapper.listUser(page, roleNames, userCode, userName, userMail, userMobile, checkedList, recomUserName);
// 提现限制流水开启后，提现判断用的用户当前流水是使用UserData表的当日流水1还是使用Party表里的用户当前流水2
String withdraw_limit_open_use_type = this.sysparaService.find("withdraw_limit_open_use_type").getSvalue();
@@ -187,16 +187,16 @@
@Override
public void saveResetCreateOrder(String partyId, double money_revise, String safeword, String operator_name, String reset_type, String ip, String coin_type) {
- if (money_revise == 0 || coin_type == "") {
+ if (money_revise == 0 || coin_type.equalsIgnoreCase("")) {
return;
}
- if ("usdt".equals(coin_type) || "eur".equals(coin_type)) {
+ if ("usdt".equalsIgnoreCase(coin_type) || "eur".equalsIgnoreCase(coin_type) || "gbp".equalsIgnoreCase(coin_type)) {
// 交易所修改usdt
//到账金额
double toAmt = money_revise;
- if (coin_type.equals("eur")) {
- ExchangeRate exchangeRate = exchangeRateService.findBy(ExchangeRate.IN, "EUR");
+ if (!coin_type.equalsIgnoreCase("usdt")) {
+ ExchangeRate exchangeRate = exchangeRateService.findBy(ExchangeRate.IN, coin_type.toUpperCase());
if (exchangeRate == null) {
throw new YamiShopBindException("汇率未设置!");
}
--
Gitblit v1.9.3