|
|
@@ -357,6 +357,7 @@ namespace MySystem
|
|
|
BrandIds.Add(24);
|
|
|
BrandIds.Add(25);
|
|
|
BrandIds.Add(26);
|
|
|
+ BrandIds.Add(32);
|
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
|
DateTime yesterday = DateTime.Now.AddDays(-1);
|
|
|
DateTime today = DateTime.Now.AddMinutes(-10);
|
|
|
@@ -472,6 +473,7 @@ namespace MySystem
|
|
|
BrandIds.Add(24);
|
|
|
BrandIds.Add(25);
|
|
|
BrandIds.Add(26);
|
|
|
+ BrandIds.Add(32);
|
|
|
IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0") && m.CreditTrade >= 5000 && !BrandIds.Contains(m.BrandId) && m.Detail != "1");
|
|
|
if (posid > 0)
|
|
|
{
|
|
|
@@ -795,6 +797,7 @@ namespace MySystem
|
|
|
ChkBrandIds.Add(24);
|
|
|
ChkBrandIds.Add(25);
|
|
|
ChkBrandIds.Add(26);
|
|
|
+ ChkBrandIds.Add(32);
|
|
|
if(string.IsNullOrEmpty(MerNo) && !ChkBrandIds.Contains(pos.BrandId))
|
|
|
{
|
|
|
// MerNo = "n" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
|
|
|
@@ -811,6 +814,7 @@ namespace MySystem
|
|
|
BrandIds.Add(24);
|
|
|
BrandIds.Add(25);
|
|
|
BrandIds.Add(26);
|
|
|
+ BrandIds.Add(32);
|
|
|
bool check = false;
|
|
|
if(!BrandIds.Contains(pos.BrandId) && !MerNo.Contains("*"))
|
|
|
{
|
|
|
@@ -1236,6 +1240,7 @@ namespace MySystem
|
|
|
BrandIds.Add(24);
|
|
|
BrandIds.Add(25);
|
|
|
BrandIds.Add(26);
|
|
|
+ BrandIds.Add(32);
|
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
|
OpModels.WebCMSEntities opdb = new OpModels.WebCMSEntities();
|
|
|
PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == PosId && m.ActivationState == 1 && ((!string.IsNullOrEmpty(m.SeoKeyword) && m.SeoKeyword != "0" && m.CreditTrade >= 1000) || BrandIds.Contains(m.BrandId)));
|