|
@@ -76,7 +76,7 @@ namespace MySystem
|
|
spdb.SaveChanges();
|
|
spdb.SaveChanges();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- else if (trade.TradeType == "40" && trade.ProductType == "12") //盒易付押金获取
|
|
|
|
|
|
+ else if (trade.SerEntryMode == "40" && trade.ProductType == "12") //盒易付押金获取
|
|
{
|
|
{
|
|
if (trade.TradeAmount == 99 || trade.TradeAmount == 199 || trade.TradeAmount == 299)
|
|
if (trade.TradeAmount == 99 || trade.TradeAmount == 199 || trade.TradeAmount == 299)
|
|
{
|
|
{
|
|
@@ -295,7 +295,7 @@ namespace MySystem
|
|
pos.CreditTrade += SourceTradeAmount;
|
|
pos.CreditTrade += SourceTradeAmount;
|
|
}
|
|
}
|
|
//盒易付
|
|
//盒易付
|
|
- else if(BankCardType == 1 && trade.TradeType == "0" && pos.BrandId == 12)
|
|
|
|
|
|
+ else if(BankCardType == 1 && trade.TradeType == "0" && trade.SerEntryMode != "40" && pos.BrandId == 12)
|
|
{
|
|
{
|
|
pos.CreditTrade += SourceTradeAmount;
|
|
pos.CreditTrade += SourceTradeAmount;
|
|
}
|
|
}
|