修改问题
This commit is contained in:
parent
bd2152b408
commit
e52c0742aa
|
|
@ -209,9 +209,11 @@ namespace HuanMeng.MiaoYu.Code.Users
|
||||||
public static bool ConsumeMoneyNoWork(int userId, UserCurrencyType userCurrencyType, decimal money, DAO dao, T_User_Currency? _currency = null, string remarks = "", string title = "", string orderId = "", string productId = "", string imageUrl = "",
|
public static bool ConsumeMoneyNoWork(int userId, UserCurrencyType userCurrencyType, decimal money, DAO dao, T_User_Currency? _currency = null, string remarks = "", string title = "", string orderId = "", string productId = "", string imageUrl = "",
|
||||||
T_User_Currency_Log? log = null)
|
T_User_Currency_Log? log = null)
|
||||||
{
|
{
|
||||||
|
bool isJiyika = false;
|
||||||
//记忆卡特殊处理
|
//记忆卡特殊处理
|
||||||
if (MUserCurrencyType.Contains(userCurrencyType) && money > 0)
|
if (MUserCurrencyType.Contains(userCurrencyType) && money > 0)
|
||||||
{
|
{
|
||||||
|
isJiyika = true;
|
||||||
var memoryCardType = userCurrencyType.GetUserMemoryCardType();
|
var memoryCardType = userCurrencyType.GetUserMemoryCardType();
|
||||||
T_User_MemoryCard t_User_MemoryCard = new T_User_MemoryCard()
|
T_User_MemoryCard t_User_MemoryCard = new T_User_MemoryCard()
|
||||||
{
|
{
|
||||||
|
|
@ -269,8 +271,9 @@ namespace HuanMeng.MiaoYu.Code.Users
|
||||||
log = dao.daoDbMiaoYu.context.T_User_Currency_Log.Where(it => it.CreateTime > mintes && it.ConsumeType == (int)UserCurrencyConsumeType.消耗 && it.CurrencyType == (int)userCurrencyType).OrderByDescending(it => it.CreateTime).FirstOrDefault();
|
log = dao.daoDbMiaoYu.context.T_User_Currency_Log.Where(it => it.CreateTime > mintes && it.ConsumeType == (int)UserCurrencyConsumeType.消耗 && it.CurrencyType == (int)userCurrencyType).OrderByDescending(it => it.CreateTime).FirstOrDefault();
|
||||||
}
|
}
|
||||||
var tempMoney = Math.Abs(money);
|
var tempMoney = Math.Abs(money);
|
||||||
if (string.IsNullOrEmpty(title) && UserCurrencyConsumeType.消耗 == userCurrencyConsumeType)
|
if (string.IsNullOrEmpty(title) && !isJiyika)
|
||||||
{
|
{
|
||||||
|
|
||||||
title = $"{userCurrencyConsumeType}{money}{userCurrencyType}";
|
title = $"{userCurrencyConsumeType}{money}{userCurrencyType}";
|
||||||
}
|
}
|
||||||
//消费
|
//消费
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user