From bb146de0f32bfbbb516e1c25ff4873986d548673 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 15 Jan 2026 10:41:21 +0800
Subject: [PATCH] etf

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 0aa1aa5..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();
@@ -150,9 +150,9 @@
     }
 
     @Override
-    public Page<UserDataDto> listUserAndRecom(Page page, List<String> roleNames, String userCode, String userName, String lastIp, List<String> checkedList, String userMail, String userMobile) {
+    public Page<UserDataDto> listUserAndRecom(Page page, List<String> roleNames, String userCode, String userName, String lastIp, List<String> checkedList, String userMail, String userMobile, String recomUserName) {
         return baseMapper.listUserAndRecom(page, roleNames, userCode,
-                userName, lastIp, checkedList, userMail, userMobile);
+                userName, lastIp, checkedList, userMail, userMobile, recomUserName);
     }
 
     @Override
@@ -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