From ed74442294092ea3f8c29467ae8de3071852e8be Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 14 Nov 2025 17:06:01 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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..9d42b27 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
@@ -12,6 +12,7 @@
import com.yami.trading.bean.dz.ExchangeApplyOrderDz;
import com.yami.trading.bean.dz.StockDz;
import com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto;
+import com.yami.trading.bean.dz.dto.StockDzDto;
import com.yami.trading.bean.exchange.ExchangeApplyOrder;
import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.bean.model.MoneyLog;
@@ -42,6 +43,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.*;
@@ -80,8 +82,14 @@
public Result getDzList(int pageNum, int pageSize, String orderBy, String keyWords, String stockType) {
try {
String formatDate = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
- Page page = new Page(pageNum, pageSize);
- stockDzMapper.findStockTypeDz(page,orderBy,keyWords,formatDate, stockType);
+ 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());
+ }
+ });
return Result.succeed(page);
} catch (Exception e) {
log.error(e.getMessage());
@@ -90,13 +98,15 @@
}
@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("参数不能为空");
}
+ //该类型是否已添加
Long count = stockDzMapper.selectCount(new LambdaQueryWrapper<StockDz>()
- .eq(StockDz::getStockCode,stockCode));
+ .eq(StockDz::getStockCode,stockCode)
+ .eq(StockDz::getStockType,stockType));
if(count > 0){
return Result.failed("股票代码已存在");
}
@@ -109,7 +119,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 +170,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 +205,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));
});
}
@@ -258,7 +272,7 @@
throw new YamiShopBindException("股票价格0,请重试");
}
if (stockDz.getStockNum() > num) {
- throw new YamiShopBindException("最小购买数量" + stockDz.getStockNum());
+ throw new YamiShopBindException("请购买最小数量");
}
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
@@ -268,7 +282,7 @@
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
BigDecimal orderAmt = buyAmt.add(orderFree);
if (wallet.getMoney().compareTo(orderAmt) < 0) {
- throw new YamiShopBindException("订单失败，资金不足");
+ return Result.failed("余额不足");
}
BigDecimal amountBefore = wallet.getMoney();
@@ -317,7 +331,7 @@
return Result.succeed("购买成功");
} catch (Exception e) {
log.error(e.getMessage());
- return Result.failed("操作失败:" + e.getMessage());
+ return Result.failed("失败");
}
}
@@ -464,7 +478,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 +486,7 @@
Date resultTime = calendar.getTime();
if(now.getTime() < resultTime.getTime()){
- throw new YamiShopBindException("Lock-up period:" + stockDz.getPeriod());
+ throw new YamiShopBindException("未到平仓时间");
}
}
@@ -489,7 +503,7 @@
//结算金额
double closeAmt = closePrice * num - orderFree.doubleValue();
if (closeAmt < 0) {
- throw new YamiShopBindException("手续费资金不足");
+ return Result.failed("余额不足");
}
//拆分订单
@@ -537,7 +551,7 @@
return Result.succeed("平仓成功");
} catch (Exception e) {
log.error(e.getMessage());
- return Result.failed("操作失败:" + e.getMessage());
+ return Result.failed("失败");
}
}
--
Gitblit v1.9.3