Merge branch 'test-mainserver' into release-mainserver

AppStart/Helper/LeaderPrizeService.cs

@@ -37,7 +37,7 @@ namespace MySystem
                         if (pos != null)
                         {
                             bool IsGet = true;
-                            if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                            if(Utils.Instance.IsWifi(pos.BrandId))
                             {
                                 int Count = db.UserAccountRecord.Count(m => m.QueryCount == PosId && m.ChangeType == 116);
                                 int Count1 = db.WifiTradeRecord.Count(m => m.SnNo == pos.PosSn);
@@ -54,7 +54,7 @@ namespace MySystem
                                 {
                                     ChangeAmount = 19 * 0.15M;
                                 }
-                                if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                                if(Utils.Instance.IsWifi(pos.BrandId))
                                 {
                                     int tradeCount = db.WifiTradeRecord.Count(m => m.SnNo == pos.PosSn);
                                     if (tradeCount > 0)

AppStart/Helper/OperatePrizeService.cs

@@ -38,7 +38,7 @@ namespace MySystem
                         if (pos != null)
                         {
                             bool IsGet = true;
-                            if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                            if(Utils.Instance.IsWifi(pos.BrandId))
                             {
                                 int Count = db.UserAccountRecord.Count(m => m.QueryCount == PosId && m.ChangeType == 121);
                                 int Count1 = db.WifiTradeRecord.Count(m => m.SnNo == pos.PosSn);
@@ -73,7 +73,7 @@ namespace MySystem
                                     {
                                         ChangeAmount = 19 * 0.05M;
                                     }
-                                    if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                                    if(Utils.Instance.IsWifi(pos.BrandId))
                                     {
                                         int tradeCount = db.WifiTradeRecord.Count(m => m.SnNo == pos.PosSn);
                                         if (tradeCount > 0)

AppStart/Helper/StatService.cs

@@ -1240,7 +1240,7 @@ namespace MySystem
                         {
                             function.WriteLog("sn:" + pos.PosSn, "开机奖励发放日志");
                             bool IsGet = true;
-                            if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                            if(Utils.Instance.IsWifi(pos.BrandId))
                             {
                                 int Count = db.OpenRewardDetail.Count(m => m.SnNo == pos.PosSn);
                                 int Count1 = db.WifiTradeRecord.Count(m => m.SnNo == pos.PosSn);
@@ -1272,11 +1272,11 @@ namespace MySystem
                                                 {
                                                     Prize = 19 * 0.3M;
                                                 }
-                                                if(pos.BrandId == 18 || pos.BrandId == 19 || pos.BrandId == 20 || pos.BrandId == 21)
+                                                if(Utils.Instance.IsHaoDa(pos.BrandId))
                                                 {
                                                     Prize = 20;
                                                 }
-                                                if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                                                if(Utils.Instance.IsWifi(pos.BrandId))
                                                 {
                                                     PxcModels.WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn);
                                                     if (trade != null)

AppStart/Helper/SycnSpServer/SycnSpActiveService.cs

@@ -42,7 +42,7 @@ namespace MySystem
                         PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == act.SnNo && m.BindingTime != null);
                         if (pos != null)
                         {
-                            if(pos.BrandId == 18 || pos.BrandId == 19 || pos.BrandId == 20 || pos.BrandId == 21)
+                            if(Utils.Instance.IsHaoDa(pos.BrandId))
                             {
                                 pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == act.SnNo && m.BindingTime != null);
                             }
@@ -100,7 +100,7 @@ namespace MySystem
                                     }
                                 }
                             }
-                            if(pos.BrandId == 18 || pos.BrandId == 19 || pos.BrandId == 20 || pos.BrandId == 21)
+                            if(Utils.Instance.IsHaoDa(pos.BrandId))
                             {
                                 int CheckDays = 30;
                                 DateTime now = DateTime.Now;
@@ -137,7 +137,6 @@ namespace MySystem
                                         }
                                         else if(Deposit == 228)
                                         {
-
                                             if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
                                             {
                                                 Prize = 0;
@@ -149,7 +148,6 @@ namespace MySystem
                                         }
                                         else if(Deposit == 380)
                                         {
-
                                             if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
                                             {
                                                 Prize = 100;
@@ -161,14 +159,38 @@ namespace MySystem
                                         }
                                         else if(Deposit == 399)
                                         {
-
                                             if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
                                             {
                                                 Prize = 0;
                                             }
                                             else
                                             {
-                                                Prize = 150;
+                                                if(pos.BrandId == 29)
+                                                {
+                                                    Prize = 131;
+                                                }
+                                                else
+                                                {
+                                                    Prize = 150;
+                                                }
+                                            }
+                                        }
+                                        else if(Deposit == 499)
+                                        {
+                                            if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
+                                            {
+                                                Prize = 0;
+                                            }
+                                            else
+                                            {
+                                                if(pos.BrandId == 29)
+                                                {
+                                                    Prize = 218;
+                                                }
+                                                else
+                                                {
+                                                    Prize = 150;
+                                                }
                                             }
                                         }
                                     }

Util/Utils.cs

@@ -468,7 +468,6 @@ namespace MySystem
             Check.Add(20);
             Check.Add(21);
             Check.Add(29);
-            Check.Add(30);
             return Check.Contains(BrandId);
         }
 

appsettings.json

@@ -21,7 +21,7 @@
     "Pxc1SqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;DefaultCommandTimeout=600;",
     "ReadSqlConnStr": "server=rr-2vc53lrwpwm1ewscogo.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;DefaultCommandTimeout=600;",
     "MainSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsStatServer;charset=utf8;",
-    "SpSqlConnStr": "server=jumpserver.kexiaoshuang.com;port=33061;user=b219f113-6185-4033-9c97-077354d3d9ab;password=ZyuzRipHgjQ1iLsY;database=KxsSpServer;charset=utf8;",
+    "SpSqlConnStr": "server=jumpserver.kexiaoshuang.com;port=33061;user=8b2a536a-add6-4b6a-a1bc-4133e76c6095;password=nnUhPjQTazEctXDp;database=KxsSpServer;charset=utf8;",
     "OpSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsOpServer;charset=utf8;",
     "MpSqlConnStr": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "MpSqlConnStr2": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",