完成，待测试

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1213,6 +1213,17 @@ namespace MySystem.Areas.Admin.Controllers
                                 opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                             }
 
+                            var BeforeDeposit = 0;
+                            if (string.IsNullOrEmpty(pos.PrizeParams))
+                            {
+                                BeforeDeposit = 299;
+                                if (pos.BrandId == 6) BeforeDeposit = 249;
+                            }
+                            else
+                            {
+                                BeforeDeposit = int.Parse(pos.PrizeParams);
+                            }
+
                             posInfo.StoreId = toStore.Id;
                             posInfo.BuyUserId = 0;
                             posInfo.UserId = 0;
@@ -1243,6 +1254,41 @@ namespace MySystem.Areas.Admin.Controllers
                             fromStore.LaveNum -= 1;
                             posInfo.FirstFlag = 0;
                             posInfo.IsExecute = 0;
+
+                            //机具回仓重置服务费和费率(服务费默认为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);
+
                             PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                             db.SaveChanges();
                         }
@@ -1309,6 +1355,17 @@ namespace MySystem.Areas.Admin.Controllers
                                 opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                             }
 
+                            var BeforeDeposit = 0;
+                            if (string.IsNullOrEmpty(pos.PrizeParams))
+                            {
+                                BeforeDeposit = 299;
+                                if (pos.BrandId == 6) BeforeDeposit = 249;
+                            }
+                            else
+                            {
+                                BeforeDeposit = int.Parse(pos.PrizeParams);
+                            }
+
                             posInfo.StoreId = toStore.Id;
                             posInfo.BuyUserId = 0;
                             posInfo.UserId = 0;
@@ -1337,6 +1394,41 @@ namespace MySystem.Areas.Admin.Controllers
                             toStore.TotalNum += 1;
                             posInfo.FirstFlag = 0;
                             posInfo.IsExecute = 0;
+
+                            //机具回仓重置服务费和费率(服务费默认为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);
+                            
                             PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                             db.SaveChanges();
                         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1996,6 +1996,17 @@ namespace MySystem.Areas.Admin.Controllers
                         opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                     }
 
+                    var BeforeDeposit = 0;
+                    if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                    {
+                        BeforeDeposit = 299;
+                        if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                    }
+                    else
+                    {
+                        BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                    }
+
                     oldpos.StoreId = storeBack.Id;
                     oldpos.QueryCount = 0;
                     oldpos.UpdateDate = null;
@@ -2039,6 +2050,41 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.Status = -1;
                     oldpos.FirstFlag = 0;
                     oldpos.IsExecute = 0;
+
+                    //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                    Dictionary<string, object> req = new Dictionary<string, object>();
+                    var DepositId = "299";
+                    req.Add("PosSnId", oldpos.Id);
+                    req.Add("BrandId", oldpos.BrandId);
+                    if (oldpos.BrandId == 6) DepositId = "249";
+                    req.Add("Deposit", DepositId);
+                    //重置服务费
+                    RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                    //添加设置押金添加记录
+                    PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.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 = oldpos.BrandId, //品牌Id
+                        PosId = oldpos.Id, //机具Id
+                        PosSn = oldpos.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\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                    RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
                     opdb.SaveChanges();
@@ -2229,6 +2275,17 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
 
+                    var BeforeDeposit = 0;
+                    if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                    {
+                        BeforeDeposit = 299;
+                        if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                    }
+                    else
+                    {
+                        BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                    }
+
                     oldpos.StoreId = storeBack.Id;
                     oldpos.QueryCount = 0;
                     oldpos.UpdateDate = null;
@@ -2272,6 +2329,41 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.Status = -1;
                     oldpos.FirstFlag = 0;
                     oldpos.IsExecute = 0;
+
+                    //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                    Dictionary<string, object> req = new Dictionary<string, object>();
+                    var DepositId = "299";
+                    req.Add("PosSnId", oldpos.Id);
+                    req.Add("BrandId", oldpos.BrandId);
+                    if (oldpos.BrandId == 6) DepositId = "249";
+                    req.Add("Deposit", DepositId);
+                    //重置服务费
+                    RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                    //添加设置押金添加记录
+                    PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.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 = oldpos.BrandId, //品牌Id
+                        PosId = oldpos.Id, //机具Id
+                        PosSn = oldpos.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\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                    RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
                     opdb.SaveChanges();
@@ -2555,6 +2647,17 @@ namespace MySystem.Areas.Admin.Controllers
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
 
+                var BeforeDeposit = 0;
+                if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                {
+                    BeforeDeposit = 299;
+                    if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                }
+                else
+                {
+                    BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                }
+
                 oldpos.StoreId = storeBack.Id;
                 oldpos.QueryCount = 0;
                 oldpos.UpdateDate = null;
@@ -2598,6 +2701,40 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.FirstFlag = 0;
                 oldpos.IsExecute = 0;
 
+                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                Dictionary<string, object> req = new Dictionary<string, object>();
+                var DepositId = "299";
+                req.Add("PosSnId", oldpos.Id);
+                req.Add("BrandId", oldpos.BrandId);
+                if (oldpos.BrandId == 6) DepositId = "249";
+                req.Add("Deposit", DepositId);
+                //重置服务费
+                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                //添加设置押金添加记录
+                PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.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 = oldpos.BrandId, //品牌Id
+                    PosId = oldpos.Id, //机具Id
+                    PosSn = oldpos.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\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                 db.SaveChanges();
                 opdb.SaveChanges();
@@ -4641,6 +4778,18 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
+
+                var BeforeDeposit = 0;
+                if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                {
+                    BeforeDeposit = 299;
+                    if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                }
+                else
+                {
+                    BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                }
+
                 oldpos.Status = 1;
                 oldpos.PosSnType = 0;
                 oldpos.QueryCount = 0;
@@ -4684,6 +4833,41 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.UserId = 0;
                 oldpos.FirstFlag = 0;
                 oldpos.IsExecute = 0;
+
+                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                Dictionary<string, object> req = new Dictionary<string, object>();
+                var DepositId = "299";
+                req.Add("PosSnId", oldpos.Id);
+                req.Add("BrandId", oldpos.BrandId);
+                if (oldpos.BrandId == 6) DepositId = "249";
+                req.Add("Deposit", DepositId);
+                //重置服务费
+                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                //添加设置押金添加记录
+                PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.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 = oldpos.BrandId, //品牌Id
+                    PosId = oldpos.Id, //机具Id
+                    PosSn = oldpos.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\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
             }
             if (!string.IsNullOrEmpty(error))
@@ -5012,6 +5196,17 @@ namespace MySystem.Areas.Admin.Controllers
                         opData.Add(pos.BuyUserId + ":" + pos.BrandId);
                     }
 
+                    var BeforeDeposit = 0;
+                    if (string.IsNullOrEmpty(pos.PrizeParams))
+                    {
+                        BeforeDeposit = 299;
+                        if (pos.BrandId == 6) BeforeDeposit = 249;
+                    }
+                    else
+                    {
+                        BeforeDeposit = int.Parse(pos.PrizeParams);
+                    }
+
                     pos.StoreId = BackStore.Id;//变更机具所属仓库，重置为仓库机
                     pos.Status = 1;
                     pos.QueryCount = 0;
@@ -5055,6 +5250,41 @@ namespace MySystem.Areas.Admin.Controllers
                     pos.UserId = 0;
                     pos.FirstFlag = 0;
                     pos.IsExecute = 0;
+
+                    //机具回仓重置服务费和费率(服务费默认为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);
+
                     PublicFunction.ClearPosHistory(db, pos.PosSn); //清除机具历史记录
                 }
                 else

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -716,6 +716,17 @@ namespace MySystem.Areas.Admin.Controllers
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
 
+                                var BeforeDeposit = 0;
+                                if (string.IsNullOrEmpty(posInfo.PrizeParams))
+                                {
+                                    BeforeDeposit = 299;
+                                    if (posInfo.BrandId == 6) BeforeDeposit = 249;
+                                }
+                                else
+                                {
+                                    BeforeDeposit = int.Parse(posInfo.PrizeParams);
+                                }
+
                                 posInfo.StoreId = toStore.Id;
                                 posInfo.BuyUserId = 0;
                                 posInfo.UserId = 0;
@@ -746,6 +757,41 @@ namespace MySystem.Areas.Admin.Controllers
                                 toStore.LaveNum += 1;
                                 fromStore.TotalNum -= 1;
                                 fromStore.LaveNum -= 1;
+
+                                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                                Dictionary<string, object> req = new Dictionary<string, object>();
+                                var DepositId = "299";
+                                req.Add("PosSnId", posInfo.Id);
+                                req.Add("BrandId", posInfo.BrandId);
+                                if (posInfo.BrandId == 6) DepositId = "249";
+                                req.Add("Deposit", DepositId);
+                                //重置服务费
+                                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                                //添加设置押金添加记录
+                                PublicFunction.MerchantDepositSet(posInfo.BrandId, 0, posInfo.Id, posInfo.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 = posInfo.BrandId, //品牌Id
+                                    PosId = posInfo.Id, //机具Id
+                                    PosSn = posInfo.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\":\"" + posInfo.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                                 PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }
@@ -811,6 +857,17 @@ namespace MySystem.Areas.Admin.Controllers
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
 
+                                var BeforeDeposit = 0;
+                                if (string.IsNullOrEmpty(posInfo.PrizeParams))
+                                {
+                                    BeforeDeposit = 299;
+                                    if (posInfo.BrandId == 6) BeforeDeposit = 249;
+                                }
+                                else
+                                {
+                                    BeforeDeposit = int.Parse(posInfo.PrizeParams);
+                                }
+
                                 posInfo.StoreId = toStore.Id;
                                 posInfo.BuyUserId = 0;
                                 posInfo.UserId = 0;
@@ -839,6 +896,41 @@ namespace MySystem.Areas.Admin.Controllers
                                 fuserMachineData.UnBindCount -= 1;
                                 toStore.LaveNum += 1;
                                 toStore.TotalNum += 1;
+
+                                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                                Dictionary<string, object> req = new Dictionary<string, object>();
+                                var DepositId = "299";
+                                req.Add("PosSnId", posInfo.Id);
+                                req.Add("BrandId", posInfo.BrandId);
+                                if (posInfo.BrandId == 6) DepositId = "249";
+                                req.Add("Deposit", DepositId);
+                                //重置服务费
+                                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                                //添加设置押金添加记录
+                                PublicFunction.MerchantDepositSet(posInfo.BrandId, 0, posInfo.Id, posInfo.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 = posInfo.BrandId, //品牌Id
+                                    PosId = posInfo.Id, //机具Id
+                                    PosSn = posInfo.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\":\"" + posInfo.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+                                
                                 PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }