From a8e2e9ff1040e8668e992b97416eaad21132dae1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Dec 2024 22:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jys7-15' into jys7-15
---
src/main/java/project/project/web/admin/AdminContractOrderController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/main/java/project/project/web/admin/AdminContractOrderController.java b/src/main/java/project/project/web/admin/AdminContractOrderController.java
index af12005..26d5675 100644
--- a/src/main/java/project/project/web/admin/AdminContractOrderController.java
+++ b/src/main/java/project/project/web/admin/AdminContractOrderController.java
@@ -1,4 +1,4 @@
-package project.project.web.admin;
+package project.web.admin;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -298,7 +298,8 @@
profit = Arith.add(profit, close_line.getDeposit());
} }
Wallet wallet = this.walletService.saveWalletByPartyId(map.get("party_id").toString());
-
+ double totleMoney = wallet.getMoney();
+ profit = Arith.add(profit,totleMoney);
if (map.get("direction") != null) {
String direction = map.get("direction").toString();
@@ -354,10 +355,7 @@
try {
- if (!StringUtils.isNullOrEmpty(this.getLoginPartyId())) {
- throw new BusinessException("无权限");
- }
-
+
Realtime realtime = this.dataService.realtime(symbol).get(0);
Item item = this.itemService.cacheBySymbol(symbol, false);
@@ -407,10 +405,6 @@
try {
- if (!StringUtils.isNullOrEmpty(this.getLoginPartyId())) {
- throw new BusinessException("无权限");
- }
-
String error = this.verif(type, value);
if (!StringUtils.isNullOrEmpty(error)) {
throw new BusinessException(error);
--
Gitblit v1.9.3