|
|
@@ -1024,7 +1024,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
RewardAmount = 28.5M;
|
|
|
}
|
|
|
- else if(pos.BrandId == 18 || pos.BrandId == 19 || pos.BrandId == 20 || pos.BrandId == 21)
|
|
|
+ else if(Utils.Instance.IsHaoDa(pos.BrandId))
|
|
|
{
|
|
|
pos.PrizeParams = pos.SeoKeyword;
|
|
|
decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
|
|
|
@@ -1080,14 +1080,38 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
else if(Deposit == 399)
|
|
|
{
|
|
|
-
|
|
|
if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
|
|
|
{
|
|
|
RewardAmount = 0;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- RewardAmount = 150;
|
|
|
+ if(pos.BrandId == 29)
|
|
|
+ {
|
|
|
+ RewardAmount = 200;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ RewardAmount = 150;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else if(Deposit == 499)
|
|
|
+ {
|
|
|
+ if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
|
|
|
+ {
|
|
|
+ RewardAmount = 0;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if(pos.BrandId == 29)
|
|
|
+ {
|
|
|
+ RewardAmount = 300;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ RewardAmount = 150;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1101,7 +1125,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
if(Deposit == 0) RewardAmount = 0;
|
|
|
}
|
|
|
- else if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
|
|
|
+ else if(Utils.Instance.IsWifi(pos.BrandId))
|
|
|
{
|
|
|
WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn && m.Status == 0);
|
|
|
if (trade != null)
|
|
|
@@ -1648,7 +1672,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
result += "机具所属小分仓:暂无小分仓\n";
|
|
|
}
|
|
|
- if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
|
|
|
+ if(Utils.Instance.IsWifi(pos.BrandId))
|
|
|
{
|
|
|
result += "设备厂商:" + DeviceName + "\n";
|
|
|
}
|