|
@@ -978,6 +978,10 @@ namespace MySystem
|
|
{
|
|
{
|
|
FluxProfit = 24;
|
|
FluxProfit = 24;
|
|
}
|
|
}
|
|
|
|
+ else if (trade.ProductType == "7" && FeeAmount == 46)
|
|
|
|
+ {
|
|
|
|
+ FluxProfit = 10;
|
|
|
|
+ }
|
|
else if (trade.ProductType != "1" && FeeAmount == 48)
|
|
else if (trade.ProductType != "1" && FeeAmount == 48)
|
|
{
|
|
{
|
|
FluxProfit = 12;
|
|
FluxProfit = 12;
|
|
@@ -988,7 +992,7 @@ namespace MySystem
|
|
PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId) ?? new PosMachinesTwo();
|
|
PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId) ?? new PosMachinesTwo();
|
|
// PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId && m.Sort == 1);
|
|
// PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId && m.Sort == 1);
|
|
PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
- if(merchant != null)
|
|
|
|
|
|
+ if(merchant != null && pos.BrandId != 6)
|
|
{
|
|
{
|
|
bool checkExist = db.FluxProfitDetail.Any(m => m.MerNo == merchant.KqMerNo);
|
|
bool checkExist = db.FluxProfitDetail.Any(m => m.MerNo == merchant.KqMerNo);
|
|
if (!checkExist && decimal.Parse(function.CheckNum(pos.SeoKeyword)) > 0)
|
|
if (!checkExist && decimal.Parse(function.CheckNum(pos.SeoKeyword)) > 0)
|