Merge branch 'feat-lcl-好哒品牌' of kxs-end/main-server into release-mainserver

AppStart/Helper/StatService.cs

@@ -779,7 +779,16 @@ namespace MySystem
                 RedisDbconn.Instance.AddList("ActiveRewardFailQueue", "{\"PosId\":\"" + pos.Id + "\",\"UserId\":\"" + GetUserId + "\",\"ActPrize\":\"" + ActPrize + "\",\"ChangeType\":\"" + ChangeType + "\",\"ActType\":\"" + ActType + "\"}");
                 return;
             }
-            bool check = db.ActiveReward.Any(m => m.KqMerNo == MerNo && m.RewardAmount == ActPrize && m.ActType == ActType);
+            List<int> BrandIds = new List<int>();
+            BrandIds.Add(18);
+            BrandIds.Add(19);
+            BrandIds.Add(20);
+            BrandIds.Add(21);
+            bool check = false;
+            if(!BrandIds.Contains(pos.BrandId))
+            {
+                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 (!check && !check1)
             {