From 5ab1a38d6fb2532b26311a4e2f9fd5120227a303 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 14 Jul 2025 21:03:13 +0800
Subject: [PATCH] 地址

---
 src/main/java/project/contract/internal/AdminContractOrderServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/project/contract/internal/AdminContractOrderServiceImpl.java b/src/main/java/project/contract/internal/AdminContractOrderServiceImpl.java
index 633cf4d..27b0501 100644
--- a/src/main/java/project/contract/internal/AdminContractOrderServiceImpl.java
+++ b/src/main/java/project/contract/internal/AdminContractOrderServiceImpl.java
@@ -18,13 +18,13 @@
 		StringBuffer queryString = new StringBuffer(
 				"SELECT orders.UUID id,orders.SYMBOL symbol,orders.AMOUNT_CLOSE amount_close,orders.CLOSE_AVG_PRICE close_avg_price,"
 				+ "orders.STOP_PRICE_PROFIT stop_price_profit,orders.STOP_PRICE_LOSS stop_price_loss,"
-				+ "orders.ORDER_NO order_no,orders.TRADE_AVG_PRICE trade_avg_price,"
+				+ "orders.ORDER_NO order_no,orders.PARTY_ID party_id,orders.TRADE_AVG_PRICE trade_avg_price,"
 				+ "orders.DIRECTION direction,orders.UNIT_AMOUNT unit_amount,"
 				+ "orders.STATE state,orders.FEE fee,orders.PROFIT profit,orders.CREATE_TIME createTime,"
 				+ "orders.DEPOSIT deposit,orders.DEPOSIT_OPEN deposit_open,orders.CLOSE_TIME closeTime,"
-				+ "orders.VOLUME_OPEN volume_open,orders.VOLUME volume,item.NAME itemname,");
+				+ "orders.VOLUME_OPEN volume_open,orders.VOLUME volume,orders.LEVER_RATE as lever_rate,item.NAME itemname,");
 		queryString.append(" wallet.MONEY money,  ");
-		queryString.append(" party.USERNAME username,party.USERCODE usercode,party.ROLENAME rolename  ");
+		queryString.append(" party.USERNAME username,party.USERCODE usercode,party.ROLENAME rolename,party.REMARKS remarks  ");
 
 		queryString.append(
 				" FROM T_CONTRACT_ORDER orders LEFT JOIN PAT_PARTY party ON orders.PARTY_ID = party.UUID LEFT JOIN T_WALLET wallet ON wallet.PARTY_ID = party.UUID  LEFT JOIN T_ITEM item ON orders.SYMBOL=item.SYMBOL WHERE 1 = 1 ");
@@ -66,6 +66,7 @@
 			queryString.append("AND (party.USERNAME like:username OR party.USERCODE like:username ) ");
 			parameters.put("username","%"+username+"%");
 		}
+		queryString.append(" GROUP BY  orders.UUID  ");
 		queryString.append(" order by orders.CREATE_TIME desc ");
 		Page page = this.pagedQueryDao.pagedQuerySQL(pageNo, pageSize, queryString.toString(), parameters);
 

--
Gitblit v1.9.3