Compare commits
No commits in common. "a8e7e81653d14d6cf35d3d39fec9150c3c8ea8fa" and "e9526aa1ca22b8a3ad826655975c18c8dd2b2be8" have entirely different histories.
a8e7e81653
...
e9526aa1ca
|
|
@ -88,72 +88,4 @@ namespace HuanMeng.MiaoYu.Model.Dto.Account
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int CurrencyType { get; set; }
|
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; }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 我的 - 获取交易记录
|
/// 获取交易记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
|
|
@ -95,17 +95,5 @@ 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}]");
|
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);
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user