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/StockDzService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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 9e329fa..7e3cf32 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
@@ -6,13 +6,14 @@
import com.yami.trading.common.domain.Result;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
public interface StockDzService extends IService<StockDz> {
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);
+ Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType);
Result getDzListByAdmin(int pageNum, int pageSize, String keywords, String stockType);
@@ -22,11 +23,11 @@
Result getDzOrderList(int pageNum, int pageSize, String state, String userId, String stockType);
- Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType);
+ Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList);
Result buyDz(String dzId, String password, double num, String partyId);
- Result dzCheck(String id, Integer checkType, Double num);
+ Result dzCheck(String id, Integer checkType, Double num, double price);
public void intoPosition(ExchangeApplyOrderDz orderDz, String stockType);
--
Gitblit v1.9.3