From c6eddb4918edb92d78a04525d4e84867cc97f667 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 29 Nov 2025 18:46:52 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java | 4 +-
trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java | 5 +-
trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java | 5 ++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java | 4 +-
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java | 13 +++++-
trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml | 11 +++++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java | 4 +-
trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java | 3 +
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 12 ++++-
9 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
index 6fc8acb..24a6767 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
@@ -79,7 +79,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices_dark);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices_dark, null);
}
@ApiOperation("大宗审核")
@@ -91,7 +91,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
index 527505f..7d91b82 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
@@ -74,7 +74,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices, null);
}
@ApiOperation("大宗审核")
@@ -86,7 +86,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
index 9e46ab2..b41c339 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
@@ -1,5 +1,6 @@
package com.yami.trading.admin.controller.dz;
+import com.yami.trading.admin.facade.PermissionFacade;
import com.yami.trading.bean.dz.StockDz;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
@@ -7,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -20,6 +22,10 @@
@Resource
StockDzService stockDzService;
+
+ @Autowired
+ private PermissionFacade permissionFacade;
+
/**
* @Description: 获取大宗列表
@@ -79,7 +85,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_DARK);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_DARK, permissionFacade.getOwnerUserIds());
}
@ApiOperation("大宗审核")
@@ -87,11 +93,12 @@
@ResponseBody
public Result check(@RequestParam(value = "id") String id,
@RequestParam(value = "checkType") Integer checkType,
- @RequestParam(value = "orderNum", required = false) Double orderNum) {
+ @RequestParam(value = "orderNum", required = false) Double orderNum,
+ @RequestParam(value = "price", required = false, defaultValue = "0") double price) {
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, price);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
index 32dbacc..dbd88ec 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
@@ -82,7 +82,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS, null);
}
@ApiOperation("大宗审核")
@@ -94,7 +94,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
index 51d8947..3a7b04f 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
@@ -21,4 +21,7 @@
@ApiModelProperty("浮动盈亏比例")
private double profitLossPercentage;
+ @ApiModelProperty("推荐人")
+ private String recomUserName;
+
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
index 615afb7..cbdba26 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
@@ -8,6 +8,8 @@
import com.yami.trading.bean.dz.dto.StockDzDto;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface StockDzMapper extends BaseMapper<StockDz> {
@@ -29,6 +31,7 @@
Page getDzCheckList(Page page,
@Param("state") String state,
@Param("stockCode") String stockCode,
- @Param("stockType") String stockType);
+ @Param("stockType") String stockType,
+ @Param("checkedList") List<String> checkedList);
}
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 5c0d3f2..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,6 +6,7 @@
import com.yami.trading.common.domain.Result;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
public interface StockDzService extends IService<StockDz> {
@@ -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);
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 da05ad0..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());
@@ -346,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) {
@@ -371,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,请重试");
}
@@ -396,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()));
diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index 2c81989..e8c32b8 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -72,10 +72,11 @@
<select id="getDzCheckList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- t.*,u.user_name,u.user_code,s.stock_name
+ t.*,u.user_name,u.user_code,s.stock_name,r.user_name AS 'recomUserName'
FROM t_exchange_apply_order_dz t
LEFT JOIN tz_user u ON t.party_id = u.user_id
LEFT JOIN t_stock_dz s ON s.uuid = t.dz_id
+ LEFT JOIN tz_user r ON u.user_recom = r.user_id
WHERE 1=1
<if test="state != null and state != ''">
AND t.state = #{state}
@@ -86,6 +87,14 @@
<if test="stockType != null and stockType != '' ">
AND s.stock_type = #{stockType}
</if>
+ <if test="checkedList!=null">
+ and u.user_id in
+ <foreach collection="checkedList" separator="," index="index" open="(" close=")" item="r">
+ #{r}
+ </foreach>
+
+ </if>
+
ORDER BY t.create_time DESC
</select>
--
Gitblit v1.9.3