From 26c4fd844884ad051c4d644da5ab7ac31f814ea2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 27 Nov 2025 18:34:15 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIcoController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 12e87a4..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
@@ -2,27 +2,27 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yami.trading.api.dto.OpenAction;
import com.yami.trading.bean.ico.domain.Ico;
-import com.yami.trading.bean.ico.domain.UserSubscriptionRecord;
+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;
+import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.concurrent.TimeUnit;
@RestController
@@ -35,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);
}
@@ -48,8 +52,11 @@
@ApiOperation(value = "新币申购")
@PostMapping("subscribe")
@ResponseBody
- public Result<String> subscribe(@Valid UserSubscriptionRecord model) throws IOException, InterruptedException {
+ public Result<String> subscribe(@Valid UserSubscription model) {
String partyId = SecurityUtils.getUser().getUserId();
+ if (StringUtils.isEmpty(partyId)) {
+ throw new YamiShopBindException("请重新登录");
+ }
RLock rLock = redissonClient.getLock("subscribe" + partyId);
boolean lockAcquired = false;
try {
@@ -59,7 +66,8 @@
log.warn("无法获取锁: subscribe{}", partyId);
throw new YamiShopBindException("请稍后再试");
}
- subscribe(model);
+ model.setUserId(partyId);
+ return icoService.subscribe(model);
} catch (YamiShopBindException e) {
log.error("错误信息: {}", e.getMessage(), e);
throw e; // 重新抛出自定义异常
@@ -72,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