From c284b4ed12be903c671586ec18ef56dbc78bc364 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 28 Oct 2025 16:48:22 +0800
Subject: [PATCH] 大宗
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java | 8 +++++---
trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java | 2 +-
trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml | 2 +-
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java | 8 ++++----
trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java | 11 ++++-------
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 15 ++++++++-------
6 files changed, 23 insertions(+), 23 deletions(-)
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 6cd1058..1dba1f9 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
@@ -76,7 +76,7 @@
@ApiOperation("大宗交易审核列表")
- @RequestMapping({"getDzCheckList.do"})
+ @PostMapping({"getDzCheckList.do"})
@ResponseBody
public Result getDzCheckList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@@ -85,12 +85,12 @@
return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS);
}
- //大宗审核
- @RequestMapping({"dzCheck.do"})
+ @ApiOperation("大宗审核")
+ @PostMapping({"dzCheck.do"})
@ResponseBody
public Result check(@RequestParam(value = "id") String id,
@RequestParam(value = "checkType") Integer checkType,
- @RequestParam(value = "orderNum") Double orderNum) {
+ @RequestParam(value = "orderNum", required = false) Double orderNum) {
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
index e5e5dbe..1d4bf39 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
@@ -50,9 +50,11 @@
/**
* 大宗下单
*/
- @RequestMapping({"buyStockDz.do"})
+ @GetMapping({"buyStockDz.do"})
@ResponseBody
- public Result buyDz(@RequestParam("dzId") String dzId, @RequestParam("password") String password,@RequestParam("num") double num) {
+ public Result buyDz(@RequestParam("dzId") String dzId,
+ @RequestParam(value = "password", required = false) String password,
+ @RequestParam("num") double num) {
lock.lock();
try {
if (orderCreated.get()) {
@@ -84,7 +86,7 @@
* @return
*/
@ApiOperation("大宗交易订单列表")
- @RequestMapping({"getDzOrderList.do"})
+ @PostMapping({"getDzOrderList.do"})
@ResponseBody
public Result getDzOrderList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
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 5a7f0bb..c8196ac 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
@@ -1,14 +1,7 @@
package com.yami.trading.bean.dz.dto;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.yami.trading.bean.dz.ExchangeApplyOrderDz;
-import com.yami.trading.common.domain.UUIDEntity;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
import lombok.Data;
-
-import java.util.Date;
@Data
public class ExchangeApplyOrderDzDto extends ExchangeApplyOrderDz {
@@ -19,4 +12,8 @@
@ApiModelProperty("UID")
private String userCode;
+ @ApiModelProperty("股票名称")
+ private String stockName;
+
+
}
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 e128ca9..b0a6e26 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
@@ -25,6 +25,6 @@
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);
}
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 f57759a..6d8cd48 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
@@ -99,7 +99,7 @@
stockDz.setStockCode(item.getSymbol());
stockDz.setStockType(item.getType());
stockDz.setStockSpell(item.getSymbolData());
- stockDz.setIsLock(1);
+ stockDz.setIsLock(0);
stockDz.setIsShow(1);
stockDz.setAddTime(new Date());
stockDz.setStockNum(Integer.valueOf(stockNum));
@@ -227,7 +227,7 @@
throw new YamiShopBindException("股票价格0,请重试");
}
if (stockDz.getStockNum() > num) {
- throw new YamiShopBindException("最小购买数据" + stockDz.getStockNum());
+ throw new YamiShopBindException("最小购买数量" + stockDz.getStockNum());
}
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
@@ -246,6 +246,7 @@
order.setPartyId(partyId);
order.setSymbol(stockDz.getStockCode());
order.setSymbolValue(num);
+ order.setDzId(stockDz.getUuid());
order.setVolume(buyAmt.doubleValue());
order.setPrice(nowPrice.doubleValue());
order.setOrderNo(com.yami.trading.common.util.DateUtil.getToday("yyMMddHHmmss") + RandomUtil.getRandomNum(8));
@@ -284,13 +285,13 @@
return Result.succeed("购买成功");
} catch (Exception e) {
log.error(e.getMessage());
+ return Result.failed("操作失败:" + e.getMessage());
}
- return Result.failed("操作失败");
}
@Transactional
@Override
- public Result dzCheck(String id, Integer checkType, double orderNum) {
+ public Result dzCheck(String id, Integer checkType, Double orderNum) {
try {
ExchangeApplyOrderDz order = exchangeApplyOrderDzMapper.selectById(id);
if (order == null) {
@@ -303,13 +304,13 @@
if (checkType == 2) {
order.setState(ExchangeApplyOrderDz.STATE_FAILED);
exchangeApplyOrderDzMapper.updateById(order);
- throw new YamiShopBindException("审核成功");
+ return Result.succeed("操作成功");
}
if (orderNum > order.getSymbolValue()) {
throw new YamiShopBindException("输入数量大于用户买入数量");
}
- StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", order.getDzId()));
+ StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("uuid", order.getDzId()));
if (stockDz == null) {
throw new YamiShopBindException("大宗不存在");
}
@@ -359,8 +360,8 @@
return Result.succeed("审核成功,订单已转客户持仓");
} catch (Exception e) {
log.error(e.getMessage());
+ return Result.failed("操作失败:" + e.getMessage());
}
- return Result.failed("操作失败");
}
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 16ffc97..9e82e25 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -62,7 +62,7 @@
<select id="getDzCheckList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- t.*,u.user_name,u.user_code,s.stock_type
+ t.*,u.user_name,u.user_code,s.stock_name
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
--
Gitblit v1.9.3