Przeglądaj źródła

修复盒易付大pos50奖励
修复盒易付商户信息获取字段

lcl 1 rok temu
rodzic
commit
5928354906

+ 1 - 1
AppStart/Helper/StatService.cs

@@ -381,7 +381,7 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             DateTime yesterday = DateTime.Now.AddDays(-1);
             DateTime today = DateTime.Now.AddMinutes(-5);
-            IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && string.IsNullOrEmpty(m.SeoKeyword) && m.BrandId != 12 && m.Detail != "1");
+            IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && string.IsNullOrEmpty(m.SeoKeyword) && m.BrandId != 12 && m.BrandId != 13 && m.Detail != "1");
             if (posid > 0)
             {
                 posList = posList.Where(m => m.Id == posid);

+ 1 - 1
AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -44,7 +44,7 @@ namespace MySystem
                             if(merinfo != null)
                             {
                                 merinfo.MerIdcardNo = Mer.LegalIdCard;
-                                merinfo.MerchantName = Mer.MerName;
+                                merinfo.MerchantName = Mer.LegalName;
                             }
                             int IsFirst = 1;
                             if(!string.IsNullOrEmpty(Mer.LegalIdCard))

+ 1 - 1
AppStart/Timer/ResetSmallStoreHelper.cs

@@ -173,7 +173,7 @@ public class ResetSmallStoreHelper
                 db.SaveChanges();
             }
             account.ThisMonthPreAmount = PreProfitAmount;
-            account.ValidPreAmount = ProfitAmount;
+            account.ValidPreAmount = ProfitAmount + account.PreTempAmountForBalance + account.PreTempAmount;
             if (index % 200 == 0)
             {
                 db.SaveChanges();