From 775a9a9d8481dec53834483c3afd5a553e20782e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 22 Dec 2025 17:23:49 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java | 2 +-
trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java | 3 ++-
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java | 2 +-
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 19 +++++++++++++------
6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
index d7f3c11..87557f4 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
@@ -50,7 +50,7 @@
@RequestParam(value = "period", required = false) Integer period,
@RequestParam(value = "nowPrice") String nowPrice,
@RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
- return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.indices_dark, 0);
+ return stockDzService.addByAdmin(stockCode, null, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.indices_dark, 0);
}
/**
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
index a26791a..eef2f9a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
@@ -37,6 +37,7 @@
@ApiOperation("新增大宗")
@PostMapping({"addByAdmin.do"})
public Result addByAdmin(@RequestParam(value = "stockCode") String stockCode,
+ @RequestParam(value = "stockName", required = false) String stockName,
@RequestParam(value = "stockNum", required = false) String stockNum,
@RequestParam(value = "password", required = false) String password,
@RequestParam(value = "startTime") String startTime,
@@ -46,7 +47,7 @@
@RequestParam(value = "nowPrice") String nowPrice,
@RequestParam(value = "switchType", defaultValue = "0") Integer switchType,
@RequestParam(value = "dayRate", defaultValue = "0") double dayRate) {
- return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.indices, dayRate);
+ return stockDzService.addByAdmin(stockCode, stockName, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.indices, dayRate);
}
/**
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
index 11e0a62..d769ba3 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
@@ -69,7 +69,7 @@
@RequestParam(value = "period", required = false) Integer period,
@RequestParam(value = "nowPrice") String nowPrice,
@RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
- return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.US_DARK, 0);
+ return stockDzService.addByAdmin(stockCode, null, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.US_DARK, 0);
}
/**
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
index 72928e3..1f3a806 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
@@ -53,7 +53,7 @@
@RequestParam(value = "period", required = false) Integer period,
@RequestParam(value = "nowPrice") String nowPrice,
@RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
- return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.US_STOCKS, 0);
+ return stockDzService.addByAdmin(stockCode, null, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.US_STOCKS, 0);
}
/**
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
index 18df8f0..8b7e7dc 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
@@ -13,7 +13,7 @@
Result getDzList(int pageNum, int pageSize, String orderBy, String keyWords, String stockType);
- Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType, double dayRate);
+ Result addByAdmin(String stockCode, String stockName, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType, double dayRate);
Result getDzListByAdmin(int pageNum, int pageSize, String keywords, String stockType);
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 9d94c8a..bbeb177 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
@@ -91,6 +91,10 @@
if (!list.isEmpty() && list.get(0) != null) {
stockDzDto.setCurrentPrice(list.get(0).getClose());
}
+ if (stockDzDto.getDayRate() != 0) {
+ double dayRate = BigDecimal.valueOf(stockDzDto.getDayRate()).multiply(BigDecimal.valueOf(100)).doubleValue();
+ stockDzDto.setDayRate(dayRate);
+ }
});
return Result.succeed(page);
} catch (Exception e) {
@@ -100,12 +104,17 @@
}
@Override
- public Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType, double dayRate) {
+ public Result addByAdmin(String stockCode, String stockName, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType, double dayRate) {
if (stockCode == null || stockCode.isEmpty() || startTime == null || startTime.isEmpty() ||endTime == null || endTime.isEmpty() || nowPrice == null){
return Result.failed("参数不能为空");
}
- if (stockType.equalsIgnoreCase(Item.indices) && dayRate == 0) {
- return Result.failed("请输入日收益率");
+ if (stockType.equalsIgnoreCase(Item.indices)) {
+ if (dayRate == 0) {
+ return Result.failed("请输入日收益率");
+ }
+ if (stockName == null || stockName.isEmpty()){
+ return Result.failed("请输入股票名称");
+ }
}
//该类型是否已添加
@@ -118,7 +127,7 @@
StockDz stockDz = new StockDz();
if (stockType.equalsIgnoreCase(Item.indices)) {
- stockDz.setStockName(stockCode);
+ stockDz.setStockName(stockName);
stockDz.setStockCode(stockCode);
stockDz.setStockSpell(stockCode);
} else {
@@ -187,9 +196,7 @@
model.setStockSpell(item.getSymbolData());
}
} else {
- model.setStockCode(model.getStockCode());
model.setStockSpell(model.getStockCode());
- model.setStockName(model.getStockCode());
}
model.setStockType(stockDz.getStockType());
--
Gitblit v1.9.3