From 752bedc4e29ec9620dc12442414241a026cc2864 Mon Sep 17 00:00:00 2001
From: bibabo <765221495@qq.com>
Date: Sat, 20 Jul 2024 16:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/Account/MyAccountInfoDto.cs           | 68 +++++++++++++++++++
 .../Controllers/AccountController.cs          | 14 +++-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs
index a990dec..ccbc32a 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs
@@ -88,4 +88,72 @@ namespace HuanMeng.MiaoYu.Model.Dto.Account
         /// </summary>
         public int CurrencyType { get; set; }
     }
+
+    /// <summary>
+    /// 商城在售
+    /// </summary>
+    public class MallItemDto
+    {
+        /// <summary>
+        /// 道具id
+        /// </summary>
+        public int PropId { get; set; }
+
+        /// <summary>
+        /// 道具名称
+        /// </summary>
+        public string PropName { get; set; }
+
+        /// <summary>
+        /// 道具剩余数量
+        /// </summary>
+        public int PropCount { get; set; }
+
+        /// <summary>
+        /// 道具类型 
+        /// </summary>
+        public int PropType { get; set; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 支付类型 0 语珠 1 RMB
+        /// </summary>
+        public int PriceType { get; set; }
+
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string ImgUrl { get; set; }
+    }
+
+    /// <summary>
+    /// 已拥有
+    /// </summary>
+    public class PurchasedItemDto: MallItemDto
+    {        
+        /// <summary>
+        /// 购买时间
+        /// </summary>
+        public DateTime BuyingTime { get; set; }
+    }
+
+    /// <summary>
+    /// 商城
+    /// </summary>
+    public class ShopInfoDto
+    {
+        /// <summary>
+        /// 商城在售
+        /// </summary>
+        public List<MallItemDto> Mall { get; set; }
+        
+        /// <summary>
+        /// 已拥有
+        /// </summary>
+        public List<PurchasedItemDto> Purchased { get; set; }
+    }
 }
diff --git a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
index 6b9766b..ebd29e5 100644
--- a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
+++ b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
@@ -85,7 +85,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
         }
 
         /// <summary>
-        /// 获取交易记录
+        /// 我的 - 获取交易记录
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
@@ -95,5 +95,17 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
             var obj = JsonConvert.DeserializeObject<List<Transaction>>("[{\"TransactionContent\":\"购买记忆提升道具卡\",\"TransactionTime\":\"2024-07-18 12:58:52.963\",\"TransactionAmount\":\"-10\",\"TransactionType\":0,\"CurrencyType\":0},{\"TransactionContent\":\"充值语珠\",\"TransactionTime\":\"2024-07-17 12:58:52.963\",\"TransactionAmount\":\"+100\",\"TransactionType\":0,\"CurrencyType\":0},{\"TransactionContent\":\"充值语珠\",\"TransactionTime\":\"2024-07-16 12:58:52.963\",\"TransactionAmount\":\"+200\",\"TransactionType\":0,\"CurrencyType\":0}]");
             return new BaseResponse<List<Transaction>>(ResonseCode.Success, "", obj);
         }
+
+        /// <summary>
+        /// 商城 - 获取商城商品
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpGet]
+        public async Task<BaseResponse<ShopInfoDto>> GetMallItem()
+        {
+            var obj = JsonConvert.DeserializeObject<ShopInfoDto>("{\"Mall\":[{\"PropId\":1,\"PropName\":\"记忆卡1\",\"PropCount\":100,\"PropType\":0,\"Price\":10,\"PriceType\":0,\"ImgUrl\":\"https://cos.shhuanmeng.com/image/20240718110512.png\"},{\"PropId\":2,\"PropName\":\"记忆卡2\",\"PropCount\":100,\"PropType\":0,\"Price\":20,\"PriceType\":0,\"ImgUrl\":\"https://cos.shhuanmeng.com/image/20240718110518.png\"}],\"Purchased\":[{\"PropId\":2,\"PropName\":\"记忆卡2\",\"PropCount\":100,\"PropType\":0,\"Price\":20,\"PriceType\":0,\"ImgUrl\":\"https://cos.shhuanmeng.com/image/20240718110518.png\",\"BuyingTime\":\"2024-07-09 03:33:09.563\"}]}");
+            return new BaseResponse<ShopInfoDto>(ResonseCode.Success, "", obj);
+        }
     }
 }