From 57d779ee4f65850c59cb6c2e281ac9f35e9dcc9f Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 03 Sep 2025 18:24:21 +0800
Subject: [PATCH] 新币申购
---
trading-order-bean/src/main/java/com/yami/trading/bean/ico/query/IcoQuery.java | 8 ++++----
trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java | 7 ++++---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/ico/AdminIcoController.java | 4 ++--
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ico/AdminIcoController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ico/AdminIcoController.java
index b85a206..f39cf4a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ico/AdminIcoController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ico/AdminIcoController.java
@@ -48,8 +48,8 @@
*/
@ApiOperation(value = "新币列表")
@GetMapping("list")
- public Result<Page<Ico>> list(IcoQuery icoQuery, Page<Ico> page) throws Exception {
- QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (icoQuery, IcoQuery.class);
+ public Result<Page<Ico>> list(ItemQuery icoQuery, Page<Ico> page) throws Exception {
+ QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (icoQuery, ItemQuery.class);
Page<Ico> result = icoService.page(page, queryWrapper);
return Result.ok(result);
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java
index 3ed4081..28e49f1 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java
@@ -40,10 +40,10 @@
@Autowired
private RedissonClient redissonClient;
- @ApiOperation(value = "新币列表，配置列表")
+ @ApiOperation(value = "新币列表")
@GetMapping("list")
- public Result<Page<Ico>> list(ItemQuery itemQuery, Page<Ico> page) throws Exception {
- QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (itemQuery, ItemQuery.class);
+ public Result<Page<Ico>> list(ItemQuery icoQuery, Page<Ico> page) throws Exception {
+ QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (icoQuery, ItemQuery.class);
Page<Ico> result = icoService.page(page, queryWrapper);
return Result.ok(result);
}
@@ -90,6 +90,7 @@
throw new YamiShopBindException("请重新登录");
}
queryWrapper.eq("u.user_id", partyId);
+ System.out.println(queryWrapper.getSqlSegment());
Page<UserSubscriptionDTO> result = userSubscriptionService.findPage(page, queryWrapper);
return Result.ok(result);
}
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/query/IcoQuery.java b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/query/IcoQuery.java
index 44c77bd..759210e 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/query/IcoQuery.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/query/IcoQuery.java
@@ -22,26 +22,26 @@
* name
*/
@ApiParam(value = "name")
- @Query(type = QueryType.LIKE)
+ @Query(type = QueryType.LIKE, tableColumn = "t.name")
private String name;
/**
* 代码
*/
@ApiParam(value = "symbol")
- @Query(type = QueryType.LIKE)
+ @Query(type = QueryType.LIKE, tableColumn = "t.symbol")
private String symbol;
/**
* 数据源编码
*/
@ApiParam(value = "数据源编码")
- @Query(type = QueryType.LIKE)
+ @Query(type = QueryType.LIKE, tableColumn = "t.symbol_data")
private String symbolData;
@ApiParam("状态：1、已认购，2、未中签，3、已中签，4、已缴纳 5.已分发")
- @Query(type = QueryType.EQ)
+ @Query(type = QueryType.EQ, tableColumn = "u.status")
private Integer status;
@ApiParam(value = "userId")
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
index 3bb5ed7..e4693b0 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
@@ -182,7 +182,7 @@
if (subtract.compareTo(BigDecimal.ZERO) > 0) {
//放入待补
wallet.setMoney(BigDecimal.ZERO);
- wallet.setAmountToBeCovered(subtract);
+ wallet.setAmountToBeCovered(wallet.getAmountToBeCovered().add(subtract));
if (!walletService.updateById(wallet)) {
throw new YamiShopBindException("操作钱包失败!");
}
--
Gitblit v1.9.3