WIFI超时未激活扣款金额判断

AppStart/Helper/StatService.cs

@@ -817,7 +817,7 @@ namespace MySystem
                 check = db.ActiveReward.Any(m => m.KqMerNo == MerNo && m.RewardAmount == ActPrize && m.ActType == ActType);
             }
             bool check1 = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.RewardAmount == ActPrize && m.ActType == ActType);
-            if(pos.BrandId >= 23 && pos.BrandId <= 26)
+            if(Utils.Instance.IsWifi(pos.BrandId))
             {
                 // check1 = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn);
                 check = false;

AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -99,7 +99,7 @@ namespace MySystem
 
                                     string MerNo = Bind.MerNo;
                                     //wifi设备取sn
-                                    if(pos.BrandId >= 23 && pos.BrandId <= 26)
+                                    if(Utils.Instance.IsWifi(pos.BrandId))
                                     {
                                         MerNo = Bind.MerSnNo;
                                     }

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -64,11 +64,11 @@ namespace MySystem
                                     add = db.PosMerchantInfo.FirstOrDefault(m => m.KqSnNo == Mer.SnNo && m.MerIdcardNo == Mer.MerIdcardNo && m.MerchantName == Mer.MerName);
                                 }
                                 //如果是好哒和WIFI品牌需要和SN一起判断
-                                if(pos.BrandId >= 18 && pos.BrandId <= 21)
+                                if(Utils.Instance.IsHaoDa(pos.BrandId))
                                 {
                                     add = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mer.MerNo && m.KqSnNo == Mer.SnNo);
                                 }
-                                if(pos.BrandId >= 23 && pos.BrandId <= 26)
+                                if(Utils.Instance.IsWifi(pos.BrandId))
                                 {
                                     add = db.PosMerchantInfo.FirstOrDefault(m => m.KqSnNo == Mer.SnNo);
                                 }
@@ -160,7 +160,7 @@ namespace MySystem
                                         add.MerchantNo = Mer.MerNo.Length > 16 ? Mer.MerNo.Substring(0, 16) : Mer.MerNo;
                                     }
                                 }
-                                if(pos.BrandId >= 23 && pos.BrandId <= 26)
+                                if(Utils.Instance.IsWifi(pos.BrandId))
                                 {
                                     add.KqMerNo = Mer.SnNo;
                                 }

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -538,7 +538,7 @@ namespace MySystem
                                             {
                                                 Version = 1;
                                             }
-                                            if(pos.BrandId >= 23 && pos.BrandId <= 26)
+                                            if(Utils.Instance.IsWifi(pos.BrandId))
                                             {
                                                 MerHelpFlag = 1;
                                                 Version = 0;

AppStart/Helper/WifiWithholdService.cs

@@ -67,7 +67,23 @@ namespace MySystem
                     foreach(var Pos in WifiList)
                     {
                         KqProducts brand = db.KqProducts.FirstOrDefault(m => m.Id == Pos.BrandId) ?? new KqProducts();
-                        decimal ChargeAmount = decimal.Parse(function.CheckNum(Pos.SeoKeyword));
+                        decimal ChargeAmount = 0;
+                        if(Pos.BrandId == 23)
+                        {
+                            ChargeAmount = 30;
+                        }
+                        if(Pos.BrandId == 24)
+                        {
+                            ChargeAmount = 120;
+                        }
+                        if(Pos.BrandId == 25)
+                        {
+                            ChargeAmount = 200;
+                        }
+                        if(Pos.BrandId == 26)
+                        {
+                            ChargeAmount = 750;
+                        }
                         bool check = db.ToChargeBackRecord.Any(m => m.SeoDescription.Contains(Pos.PosSn) && (m.Status == 3 || m.Status == 0));
                         if(!check)
                         {

Util/Utils.cs

@@ -407,7 +407,7 @@ namespace MySystem
             RedisDbconn.Instance.Set("KxsActQueueChk:" + pos.PosSn, DateTime.Now.ToString());
             RedisDbconn.Instance.SetExpire("KxsActQueueChk:" + pos.PosSn, 7200);
             int actType = pos.BrandId != 14 ? 1 : 2;
-            if(pos.BrandId >= 23 && pos.BrandId <= 26) actType = 5;
+            if(Utils.Instance.IsWifi(pos.BrandId)) actType = 5;
             string data = "{";
             data += "\"userId\":\"" + pos.BuyUserId + "\",";
             data += "\"brandId\":\"" + pos.BrandId + "\",";