From 77f227d8b1d00f6507184f8cd2fdec19deacd936 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 22 Dec 2025 11:18:03 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 242 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 171 insertions(+), 71 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 c3cd310..9d94c8a 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
@@ -24,6 +24,7 @@
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.Arith;
+import com.yami.trading.common.util.DateUtils;
import com.yami.trading.common.util.RandomUtil;
import com.yami.trading.dao.dz.ExchangeApplyOrderDzMapper;
import com.yami.trading.dao.dz.StockDzMapper;
@@ -86,9 +87,9 @@
Page<StockDzDto> page = new Page<>(pageNum, pageSize);
page = stockDzMapper.findStockTypeDz(page,orderBy,keyWords,formatDate, stockType);
page.getRecords().forEach(stockDzDto -> {
- Realtime realtime = this.dataService.realtime(stockDzDto.getStockCode()).get(0);
- if (realtime != null) {
- stockDzDto.setCurrentPrice(realtime.getClose());
+ List<Realtime> list = this.dataService.realtime(stockDzDto.getStockCode());
+ if (!list.isEmpty() && list.get(0) != null) {
+ stockDzDto.setCurrentPrice(list.get(0).getClose());
}
});
return Result.succeed(page);
@@ -99,9 +100,12 @@
}
@Override
- 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){
+ 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) {
+ 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("请输入日收益率");
}
//该类型是否已添加
@@ -112,20 +116,28 @@
return Result.failed("股票代码已存在");
}
- Item item = itemService.findBySymbol(stockCode);
- if(item == null){
- return Result.failed("不存在该股票");
+ StockDz stockDz = new StockDz();
+ if (stockType.equalsIgnoreCase(Item.indices)) {
+ stockDz.setStockName(stockCode);
+ stockDz.setStockCode(stockCode);
+ stockDz.setStockSpell(stockCode);
+ } else {
+ Item item = itemService.findBySymbol(stockCode);
+ if(item == null){
+ return Result.failed("不存在该股票");
+ }
+ stockDz.setStockName(item.getSymbolFullName());
+ stockDz.setStockCode(item.getSymbol());
+ stockDz.setStockSpell(item.getSymbolData());
}
- StockDz stockDz = new StockDz();
- stockDz.setStockName(item.getSymbolFullName());
- stockDz.setStockCode(item.getSymbol());
stockDz.setStockType(stockType);
- stockDz.setStockSpell(item.getSymbolData());
stockDz.setIsLock(0);
stockDz.setIsShow(1);
stockDz.setAddTime(new Date());
- stockDz.setStockNum(Integer.valueOf(stockNum));
+ if (stockNum != null && !stockNum.isEmpty()){
+ stockDz.setStockNum(Integer.valueOf(stockNum));
+ }
stockDz.setPassword(password);
stockDz.setStartTime(DateUtil.parseDateTime(startTime));
stockDz.setEndTime(DateUtil.parseDateTime(endTime));
@@ -133,6 +145,7 @@
stockDz.setPeriod(period);
stockDz.setSwitchType(switchType);
stockDz.setNowPrice(new BigDecimal(nowPrice));
+ stockDz.setDayRate(dayRate);
if (save(stockDz)) {
return Result.succeed("添加成功");
}
@@ -160,19 +173,26 @@
return Result.failed("股票代码已存在");
}
- Item item = itemService.findBySymbol(model.getStockCode());
- if(item == null){
- return Result.failed("不存在该股票");
- }
-
StockDz stockDz = stockDzMapper.selectById(model.getUuid());
if(stockDz == null){
return Result.failed("不存在该大宗信息");
}
- model.setStockName(item.getSymbolFullName());
- model.setStockCode(item.getSymbol());
+
+ if (!stockDz.getStockType().equalsIgnoreCase(Item.indices)) {
+ Item item = itemService.findBySymbol(model.getStockCode());
+ if(item == null){
+ return Result.failed("不存在该股票");
+ } else {
+ model.setStockCode(item.getSymbol());
+ model.setStockSpell(item.getSymbolData());
+ }
+ } else {
+ model.setStockCode(model.getStockCode());
+ model.setStockSpell(model.getStockCode());
+ model.setStockName(model.getStockCode());
+ }
model.setStockType(stockDz.getStockType());
- model.setStockSpell(item.getSymbolData());
+
return stockDzMapper.updateById(model) > 0 ? Result.succeed("修改成功") : Result.failed("修改失败");
}
@@ -193,23 +213,43 @@
if (!page.getRecords().isEmpty()) {
List<ExchangeApplyOrderDzDto> list = page.getRecords();
list.forEach(dz -> {
- double closePrice;
+ double closePrice = 0;
if (state != null) { //持仓
- Realtime realtime = this.dataService.realtime(dz.getSymbol()).get(0);
- //获取现价
- closePrice = realtime.getClose();
+ List<Realtime> realtimeList = this.dataService.realtime(dz.getSymbol());
+ if (!realtimeList.isEmpty() && realtimeList.get(0) != null) {
+ //获取现价
+ closePrice = realtimeList.get(0).getClose();
+ }
} else { //已结算
closePrice = dz.getClosePrice();
}
- //盈亏
- double profitLoss = (closePrice - dz.getPrice()) * dz.getSymbolValue();
- DecimalFormat df = new DecimalFormat("#.##");
- String resultStr = df.format(profitLoss);
- dz.setProfitLoss(Double.parseDouble(resultStr));
+ if (dz.getDayRate() > 0) {
+ Date startTime = dz.getCreateTime();
+ // 计算相差天数
+ int num = com.yami.trading.common.util.DateUtil.dateNum(startTime, new Date());
+ num = Math.max(1, Math.min(num, dz.getPeriod()));
+ double dayEarnings = dz.getDayRate() * dz.getVolume();
+ double profitLoss = dayEarnings * num;
+ DecimalFormat df = new DecimalFormat("#.##");
+ String resultStr = df.format(profitLoss);
+ String resultStr2 = df.format(dayEarnings);
+ dz.setProfitLoss(Double.parseDouble(resultStr));
+ dz.setDayEarnings(Double.parseDouble(resultStr2));
- double profitPercentage = (profitLoss / dz.getVolume()) * 100;
- String resultPer = df.format(profitPercentage);
- dz.setProfitLossPercentage(Double.parseDouble(resultPer));
+ double profitPercentage = (profitLoss / dz.getVolume()) * 100;
+ String resultPer = df.format(profitPercentage);
+ dz.setProfitLossPercentage(Double.parseDouble(resultPer));
+ } else {
+ //盈亏
+ double profitLoss = (closePrice - dz.getPrice()) * dz.getSymbolValue();
+ 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));
+ }
});
}
@@ -221,11 +261,11 @@
}
@Override
- public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList) {
+ public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, String userName, List<String> checkedList) {
try {
Page page = new Page(pageNum, pageSize);
- stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, checkedList);
+ stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, userName, checkedList);
return Result.succeed(page);
} catch (Exception e) {
log.error(e.getMessage());
@@ -235,10 +275,10 @@
@Transactional
@Override
- public Result buyDz(String dzId, String password, double num, String partyId) {
+ public Result buyDz(String dzId, String password, double num, String partyId, Boolean isAdmin) {
try {
if (num <= 0) {
- throw new YamiShopBindException("请输入正确的货币数量");
+ throw new YamiShopBindException("请输入");
}
User party = userService.getById(partyId);
if (!party.isEnabled()) {
@@ -252,7 +292,6 @@
throw new YamiShopBindException("无网络");
}
}
-
StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("uuid", dzId));
if (stockDz == null) {
@@ -273,17 +312,34 @@
if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
throw new YamiShopBindException("股票价格0,请重试");
}
- if (stockDz.getStockNum() > num) {
- return Result.failed("请购买最小数量");
- }
- boolean isOpen = MarketOpenChecker.isMarketOpenBuyDz(Item.US_STOCKS);
- if (!isOpen) {
- return Result.failed("当前股市休市");
+ boolean isETF = stockDz.getStockType().equalsIgnoreCase(Item.indices);
+ if (isETF) {
+ if (stockDz.getNowPrice().doubleValue() > num) {
+ return Result.failed("请输入最小购买金额");
+ }
+ } else {
+ if (stockDz.getStockNum() > num) {
+ return Result.failed("请购买最小数量");
+ }
}
+ if (!isAdmin) { //后台买入不判断
+ if (!stockDz.getStockName().contains("测试")) {
+ boolean isOpen = MarketOpenChecker.isMarketOpenBuyDz(Item.US_STOCKS);
+ if (!isOpen) {
+ return Result.failed("当前股市休市");
+ }
+ }
+ }
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
- BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num));
+ BigDecimal buyAmt;
+ if (isETF) {
+ buyAmt = new BigDecimal(num);
+ nowPrice = buyAmt;
+ } else {
+ buyAmt = nowPrice.multiply(new BigDecimal(num));
+ }
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
@@ -362,16 +418,27 @@
exchangeApplyOrderDzMapper.updateById(order);
return Result.succeed("操作成功");
}
- if (orderNum > order.getSymbolValue()) {
- throw new YamiShopBindException("输入数量大于用户买入数量");
- }
StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("uuid", order.getDzId()));
if (stockDz == null) {
throw new YamiShopBindException("大宗不存在");
}
- BigDecimal nowPrice = stockDz.getNowPrice();
+ BigDecimal nowPrice;
+ boolean isETF = stockDz.getStockType().equalsIgnoreCase(Item.indices);
+ if (isETF) {
+ if (orderNum > order.getPrice()) {
+ throw new YamiShopBindException("输入金额大于用户买入金额");
+ }
+ nowPrice = new BigDecimal(orderNum);
+ order.setPrice(nowPrice.doubleValue());
+ } else {
+ if (orderNum > order.getSymbolValue()) {
+ throw new YamiShopBindException("输入数量大于用户买入数量");
+ }
+ nowPrice = stockDz.getNowPrice();
+ }
+
if (price > 0) {
nowPrice = BigDecimal.valueOf(price);
order.setPrice(price);
@@ -381,7 +448,10 @@
}
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
- BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(orderNum));
+ BigDecimal buyAmt = nowPrice;
+ if (!isETF) {
+ buyAmt = nowPrice.multiply(new BigDecimal(orderNum));
+ }
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
@@ -471,7 +541,7 @@
@Transactional
@Override
- public Result closeDz(String id, Double num, String partyId) {
+ public Result closeDz(String id, Double num, String partyId, Boolean isAdmin) {
try {
ExchangeApplyOrderDz order = exchangeApplyOrderDzMapper.selectById(id);
if (order == null) {
@@ -486,37 +556,55 @@
if (num < 0 || num > order.getSymbolValue()) {
throw new YamiShopBindException("数量错误");
}
+ if (partyId == null) {
+ partyId = order.getPartyId();
+ }
StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("uuid", order.getDzId()));
if (stockDz == null) {
throw new YamiShopBindException("大宗不存在");
}
- BigDecimal nowPrice = stockDz.getNowPrice();
+ BigDecimal nowPrice;
+ boolean isETF = stockDz.getStockType().equalsIgnoreCase(Item.indices);
+ if (isETF) {
+ nowPrice = BigDecimal.valueOf(order.getPrice());
+ } else {
+ nowPrice = stockDz.getNowPrice();
+ }
if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
throw new YamiShopBindException("股票价格0,请重试");
}
Date now = new Date();
- if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(order.getCreateTime());
- calendar.add(Calendar.DATE, stockDz.getPeriod());
- // 锁仓时间
- Date resultTime = calendar.getTime();
+ if (!isAdmin) {
+ if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(order.getCreateTime());
+ calendar.add(Calendar.DATE, stockDz.getPeriod());
+ // 锁仓时间
+ Date resultTime = calendar.getTime();
- if(now.getTime() < resultTime.getTime()){
- return Result.failed("未到平仓时间");
+ if(now.getTime() < resultTime.getTime()){
+ return Result.failed("未到平仓时间");
+ }
+ }
+ if (!stockDz.getStockName().contains("测试")) {
+ boolean isOpen = MarketOpenChecker.isMarketOpenByItemCloseType(Item.US_STOCKS);
+ if (!isOpen) {
+ return Result.failed("当前股市休市");
+ }
}
}
- boolean isOpen = MarketOpenChecker.isMarketOpenByItemCloseType(Item.US_STOCKS);
- if (!isOpen) {
- return Result.failed("当前股市休市");
- }
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
- BigDecimal sellAmt = nowPrice.multiply(new BigDecimal(num));
+ BigDecimal sellAmt;
+ if (isETF) {
+ sellAmt = nowPrice;
+ } else {
+ sellAmt = nowPrice.multiply(new BigDecimal(num));
+ }
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_sell_fee").getDouble();
BigDecimal orderFree = sellAmt.multiply(BigDecimal.valueOf(feeRate));
@@ -524,13 +612,25 @@
orderFree = BigDecimal.ONE;
}
-
- String symbol = stockDz.getStockCode();
- Realtime realtime = this.dataService.realtime(symbol).get(0);
- double closePrice = realtime.getClose();
-
//结算金额
- double closeAmt = closePrice * num - orderFree.doubleValue();
+ double closeAmt;
+ String symbol = stockDz.getStockCode();
+
+ double closePrice = 0;
+ if (isETF) {
+ //按日收益率结算
+ closeAmt = order.getPrice();
+ closeAmt = closeAmt + stockDz.getDayRate() * closeAmt * stockDz.getPeriod();
+ closePrice = closeAmt;
+ closeAmt = closeAmt - orderFree.doubleValue();
+ } else {
+ List<Realtime> realtimeList = this.dataService.realtime(symbol);
+ if (!realtimeList.isEmpty() && realtimeList.get(0) != null) {
+ //获取现价
+ closePrice = realtimeList.get(0).getClose();
+ }
+ closeAmt = closePrice * num - orderFree.doubleValue();
+ }
if (closeAmt < 0) {
return Result.failed("余额不足");
}
--
Gitblit v1.9.3