Browse Source

来客吧电签出现0返50 与300激活奖励重复发放问题,故需增加限制

lcl 1 year ago
parent
commit
33cd6e6b75
2 changed files with 20 additions and 3 deletions
  1. BIN
      .DS_Store
  2. 20 3
      AppStart/Helper/StatService.cs

BIN
.DS_Store


+ 20 - 3
AppStart/Helper/StatService.cs

@@ -714,9 +714,26 @@ namespace MySystem
 
         public void doActiveReward(WebCMSEntities db, PosMerchantInfo merchant, PosMachinesTwo pos, int GetUserId, string ParentNav, int TopUserId, decimal ActPrize, int ChangeType = 0, int ActType = 0)
         {
-            bool check = db.ActiveReward.Any(m => m.KqMerNo == merchant.KqMerNo && m.RewardAmount == ActPrize);
-            bool check1 = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.RewardAmount == ActPrize);
-            if (!check && !check1)
+            bool op = false;
+            if(pos.BrandId == 15)
+            {
+                bool check = db.ActiveReward.Any(m => m.KqMerNo == merchant.KqMerNo);
+                bool check1 = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn);
+                if (!check && !check1)
+                {
+                    op = true;
+                }
+            }
+            else
+            {
+                bool check = db.ActiveReward.Any(m => m.KqMerNo == merchant.KqMerNo && m.RewardAmount == ActPrize);
+                bool check1 = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.RewardAmount == ActPrize);
+                if (!check && !check1)
+                {
+                    op = true;
+                }
+            }
+            if (op)
             {
                 function.WriteLog(DateTime.Now.ToString() + ":" + pos.PosSn, "实时处理激活奖励");
                 Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();