From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

---
 src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
index bb4ecee..116a68b 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
@@ -3,9 +3,12 @@
 public enum MemberWalletCoinEnum {
 	
 	WALLETCOINUSDT("walletCoinUsdt", "usdt"),
-	WALLETCOINLIST("walletCoinList", "walletList"),
 	WALLETCOINCNY("walletCoinCny", "cny"),
-	WALLETAGENTCNY("walletCoinCny", "wallet"),
+	
+	WALLETCOINLIST("walletCoinList", "walletList"),
+	WALLETAGENT("walletCoin", "wallet"),
+	
+	WALLETCONTRACT("walletContract", "walletContract"),
 	
 	CONTENTTOCONTRACT("0001","转出至合约账户"),
 	CONTENTFROMWALLETCOIN("0002","由币币账户转入"),
@@ -14,9 +17,40 @@
 	CONTENTFROMCONTRACT("0004","由合约账户转入"),
 	
 	CONTENTFROMAGENT("0005","由代理账户转入"),
+	ZHIYATOGUSD("0006","兑换GUSD"),
+	ZHIYATOUSDT("0007","兑换USDT"),
+
+	WALLETCOINCODE("USDT", "USDT"),
+	WALLETGUSDCOINCODE("GUSD", "GUSD"),
+
+	SUBMITSALESWALLETCOINORDER_SERVICERATE("ServiceRate","0.002"),
 	
-	WALLETCOINCODE("USDT", "USDT")
+	//SUBMITSALESWALLETCOINORDER_TYPE_S("买入","1"),
+	//SUBMITSALESWALLETCOINORDER_TYPE_B("卖出","2"),
+	//SUBMITSALESWALLETCOINORDER_TRADETYPE_S("市价","1"),
+	//SUBMITSALESWALLETCOINORDER_TRADETYPE_X("限价","2"),
+	
+	//SUBMITSALESWALLETCOINORDER_ORDERSTATUS_ONE("委托中","1"),
+	//SUBMITSALESWALLETCOINORDER_ORDERSTATUS_TWO("撤单","2"),
+	//SUBMITSALESWALLETCOINORDER_ORDERSTATUS_THREE("已成交","3"),
+	
+	
+	
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_ISCOLLECT_NO("isCollect","0"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_ISCOLLECT_YES("isCollect","1"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_SPREAD("spread","spread"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_CLOSINGRATIO("closingRatio","closingRatio"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_MEMBERMONEY("memberMoney","memberMoney"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_CURRENTPRICE("currentPrice","currentPrice"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_CNYUSDT("cnyUsdt","cnyUsdt"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_CURRENTPRICECNY("currentPriceCny","currentPriceCny"),
+	ENTERTRANSACTIONPAGEOFWALLETCOIN_BUY("buy","1")
+	
 	;
+	
+	
+	
+	
 
     private String name;
     private String value;

--
Gitblit v1.9.1