|
@@ -105,6 +105,7 @@ namespace MySystem
|
|
|
PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
|
|
PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
|
|
|
if(pos.BindingTime > now.AddDays(-CheckDays))
|
|
if(pos.BindingTime > now.AddDays(-CheckDays))
|
|
|
{
|
|
{
|
|
|
|
|
+ string SubjectType = act.Field2;
|
|
|
pos.PrizeParams = pos.SeoKeyword;
|
|
pos.PrizeParams = pos.SeoKeyword;
|
|
|
decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
|
|
decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
|
|
|
MpMainModels2.MerchantAddInfo merchantAddInfo = mpdb.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == merchant.KqMerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
MpMainModels2.MerchantAddInfo merchantAddInfo = mpdb.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == merchant.KqMerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
@@ -114,7 +115,7 @@ namespace MySystem
|
|
|
{
|
|
{
|
|
|
if(Deposit == 198)
|
|
if(Deposit == 198)
|
|
|
{
|
|
{
|
|
|
- if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL" || string.IsNullOrEmpty(merchantAddInfo.SubjectType))
|
|
|
|
|
|
|
+ if(SubjectType == "000001" || string.IsNullOrEmpty(SubjectType))
|
|
|
{
|
|
{
|
|
|
Prize = 0;
|
|
Prize = 0;
|
|
|
}
|
|
}
|
|
@@ -125,7 +126,7 @@ namespace MySystem
|
|
|
}
|
|
}
|
|
|
else if(Deposit == 249)
|
|
else if(Deposit == 249)
|
|
|
{
|
|
{
|
|
|
- if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL" || string.IsNullOrEmpty(merchantAddInfo.SubjectType))
|
|
|
|
|
|
|
+ if(SubjectType == "000001" || string.IsNullOrEmpty(SubjectType))
|
|
|
{
|
|
{
|
|
|
Prize = 50;
|
|
Prize = 50;
|
|
|
PrizeFlag = false;
|
|
PrizeFlag = false;
|
|
@@ -137,7 +138,7 @@ namespace MySystem
|
|
|
}
|
|
}
|
|
|
else if(Deposit == 228)
|
|
else if(Deposit == 228)
|
|
|
{
|
|
{
|
|
|
- if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL" || string.IsNullOrEmpty(merchantAddInfo.SubjectType))
|
|
|
|
|
|
|
+ if(SubjectType == "000001" || string.IsNullOrEmpty(SubjectType))
|
|
|
{
|
|
{
|
|
|
Prize = 0;
|
|
Prize = 0;
|
|
|
}
|
|
}
|
|
@@ -148,7 +149,7 @@ namespace MySystem
|
|
|
}
|
|
}
|
|
|
else if(Deposit == 380)
|
|
else if(Deposit == 380)
|
|
|
{
|
|
{
|
|
|
- if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL" || string.IsNullOrEmpty(merchantAddInfo.SubjectType))
|
|
|
|
|
|
|
+ if(SubjectType == "000001" || string.IsNullOrEmpty(SubjectType))
|
|
|
{
|
|
{
|
|
|
Prize = 100;
|
|
Prize = 100;
|
|
|
PrizeFlag = false;
|
|
PrizeFlag = false;
|
|
@@ -160,7 +161,7 @@ namespace MySystem
|
|
|
}
|
|
}
|
|
|
else if(Deposit == 399)
|
|
else if(Deposit == 399)
|
|
|
{
|
|
{
|
|
|
- if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL" || string.IsNullOrEmpty(merchantAddInfo.SubjectType))
|
|
|
|
|
|
|
+ if(SubjectType == "000001" || string.IsNullOrEmpty(SubjectType))
|
|
|
{
|
|
{
|
|
|
Prize = 0;
|
|
Prize = 0;
|
|
|
}
|
|
}
|
|
@@ -178,7 +179,7 @@ namespace MySystem
|
|
|
}
|
|
}
|
|
|
else if(Deposit == 499)
|
|
else if(Deposit == 499)
|
|
|
{
|
|
{
|
|
|
- if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL" || string.IsNullOrEmpty(merchantAddInfo.SubjectType))
|
|
|
|
|
|
|
+ if(SubjectType == "000001" || string.IsNullOrEmpty(SubjectType))
|
|
|
{
|
|
{
|
|
|
Prize = 0;
|
|
Prize = 0;
|
|
|
}
|
|
}
|
