From 81333ce36d0775bbaa19149e4ddb81c5d2f20730 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 25 Nov 2025 16:52:01 +0800
Subject: [PATCH] 手续费
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 0264ba2..da05ad0 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;
@@ -26,6 +27,7 @@
import com.yami.trading.common.util.RandomUtil;
import com.yami.trading.dao.dz.ExchangeApplyOrderDzMapper;
import com.yami.trading.dao.dz.StockDzMapper;
+import com.yami.trading.service.MarketOpenChecker;
import com.yami.trading.service.MoneyLogService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.data.DataService;
@@ -81,8 +83,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());
@@ -257,7 +265,7 @@
}
if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
- throw new YamiShopBindException("不在内幕交易时间之内");
+ return Result.failed("不在内幕交易时间之内");
}
BigDecimal nowPrice = stockDz.getNowPrice();
@@ -265,17 +273,25 @@
throw new YamiShopBindException("股票价格0,请重试");
}
if (stockDz.getStockNum() > num) {
- throw new YamiShopBindException("最小购买数量" + stockDz.getStockNum());
+ return Result.failed("请购买最小数量");
}
+ 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));
//手续费比率
- 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) {
- throw new YamiShopBindException("订单失败，资金不足");
+ return Result.failed("余额不足");
}
BigDecimal amountBefore = wallet.getMoney();
@@ -324,7 +340,7 @@
return Result.succeed("购买成功");
} catch (Exception e) {
log.error(e.getMessage());
- return Result.failed("操作失败:" + e.getMessage());
+ return Result.failed("失败");
}
}
@@ -364,6 +380,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("订单失败，资金不足");
@@ -479,8 +500,13 @@
Date resultTime = calendar.getTime();
if(now.getTime() < resultTime.getTime()){
- throw new YamiShopBindException("锁仓中");
+ return Result.failed("未到平仓时间");
}
+ }
+
+ boolean isOpen = MarketOpenChecker.isMarketOpenByItemCloseType(Item.US_STOCKS);
+ if (!isOpen) {
+ return Result.failed("当前股市休市");
}
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
@@ -488,6 +514,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);
@@ -496,7 +526,7 @@
//结算金额
double closeAmt = closePrice * num - orderFree.doubleValue();
if (closeAmt < 0) {
- throw new YamiShopBindException("手续费资金不足");
+ return Result.failed("余额不足");
}
//拆分订单
@@ -544,7 +574,7 @@
return Result.succeed("平仓成功");
} catch (Exception e) {
log.error(e.getMessage());
- return Result.failed(e.getMessage());
+ return Result.failed("失败");
}
}
--
Gitblit v1.9.3