From c7c4c4eec809cfd5e399edab50fae9bf68681585 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 03 Feb 2026 18:32:44 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
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 8223423..207ff85 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
@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yami.trading.bean.ico.domain.Ico;
import com.yami.trading.bean.ico.domain.UserSubscription;
+import com.yami.trading.bean.ico.dto.UserSubscriptionDTO;
+import com.yami.trading.bean.ico.query.IcoQuery;
import com.yami.trading.bean.item.query.ItemQuery;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.query.QueryWrapperGenerator;
import com.yami.trading.security.common.util.SecurityUtils;
import com.yami.trading.service.ico.IcoService;
+import com.yami.trading.service.ico.UserSubscriptionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -32,12 +35,16 @@
IcoService icoService;
@Autowired
+ UserSubscriptionService userSubscriptionService;
+
+ @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);
+ queryWrapper.orderByDesc("market_date");
Page<Ico> result = icoService.page(page, queryWrapper);
return Result.ok(result);
}
@@ -60,7 +67,7 @@
throw new YamiShopBindException("请稍后再试");
}
model.setUserId(partyId);
- icoService.subscribe(model);
+ return icoService.subscribe(model);
} catch (YamiShopBindException e) {
log.error("错误信息: {}", e.getMessage(), e);
throw e; // 重新抛出自定义异常
@@ -73,7 +80,20 @@
rLock.unlock();
}
}
- return Result.succeed(null, "ok");
+ }
+
+ @ApiOperation(value = "新币申购记录列表")
+ @GetMapping("recordList")
+ public Result<Page<UserSubscriptionDTO>> recordList(IcoQuery icoQuery, Page<UserSubscriptionDTO> page) throws Exception {
+ QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (icoQuery, IcoQuery.class);
+ String partyId = SecurityUtils.getUser().getUserId();
+ if (StringUtils.isEmpty(partyId)) {
+ throw new YamiShopBindException("请重新登录");
+ }
+ queryWrapper.eq("u.user_id", partyId);
+ queryWrapper.orderByDesc("created_at");
+ Page<UserSubscriptionDTO> result = userSubscriptionService.findPage(page, queryWrapper);
+ return Result.ok(result);
}
}
--
Gitblit v1.9.3