From 54c6fc43ef0f9be914d33e7f354b3e56065f9e86 Mon Sep 17 00:00:00 2001
From: Seany <17074267@qq.com>
Date: Wed, 7 Jan 2026 00:38:12 +0800
Subject: [PATCH] fix currency api

---
 .../Pages/Settings/CurrencyEdit.razor         |  2 +-
 .../Controllers/CurrencyController.cs         | 37 ++++---------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyEdit.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyEdit.razor
index ffeef2f..6426cd5 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyEdit.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyEdit.razor
@@ -120,7 +120,7 @@
             result = await HttpService.Post<ApiResult<string>>(url, model);
 
 
-            if (result.Code == (int)ResultCode.Success)
+            if (result.Success)
             {
                 saving = false;
                 await ModalService.InfoAsync(new ConfirmOptions() { Title = "提示", Content = "数据提交成功!" });
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs b/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
index bbed55c..e895268 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
@@ -162,10 +162,10 @@ namespace Atomx.Admin.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpGet("detail")]
+        [HttpGet("{id:long}")]
         public IActionResult Get(long id)
         {
-            var result = new ApiResult<CurrencyModel>();
+            var result = new ApiResult<Currency>();
 
             var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == id);
             if (data == null)
@@ -173,11 +173,7 @@ namespace Atomx.Admin.Controllers
                 return new JsonResult(result);
             }
 
-            var currency = _mapper.Map<CurrencyModel>(data);
-
-            result.Data = currency;
-
-            return new JsonResult(result);
+            return new JsonResult(new ApiResult<Currency>().IsSuccess(data));
         }
 
         /// <summary>
@@ -192,14 +188,13 @@ namespace Atomx.Admin.Controllers
             var validation = _validator.Validate(model);
             if (!validation.IsValid)
             {
-                result = result.IsFail(ModelState.Values.First().Errors[0].ErrorMessage);
-                return new JsonResult(result);
+                var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
+                return new JsonResult(new ApiResult<string>().IsFail(message, null));
             }
             var data = _dbContext.Currencies.SingleOrDefault(p => p.Id != model.Id && p.CurrencyCode == model.CurrencyCode);
             if (data != null)
             {
-                result = result.IsFail("该货币代码数据已经存在，请更换！");
-                return new JsonResult(result);
+                return new JsonResult(new ApiResult<string>().IsFail("该货币代码数据已经存在，请更换！", null));
             }
 
             if (model.Id.HasValue && model.Id > 0)
@@ -218,21 +213,6 @@ namespace Atomx.Admin.Controllers
             }
             else
             {
-                //var data = new Currency()
-                //{
-                //    Name = model.Name,
-                //    CurrencyCode = model.CurrencyCode,
-                //    DisplayLocale = model.DisplayLocale,
-                //    CustomFormatting = model.CustomFormatting,
-                //    Rate = (decimal)model.Rate,
-                //    DisplayOrder = model.DisplayOrder,
-                //    EnableDisplay = model.Enabled,
-                //    Symbolic = "",
-                //    Enabled = model.Enabled,
-                //    Title = model.Name,
-                //    EnablePay = true,
-                //    CreateTime = DateTime.UtcNow
-                //};
                 data = model.Adapt<Currency>();
                 data.CreateTime = DateTime.UtcNow;
 
@@ -240,11 +220,8 @@ namespace Atomx.Admin.Controllers
                 _dbContext.SaveChanges();
             }
 
-            result = result.IsSuccess(true);
-
             //todo 更新缓存
-
-            return new JsonResult(result);
+            return new JsonResult(new ApiResult<string>().IsSuccess("操作成功"));
         }
 
         /// <summary>