From dabd9aefb6fc484837865bc93aa9782e3fe3a543 Mon Sep 17 00:00:00 2001
From: dorion <872354125@qq.com>
Date: Mon, 20 May 2024 01:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=BD=AC=E6=8C=87=E5=AE=9Atr?=
 =?UTF-8?q?x=E6=95=B0=E9=87=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/trx2Energy/tenant/add.html      |  2 +-
 .../templates/usdt2Trx/exchange/add.html      |  9 +++++++-
 .../templates/usdt2Trx/exchange/usdt.html     | 22 ++++++++++++++----
 .../handler/Usdt2TrxTransferHandler.java      |  4 ++--
 .../impl/UsdtExchangeInfoServiceImpl.java     | 23 ++++++++++++-------
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
index ea0987b6c..c42b4d10e 100644
--- a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
+++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
@@ -26,7 +26,7 @@
             <label class="col-sm-3 control-label">套餐类型：</label>
             <div class="col-sm-8">
                 <select name="energyBusiType" class="form-control m-b" th:with="type=${@dict.getType('sys_energy_busi_type')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    <option th:each="dict : ${type}" th:unless="${dict.dictValue == '1' || dict.dictValue == '2'}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html
index 405917089..bf757551b 100644
--- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html
+++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html
@@ -10,7 +10,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">付款地址：</label>
                 <div class="col-sm-8">
-                    <input name="fromAddress" class="form-control" type="text">
+                    <input name="fromAddress" class="form-control" type="text" required>
                 </div>
             </div>
 
@@ -22,6 +22,13 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <label class="col-sm-3 control-label">转出金额TRX：</label>
+                <div class="col-sm-8">
+                    <input name="trxAmount" class="form-control" type="text">
+                </div>
+            </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html
index bf9a2d2ab..30627ca1b 100644
--- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html
+++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html
@@ -107,11 +107,23 @@
                 },
                 {
                     field: 'usdtAmount',
-                    title: '转入金额'
+                    title: '转入金额',
+                    formatter: function (value, row, index) {
+                        if (value == null) {
+                            return value;
+                        }
+                        return value + ' USDT' ;
+                    }
                 },
                 {
                     field: 'trxAmount',
-                    title: '转出金额'
+                    title: '转出金额',
+                    formatter: function (value, row, index) {
+                        if (value == null) {
+                            return value;
+                        }
+                        return value + ' TRX' ;
+                    }
                 },
                 {
                     field: 'exchangeRate',
@@ -119,7 +131,8 @@
                 },
                 {
                     field: 'trxTxId',
-                    title: 'TRX订单'
+                    title: 'TRX订单',
+                    visible: false
                 },
                 {
                     field: 'orginalExchangeRate',
@@ -136,7 +149,8 @@
                 },
                 {
                     field: 'lcd',
-                    title: '更新时间'
+                    title: '更新时间',
+                    visible: false
                 },
                 {
                     field: 'lcu',
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/handler/Usdt2TrxTransferHandler.java b/ruoyi-system/src/main/java/com/ruoyi/system/handler/Usdt2TrxTransferHandler.java
index 13af0e93a..412571670 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/handler/Usdt2TrxTransferHandler.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/handler/Usdt2TrxTransferHandler.java
@@ -193,8 +193,8 @@ public class Usdt2TrxTransferHandler {
                 .setUsdtTxId(transactionId)
                 .setUsdtAmount(transferValue)
                 .setTrxAmount(trxValue)
-                .setExchangeRate(oneUsdtToTrxPair.getFirst())
-                .setOrginalExchangeRate(oneUsdtToTrxPair.getSecond())
+                .setExchangeRate(oneUsdtToTrxPair == null ? null : oneUsdtToTrxPair.getFirst())
+                .setOrginalExchangeRate(oneUsdtToTrxPair == null ? null :oneUsdtToTrxPair.getSecond())
                 .setTrxTxId(txId)
                 .setFcu("system")
                 .setLcu("system");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java
index e82f94f08..660391af0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java
@@ -70,20 +70,27 @@ public class UsdtExchangeInfoServiceImpl implements IUsdtExchangeInfoService {
      */
     @Override
     public int insertUsdtExchangeInfo(UsdtExchangeInfo usdtExchangeInfo) throws Exception {
-        BigDecimal oneUsdtToTrx;
-        String systronApiSwitch = configService.selectConfigByKey("sys.tron.api");
+
+        BigDecimal usdtAmount = usdtExchangeInfo.getUsdtAmount();
+        BigDecimal trxAmount = usdtExchangeInfo.getTrxAmount();
+        Preconditions.checkState(usdtAmount != null ^ trxAmount != null, "转入USDT和转出TR数量不能同时录入,也不能同时为空");
         Pair<BigDecimal, BigDecimal> oneUsdtToTrxPair = null;
-        if (UserConstants.YES.equals(systronApiSwitch)) {
+        BigDecimal trxValue = null;
+        if (usdtAmount != null) {
+            String systronApiSwitch = configService.selectConfigByKey("sys.tron.api");
+
+            if (UserConstants.YES.equals(systronApiSwitch)) {
 //            oneUsdtToTrx = usdt2TrxTransferHandler.getOneUsdtToTrx().getFirst();
-            oneUsdtToTrxPair = usdt2TrxTransferHandler.getOneUsdtToTrx();
+                oneUsdtToTrxPair = usdt2TrxTransferHandler.getOneUsdtToTrx();
+            } else {
+                oneUsdtToTrxPair = Pair.of(BigDecimal.TEN, BigDecimal.TEN);
+            }
+            trxValue = usdtAmount.multiply(oneUsdtToTrxPair.getFirst());
         } else {
-            oneUsdtToTrxPair=Pair.of(BigDecimal.TEN,BigDecimal.TEN);
+            trxValue = trxAmount;
         }
 
 
-        BigDecimal usdtAmount = usdtExchangeInfo.getUsdtAmount();
-
-        BigDecimal trxValue = usdtAmount.multiply(oneUsdtToTrxPair.getFirst());
         String accountAddress = usdtExchangeInfo.getAccountAddress();
         if (StringUtils.isEmpty(accountAddress)) {
             AccountAddressInfo accountAddressInfoExample = new AccountAddressInfo();