From 081a25368d4ebf71f69a9e82cbdeb5108e350d4a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 30 Oct 2025 15:04:26 +0800
Subject: [PATCH] 新增美股暗池、ETF暗池
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index 3fc3892..10590c2 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -42,6 +42,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
@@ -90,8 +91,8 @@
}
@Override
- public Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType) {
- if (stockCode == null || stockCode.isEmpty() ||stockNum == null || stockNum.isEmpty() || startTime == null || startTime.isEmpty() ||endTime == null || endTime.isEmpty() || period == null || nowPrice == null){
+ public Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType) {
+ if (stockCode == null || stockCode.isEmpty() ||stockNum == null || stockNum.isEmpty() || startTime == null || startTime.isEmpty() ||endTime == null || endTime.isEmpty() || nowPrice == null){
return Result.failed("参数不能为空");
}
@@ -109,7 +110,7 @@
StockDz stockDz = new StockDz();
stockDz.setStockName(item.getSymbolFullName());
stockDz.setStockCode(item.getSymbol());
- stockDz.setStockType(item.getType());
+ stockDz.setStockType(stockType);
stockDz.setStockSpell(item.getSymbolData());
stockDz.setIsLock(0);
stockDz.setIsShow(1);
@@ -160,7 +161,7 @@
}
model.setStockName(item.getSymbolFullName());
model.setStockCode(item.getSymbol());
- model.setStockType(item.getType());
+ model.setStockType(stockDz.getStockType());
model.setStockSpell(item.getSymbolData());
return stockDzMapper.updateById(model) > 0 ? Result.succeed("修改成功") : Result.failed("修改失败");
}
@@ -195,6 +196,10 @@
DecimalFormat df = new DecimalFormat("#.##");
String resultStr = df.format(profitLoss);
dz.setProfitLoss(Double.parseDouble(resultStr));
+
+ double profitPercentage = (profitLoss / dz.getVolume()) * 100;
+ String resultPer = df.format(profitPercentage);
+ dz.setProfitLossPercentage(Double.parseDouble(resultPer));
});
}
@@ -464,7 +469,7 @@
}
Date now = new Date();
- if (stockDz.getPeriod() > 0) {
+ if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(order.getCreateTime());
calendar.add(Calendar.DATE, stockDz.getPeriod());
@@ -472,7 +477,7 @@
Date resultTime = calendar.getTime();
if(now.getTime() < resultTime.getTime()){
- throw new YamiShopBindException("Lock-up period:" + stockDz.getPeriod());
+ throw new YamiShopBindException("锁仓中");
}
}
@@ -537,7 +542,7 @@
return Result.succeed("平仓成功");
} catch (Exception e) {
log.error(e.getMessage());
- return Result.failed("操作失败:" + e.getMessage());
+ return Result.failed(e.getMessage());
}
}
--
Gitblit v1.9.3