Merge branch 'feature-dgy-设置机具服务费优化' into feature-dgy-后台测试

# Conflicts:
#	Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -636,7 +636,7 @@ namespace MySystem.Areas.Admin.Controllers
                     item.Num += 1;
                 }
 
-                apply.SeoDescription = function.CheckString(SnNo) + ',';
+                apply.SeoDescription += function.CheckString(SnNo) + ',';
 
                 fromstore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
                 tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1 && m.Sort == 0);

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -6000,7 +6000,15 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string ChangePosFeeDo(string PosSn, string BrandId, string Deposit)
+        /// <summary>
+        /// 调整机具服务费
+        /// </summary>
+        /// <param name="PosSn">机具号</param>
+        /// <param name="BrandId">品牌Id</param>
+        /// <param name="Deposit">服务费</param>
+        /// <param name="OnlyShow">只修改显示</param>
+        /// <returns></returns>
+        public string ChangePosFeeDo(string PosSn, string BrandId, string Deposit, int OnlyShow)
         {
             AddSysLog("0", "SysTools", "ChangePosFeeDo");
             if (string.IsNullOrEmpty(PosSn))
@@ -6043,10 +6051,17 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             return "失败，无" + Deposit + "服务费相关设置权限";
                         }
-                        var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
-                        if (info != "设置成功")
+                        if (OnlyShow == 1)
                         {
-                            return info;
+                            posInfo.PrizeParams = Deposit;
+                        }
+                        else
+                        {
+                            var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
+                            if (info != "设置成功")
+                            {
+                                return info;
+                            }
                         }
                     }
                     //开店宝
@@ -6060,10 +6075,17 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             return "失败，无" + Deposit + "服务费相关设置权限";
                         }
-                        var info = PublicChangePosFee.SetKDBDeposit(SnId.ToString(), Deposit);
-                        if (info != "设置成功")
+                        if (OnlyShow == 1)
                         {
-                            return info;
+                            posInfo.PrizeParams = Deposit;
+                        }
+                        else
+                        {
+                            var info = PublicChangePosFee.SetKDBDeposit(SnId.ToString(), Deposit);
+                            if (info != "设置成功")
+                            {
+                                return info;
+                            }
                         }
                     }
                     //乐刷
@@ -6076,10 +6098,17 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             return "失败，无" + Deposit + "服务费相关设置权限";
                         }
-                        var info = PublicChangePosFee.SetLSDeposit(SnId.ToString(), Deposit);
-                        if (info != "设置成功")
+                        if (OnlyShow == 1)
                         {
-                            return info;
+                            posInfo.PrizeParams = Deposit;
+                        }
+                        else
+                        {
+                            var info = PublicChangePosFee.SetLSDeposit(SnId.ToString(), Deposit);
+                            if (info != "设置成功")
+                            {
+                                return info;
+                            }
                         }
                     }
                     //立刷
@@ -6093,10 +6122,17 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             return "失败，无" + Deposit + "服务费相关设置权限";
                         }
-                        var info = PublicChangePosFee.SetLISDeposit(SnId.ToString(), Deposit);
-                        if (info != "设置成功")
+                        if (OnlyShow == 1)
                         {
-                            return info;
+                            posInfo.PrizeParams = Deposit;
+                        }
+                        else
+                        {
+                            var info = PublicChangePosFee.SetLISDeposit(SnId.ToString(), Deposit);
+                            if (info != "设置成功")
+                            {
+                                return info;
+                            }
                         }
                     }
                     //盛付通
@@ -6143,10 +6179,17 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             return "失败，无" + Deposit + "服务费相关设置权限";
                         }
-                        var info = PublicChangePosFee.SetLDDeposit(SnId.ToString(), Deposit);
-                        if (info != "设置成功")
+                        if (OnlyShow == 1)
                         {
-                            return info;
+                            posInfo.PrizeParams = Deposit;
+                        }
+                        else
+                        {
+                            var info = PublicChangePosFee.SetLDDeposit(SnId.ToString(), Deposit);
+                            if (info != "设置成功")
+                            {
+                                return info;
+                            }
                         }
                     }
                     //盒易付
@@ -6160,10 +6203,17 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             return "失败，无" + Deposit + "服务费相关设置权限";
                         }
-                        var info = PublicChangePosFee.SetHYFDeposit(SnId.ToString(), Deposit);
-                        if (info != "设置成功")
+                        if (OnlyShow == 1)
                         {
-                            return info;
+                            posInfo.PrizeParams = Deposit;
+                        }
+                        else
+                        {
+                            var info = PublicChangePosFee.SetHYFDeposit(SnId.ToString(), Deposit);
+                            if (info != "设置成功")
+                            {
+                                return info;
+                            }
                         }
                     }
                 }

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -629,7 +629,6 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心未使用额度
 
         [HttpPost]
-        // public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind)
         public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
@@ -659,6 +658,9 @@ namespace MySystem.Areas.Admin.Controllers
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
 
+            AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
+            opdb.SaveChanges();
+
             if (OperateType > 0 && decimal.Parse(OperationAmount) > 0)
             {
                 OpAmountItem opAmountItem = new OpAmountItem
@@ -679,6 +681,7 @@ namespace MySystem.Areas.Admin.Controllers
                 RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
                 opdb.SaveChanges();
+
                 if (Kind == 2 && ReturnFlag == 1)
                 {
                     RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());

Areas/Admin/Views/MainServer/SysTools/ChangePosFee.cshtml

@@ -39,7 +39,7 @@
                                         <select id="BrandId" name="BrandId" lay-search="">
                                             @foreach (string key in ProfitObjectsActivesDic.Keys)
                                             {
-                                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
                                             }
                                         </select>
                                     </div>
@@ -56,6 +56,15 @@
                                         </select>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">只修改显示</label>
+                                        <div class="layui-input-block">
+                                            <input type="checkbox" id="OnlyShow" name="OnlyShow" value="1"
+                                                lay-skin="switch" title="开关">
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">机具SN</label>
                                     <div class="layui-input-block">