Merge branch 'feature-dgy-运营中心额度变动明细备注显示' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2912,6 +2912,52 @@ namespace MySystem.Areas.Admin.Controllers
                 UserId = pos.BuyUserId,
                 ApplyNo = "U" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
             });
+
+            var BeforeDeposit = 0;
+            if (string.IsNullOrEmpty(pos.PrizeParams))
+            {
+                BeforeDeposit = 299;
+                if (pos.BrandId == 6) BeforeDeposit = 249;
+            }
+            else
+            {
+                BeforeDeposit = int.Parse(pos.PrizeParams);
+            }
+
+            //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+            Dictionary<string, object> req = new Dictionary<string, object>();
+            var DepositId = "299";
+            req.Add("PosSnId", pos.Id);
+            req.Add("BrandId", pos.BrandId);
+            if (pos.BrandId == 6) DepositId = "249";
+            req.Add("Deposit", DepositId);
+            //重置服务费
+            RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+            //添加设置押金添加记录
+            PublicFunction.MerchantDepositSet(pos.BrandId, 0, pos.Id, pos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+            var ChangeFee = 0.60M;
+            var ChangeKind = 3;
+            var OpMan = "系统";
+            var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+            {
+                CreateDate = DateTime.Now, //创建时间
+                SeoDescription = "系统添加-坏机回仓重置费率",
+                Sort = pos.BrandId, //品牌Id
+                PosId = pos.Id, //机具Id
+                PosSn = pos.PosSn,
+                ChangeFee = ChangeFee, //调整费率
+            }).Entity;
+            db.SaveChanges();
+
+            // PosId:机具Id
+            // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+            // OpMan:操作人，app传创客编号，后台传SysUserName
+            //重置费率
+            string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+            RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
             pos.BindMerchantId = 0;
             pos.BindingState = 0;
             pos.BindingTime = null;
@@ -4251,6 +4297,7 @@ namespace MySystem.Areas.Admin.Controllers
                     string RecordId = "";
                     if (RecordFlag == 1)
                     {
+                        var merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == posInfo.BindMerchantId) ?? new PosMerchantInfo();
                         decimal ChangeFee = decimal.Parse(Fee);
                         PosMachinesFeeChangeRecord query = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == posInfo.Id && m.ChangeFee == ChangeFee && m.Status == 0);
                         if (query == null)
@@ -4266,8 +4313,10 @@ namespace MySystem.Areas.Admin.Controllers
                             db.SaveChanges();
                         }
                         query.MerchantId = posInfo.BindMerchantId;
+                        query.MerNo = merchant.KqMerNo;
                         query.UserId = posInfo.UserId;
                         query.ChangeFee = ChangeFee;
+                        db.SaveChanges();
                         RecordId = query.Id.ToString();
                     }
                     string data = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + posInfo.Id + "\",\"Fee\": \"" + Fee + "\",\"Kind\": \"" + FeeType + "\",\"OpMan\": \"系统\"}";

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -667,7 +667,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 account.TotalAmt -= decimal.Parse(OperationAmount);
                 OperateType = 2;//系统扣减
-                description = "系统扣减未使用额度";
+                description = "系统扣减未使用额度" + "-" + Note;
                 ChangeType = 13;
             }
 
@@ -677,7 +677,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
                 account.TotalAmt += decimal.Parse(OperationAmount);
                 OperateType = 1;//系统增加
-                description = "系统增加未使用额度";
+                description = "系统增加未使用额度" + "-" + Note;
                 ChangeType = 12;
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
@@ -749,18 +749,18 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 account.ValidForGetAmount -= decimal.Parse(OperationAmount);
                 OperateType = 2;
-                description = "系统扣减可提现额度";
+                description = "系统扣减可提现额度" + "-" + Note;
                 ChangeType = 13;
             }
             else if (Kind == 1 && decimal.Parse(OperationAmount) > account.ValidForGetAmount)
             {
-                return "扣减金额大于可提现额度";
+                return "扣减金额大于可提现额度" + "-" + Note;
             }
             else if (Kind == 2)
             {
                 account.ValidForGetAmount += decimal.Parse(OperationAmount);
                 OperateType = 1;
-                description = "系统增加可提现额度";
+                description = "系统增加可提现额度" + "-" + Note;
                 ChangeType = 12;
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额