@@ -372,7 +372,7 @@ namespace MySystem
WebCMSEntities db = new WebCMSEntities();
DateTime yesterday = DateTime.Now.AddDays(-30);
DateTime today = DateTime.Now.AddMinutes(-5);
- IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && string.IsNullOrEmpty(m.SeoKeyword) && m.BrandId == 12);
+ IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && string.IsNullOrEmpty(m.SeoKeyword) && (m.BrandId == 12 || m.BrandId == 13));
if (posid > 0)
{
posList = posList.Where(m => m.Id == posid);
@@ -47,7 +47,7 @@ namespace MySystem
TopUserId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
}
int BrandId = pos.BrandId;
- if (BrandId == 12)
+ if (BrandId == 12 || BrandId == 13)
MerchantRecord merinfo = spdb.MerchantRecord.FirstOrDefault(m => m.MerNo == Mer.MerNo);
if(merinfo != null)
@@ -253,7 +253,7 @@ namespace MySystem
db.SaveChanges();
- else if (pos.BrandId == 12) //盒易付
+ else if (pos.BrandId == 12 || pos.BrandId == 13) //盒易付
if (trade.BankCardType == "C")