From d05bf8e5ef3437c6fa18ef64458e84c590313b61 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 03 Sep 2024 02:54:17 +0800
Subject: [PATCH] 1
---
src/main/java/project/contract/internal/ContractOrderServiceImpl.java | 6 +++---
src/main/java/project/project/web/admin/AdminMarketQuotationsManageController.java | 5 +----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/project/contract/internal/ContractOrderServiceImpl.java b/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
index 6e52861..2984582 100644
--- a/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
+++ b/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
@@ -330,9 +330,9 @@
double rate = Arith.div(volume, order.getVolume_open());
//平仓收益
- double mul = Arith.mul(order.getDeposit_open(), order.getLever_rate());//仓位
- double div = Arith.div(mul, order.getTrade_avg_price());//持有币的数量
- double amount = Arith.mul(div, Arith.sub(order.getClose_avg_price(), order.getTrade_avg_price()));
+// double mul = Arith.mul(order.getDeposit_open(), order.getLever_rate());//仓位
+// double div = Arith.div(mul, order.getTrade_avg_price());//持有币的数量
+// double amount = Arith.mul(div, Arith.sub(order.getClose_avg_price(), order.getTrade_avg_price()));
profit = Arith.add(Arith.mul(order.getDeposit_open(),rate),Arith.mul(order.getProfit(),rate));
order.setAmount_close(Arith.add(order.getAmount_close(), profit));
diff --git a/src/main/java/project/project/web/admin/AdminMarketQuotationsManageController.java b/src/main/java/project/project/web/admin/AdminMarketQuotationsManageController.java
index 3c39a72..1c1f3e5 100644
--- a/src/main/java/project/project/web/admin/AdminMarketQuotationsManageController.java
+++ b/src/main/java/project/project/web/admin/AdminMarketQuotationsManageController.java
@@ -1,4 +1,4 @@
-package project.project.web.admin;
+package project.web.admin;
import java.math.BigDecimal;
import java.text.MessageFormat;
@@ -91,9 +91,6 @@
*/
@RequestMapping(action + "showModal.action")
public String showModal(HttpServletRequest request) {
- if (!StringUtils.isNullOrEmpty(getLoginPartyId())) {
- return "";
- }
String symbol = request.getParameter("symbol");
--
Gitblit v1.9.3