Просмотр исходного кода

跨品牌换机,品牌不一样则不继承押金

lcl 1 год назад
Родитель
Сommit
5b2d6f85dd

+ 5 - 2
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2873,8 +2873,11 @@ namespace MySystem.Areas.Admin.Controllers
                 newpos.BindingTime = oldpos.BindingTime;
                 newpos.BindingTime = oldpos.BindingTime;
                 newpos.ActivationTime = oldpos.ActivationTime;
                 newpos.ActivationTime = oldpos.ActivationTime;
                 newpos.IsFirst = oldpos.IsFirst;
                 newpos.IsFirst = oldpos.IsFirst;
-                newpos.SeoKeyword = oldpos.SeoKeyword;
-                newpos.PrizeParams = oldpos.PrizeParams;
+                if(newpos.BrandId == oldpos.BrandId)
+                {
+                    newpos.SeoKeyword = oldpos.SeoKeyword;
+                    newpos.PrizeParams = oldpos.PrizeParams;
+                }
                 newpos.LeaderUserId = oldpos.LeaderUserId;
                 newpos.LeaderUserId = oldpos.LeaderUserId;
                 newpos.BindMerchantId = oldpos.BindMerchantId;
                 newpos.BindMerchantId = oldpos.BindMerchantId;
                 newpos.FirstFlag = oldpos.FirstFlag;
                 newpos.FirstFlag = oldpos.FirstFlag;

+ 1 - 1
Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -473,7 +473,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (QueryCount == 1) dic["LockName"] = "已提交";
                 if (QueryCount == 1) dic["LockName"] = "已提交";
                 dic.Remove("QueryCount");
                 dic.Remove("QueryCount");
 
 
-                Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId) ?? new Leaders();
+                Models.Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId) ?? new Models.Leaders();
                 //对公标记
                 //对公标记
                 dic.Add("BusinessFlag", leader.BusinessFlag == 1 ? "是" : "否");
                 dic.Add("BusinessFlag", leader.BusinessFlag == 1 ? "是" : "否");
             }
             }