From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 98d906f..c3cd310 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
@@ -221,10 +221,11 @@
}
@Override
- public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType) {
+ public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList) {
try {
Page page = new Page(pageNum, pageSize);
- stockDzMapper.getDzCheckList(page ,state, stockCode, stockType);
+
+ stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, checkedList);
return Result.succeed(page);
} catch (Exception e) {
log.error(e.getMessage());
@@ -284,8 +285,11 @@
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num));
//手续费比率
- Double feeRate = sysparaService.find("exchange_apply_order_buy_fee").getDouble();
+ Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
+ if (buyAmt.doubleValue() < 300) {
+ orderFree = BigDecimal.ONE;
+ }
BigDecimal orderAmt = buyAmt.add(orderFree);
if (wallet.getMoney().compareTo(orderAmt) < 0) {
return Result.failed("余额不足");
@@ -343,7 +347,7 @@
@Transactional
@Override
- public Result dzCheck(String id, Integer checkType, Double orderNum) {
+ public Result dzCheck(String id, Integer checkType, Double orderNum, double price) {
try {
ExchangeApplyOrderDz order = exchangeApplyOrderDzMapper.selectById(id);
if (order == null) {
@@ -368,6 +372,10 @@
}
BigDecimal nowPrice = stockDz.getNowPrice();
+ if (price > 0) {
+ nowPrice = BigDecimal.valueOf(price);
+ order.setPrice(price);
+ }
if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
throw new YamiShopBindException("股票价格0,请重试");
}
@@ -377,6 +385,11 @@
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
+ if (buyAmt.doubleValue() < 300) {
+ orderFree = BigDecimal.ONE;
+ }
+
+
BigDecimal orderAmt = buyAmt.add(orderFree);
if (wallet.getMoney().compareTo(orderAmt) < 0) {
throw new YamiShopBindException("订单失败，资金不足");
@@ -388,6 +401,7 @@
order.setVolume(buyAmt.doubleValue());
order.setFee(orderFree.doubleValue());
order.setState(ExchangeApplyOrderDz.STATE_POSITION);
+ order.setCreateTime(new Date());
exchangeApplyOrderDzMapper.updateById(order);
walletService.update(wallet.getUserId(), Arith.sub(0, orderAmt.doubleValue()));
@@ -506,6 +520,10 @@
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_sell_fee").getDouble();
BigDecimal orderFree = sellAmt.multiply(BigDecimal.valueOf(feeRate));
+ if (sellAmt.doubleValue() < 300) {
+ orderFree = BigDecimal.ONE;
+ }
+
String symbol = stockDz.getStockCode();
Realtime realtime = this.dataService.realtime(symbol).get(0);
--
Gitblit v1.9.3