From b9b2198fd4f2659c02ee7edbc7ab7b98898bc8a2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 02 Sep 2025 14:32:56 +0800
Subject: [PATCH] 删除修改

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/ico/AdminIcoController.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 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 0d4efdc..9914006 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
@@ -6,16 +6,19 @@
 import com.google.common.collect.Lists;
 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 com.yami.trading.service.item.ItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -68,15 +71,27 @@
 	@ApiOperation(value = "删除新币")
 	@DeleteMapping("delete")
 	public Result <String> delete(Integer id) {
-		icoService.removeById(id);
-		return Result.ok("删除产品成功");
+		if (id == null) {
+			throw new YamiShopBindException("id is null");
+		}
+		QueryWrapper<UserSubscription> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("ico_project_id", id);
+		long count = userSubscriptionService.count(queryWrapper);
+		if (count > 0) {
+			throw new YamiShopBindException("已有申购记录,删除失败");
+		}
+		if (icoService.removeById(id)) {
+			return Result.ok("删除成功");
+		}
+		return Result.ok("删除失败");
+
 	}
 
 	@ApiOperation(value = "新币申购记录列表")
 	@GetMapping("recordList")
-	public Result<Page<UserSubscription>> recordList(IcoQuery icoQuery, Page<UserSubscription> page) throws Exception {
+	public Result<Page<UserSubscriptionDTO>> recordList(IcoQuery icoQuery, Page<UserSubscriptionDTO> page) throws Exception {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (icoQuery, IcoQuery.class);
-		Page<UserSubscription> result = userSubscriptionService.page(page, queryWrapper);
+		Page<UserSubscriptionDTO> result = userSubscriptionService.findPage(page, queryWrapper);
 		return Result.ok(result);
 	}
 

--
Gitblit v1.9.3