调整设置问题

AppStart/Helper/ChangePosFeeQueue.cs

@@ -34,9 +34,11 @@ public class ChangePosFeeQueue
                 {
                     function.WriteLog("data:" + data, "金控机具服务费调整日志");
                     JsonData Info = JsonMapper.ToObject(data);
-                    string PosSnId = Info["PosSnId"].ToString(); //机具Id
+                    string PosSn = Info["PosSn"].ToString(); //机具Id
                     string BrandId = Info["BrandId"].ToString(); //品牌Id
                     string Deposit = Info["Deposit"].ToString(); //服务费
+                    string UserId = Info["UserId"].ToString();
+                    
                     int bId = int.Parse(BrandId);
 
                     //金控
@@ -46,7 +48,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetJKDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetJKDeposit(PosSn, Deposit);
                     }
                     //开店宝
                     if (bId == 2)
@@ -55,7 +57,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "471";
                         else if (Deposit == "199") Deposit = "472";
                         else if (Deposit == "299") Deposit = "473";
-                        ChangePosFeeUtil.SetKDBDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetKDBDeposit(PosSn, Deposit);
                     }
                     //乐刷
                     if (bId == 4 || bId == 5)
@@ -63,7 +65,7 @@ public class ChangePosFeeQueue
                         if (Deposit == "99") Deposit = "100";
                         else if (Deposit == "199") Deposit = "200";
                         else if (Deposit == "299") Deposit = "300";
-                        ChangePosFeeUtil.SetLSDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetLSDeposit(PosSn, Deposit, BrandId);
                     }
                     //立刷
                     if (bId == 6)
@@ -72,7 +74,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetLISDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetLISDeposit(PosSn, Deposit, BrandId);
                     }
                     //立刷微电签
                     if (bId == 22)
@@ -81,7 +83,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetLISDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetLISDeposit(PosSn, Deposit, BrandId);
                     }
                     //盛付通
                     if (bId == 7)
@@ -90,7 +92,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetSFTDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetSFTDeposit(PosSn, Deposit);
                     }
                     //海科
                     if (bId == 8 || bId == 9)
@@ -98,7 +100,7 @@ public class ChangePosFeeQueue
                         if (Deposit == "99") Deposit = "100";
                         else if (Deposit == "199") Deposit = "200";
                         else if (Deposit == "299") Deposit = "300";
-                        ChangePosFeeUtil.SetHKDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetHKDeposit(PosSn, Deposit, BrandId);
                     }
                     //联动
                     if (bId == 10 || bId == 11)
@@ -107,7 +109,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetLDDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetLDDeposit(PosSn, Deposit, BrandId);
                     }
                     //盒易付
                     if (bId == 12 || bId == 13)
@@ -116,7 +118,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetHYFDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetHYFDeposit(PosSn, Deposit, UserId);
                     }
                     //联客宝
                     if (bId == 15 || bId == 16)
@@ -125,7 +127,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetPosPDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetPosPDeposit(PosSn, Deposit);
                     }
                     //拉卡拉
                     if (bId == 30 || bId == 31)
@@ -134,7 +136,7 @@ public class ChangePosFeeQueue
                         else if (Deposit == "99") Deposit = "99";
                         else if (Deposit == "199") Deposit = "199";
                         else if (Deposit == "299") Deposit = "299";
-                        ChangePosFeeUtil.SetLKLDeposit(PosSnId.ToString(), Deposit);
+                        ChangePosFeeUtil.SetLKLDeposit(PosSn, Deposit);
                     }
                 }
                 else

AppStart/Helper/ChangePosFeeUtil.cs

@@ -25,82 +25,33 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetJKPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetJKPosDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
                 //判断是否存在关联数据
                 string content = "";
-                // PosMachineOther otherPos = db.PosMachineOther.FirstOrDefault(m => m.Id == pos.Id);
-                // if(otherPos != null)
-                // {
-                    function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "金控-设置押金-返回报文");
-                    content = PublicImportDataService.Instance.LkbSetDeposit(pos.PosSn, decimal.Parse(DepositId));
-                    function.WriteLog(DateTime.Now.ToString() + "\n" + content, "金控-设置押金-返回报文");
-                    if (content == "fail")
-                    {
-                        return "机具" + pos.PosSn + "设置失败";
-                    }
-                    JsonData jsonObj = JsonMapper.ToObject(content);
-                    if (jsonObj["code"].ToString() != "000000")
-                    {
-                        return jsonObj["message"].ToString();
-                    }
-                    content = jsonObj["data"].ToString();
-                    content = PublicImportDataService.Instance.LkbDecrypt(content);
-                    JsonData contentObj = JsonMapper.ToObject(content);
-                    if (contentObj["respCode"].ToString() != "00")
-                    {
-                        return contentObj["respMsg"].ToString();
-                    }
-                // }
-                // else
-                // {
-                //     function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "金控-设置押金-返回报文");
-                //     content = function.GetWebRequest("http://sp.kexiaoshuang.com/api/test/SetDeposit?sn=" + pos.PosSn + "&num=" + DepositId);
-                //     function.WriteLog(DateTime.Now.ToString() + "\n" + content, "金控-设置押金-返回报文");
-                //     if (content == "fail")
-                //     {
-                //         return "机具" + pos.PosSn + "设置失败";
-                //     }
-                //     JsonData jsonObj = JsonMapper.ToObject(content);
-                //     if (jsonObj["code"].ToString() != "000000")
-                //     {
-                //         return jsonObj["message"].ToString();
-                //     }
-                //     content = jsonObj["data"].ToString();
-                //     content = PublicImportDataService.Instance.Decrypt(content);
-                //     JsonData contentObj = JsonMapper.ToObject(content);
-                //     if (contentObj["respCode"].ToString() != "00")
-                //     {
-                //         return contentObj["respMsg"].ToString();
-                //     }
-                // }
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "金控-设置押金-返回报文");
+                content = PublicImportDataService.Instance.LkbSetDeposit(PosSn, decimal.Parse(DepositId));
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "金控-设置押金-返回报文");
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
+                if (content == "fail")
                 {
-                    BeforeDeposit = 299;
+                    return "机具" + PosSn + "设置失败";
                 }
-                else
+                JsonData jsonObj = JsonMapper.ToObject(content);
+                if (jsonObj["code"].ToString() != "000000")
                 {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
+                    return jsonObj["message"].ToString();
                 }
-                decimal amount = decimal.Parse(DepositId);
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
+                content = jsonObj["data"].ToString();
+                content = PublicImportDataService.Instance.LkbDecrypt(content);
+                JsonData contentObj = JsonMapper.ToObject(content);
+                if (contentObj["respCode"].ToString() != "00")
+                {
+                    return contentObj["respMsg"].ToString();
+                }
+                function.WriteLog(DateTime.Now.ToString() + "\n" + content, "金控-设置押金-返回报文");
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -118,41 +69,17 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetKDBPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetKDBPosDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "开店宝-设置押金-返回报文");
-                string content = PublicImportDataService.Instance.ModifyDeposit(pos.PosSn, DepositId);
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "开店宝-设置押金-返回报文");
+                string content = PublicImportDataService.Instance.ModifyDeposit(PosSn, DepositId);
                 if (content == "fail")
                 {
-                    return "机具" + pos.PosSn + "设置失败";
+                    return "机具" + PosSn + "设置失败";
                 }
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "开店宝-设置押金-返回报文");
-
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                decimal amount = decimal.Parse(PublicImportDataService.Instance.GetDepositAmount(DepositId));
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -160,7 +87,7 @@ namespace MySystem
 
 
         #region 乐刷-设置押金
-        public static string SetLSDeposit(string SnIds, string DepositId)
+        public static string SetLSDeposit(string SnIds, string DepositId, string BrandId = "4")
         {
             // string DepositId = "300";
             string check = RedisDbconn.Instance.Get<string>("SetLSPosDepositWait:" + SnIds);
@@ -170,17 +97,10 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetLSPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetLSPosDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
                 string OldId = "", NewId = "";
                 if (DepositId == "100")
                 {
@@ -194,19 +114,19 @@ namespace MySystem
                 {
                     NewId = "709820390742437888";
                 }
-                string content = PublicImportDataService.Instance.QueryActiveForConfig(pos.PosSn, pos.BrandId);
+                string content = PublicImportDataService.Instance.QueryActiveForConfig(PosSn, int.Parse(BrandId));
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() == "0")
                 {
                     OldId = jsonObj["data"]["posMarket"]["id"].ToString();
                 }
                 jsonObj = JsonMapper.ToObject(content);
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + OldId + ":" + NewId, "乐刷-设置押金-返回报文");
-                content = PublicImportDataService.Instance.SetDepositForLS(pos.PosSn, OldId, NewId, pos.BrandId);
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + OldId + ":" + NewId, "乐刷-设置押金-返回报文");
+                content = PublicImportDataService.Instance.SetDepositForLS(PosSn, OldId, NewId, int.Parse(BrandId));
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "乐刷-设置押金-返回报文");
                 if (content == "fail")
                 {
-                    return "机具" + pos.PosSn + "设置失败";
+                    return "机具" + PosSn + "设置失败";
                 }
                 jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() != "0")
@@ -214,27 +134,8 @@ namespace MySystem
                     return jsonObj["msg"].ToString();
                 }
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "乐刷-设置押金-返回报文");
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                decimal amount = decimal.Parse(DepositId);
-                if (pos.BrandId == 4 || pos.BrandId == 5)
-                {
-                    amount -= 1;
-                }
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
+                
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -242,9 +143,8 @@ namespace MySystem
 
 
         #region 立刷-设置押金
-        public static string SetLISDeposit(string SnIds, string DepositId)
+        public static string SetLISDeposit(string SnIds, string DepositId, string BrandId = "6")
         {
-            // string DepositId = "249";
             string check = RedisDbconn.Instance.Get<string>("SetLISPosDepositWait:" + SnIds);
             if (!string.IsNullOrEmpty(check))
             {
@@ -252,26 +152,19 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetLISPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetLISPosDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "立刷-设置押金-返回报文");
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "立刷-设置押金-返回报文");
                 string content = "";
-                if(pos.BrandId == 6)
+                if(BrandId == "6")
                 {
-                    content = PublicImportDataService.Instance.SetLiSDeposit(pos.PosSn, int.Parse(DepositId));
+                    content = PublicImportDataService.Instance.SetLiSDeposit(PosSn, int.Parse(DepositId));
                 }
                 else
                 {
-                    content = PublicImportDataService.Instance.SetLiSWeDeposit(pos.PosSn, int.Parse(DepositId));
+                    content = PublicImportDataService.Instance.SetLiSWeDeposit(PosSn, int.Parse(DepositId));
                 }
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "立刷-设置押金-返回报文");
                 JsonData jsonObj = JsonMapper.ToObject(content);
@@ -280,22 +173,8 @@ namespace MySystem
                     return jsonObj["ret_msg"].ToString();
                 }
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "立刷-设置押金-返回报文");
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                pos.PrizeParams = DepositId;
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
+                
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -313,51 +192,29 @@ namespace MySystem
             RedisDbconn.Instance.Set("SetSFTPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetSFTPosDepositWait:" + SnIds, 10);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            WebCMSEntities db = new WebCMSEntities();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum) ?? new PosMachinesTwo();
-                if (!string.IsNullOrEmpty(pos.SeoKeyword))
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "盛付通-设置押金-返回报文");
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "盛付通-设置押金-返回报文");
                 string DepositIdString = DepositId;
                 if(DepositIdString == "0") DepositIdString = "000";
-                if(DepositId == "0")
-                {
-                    PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PosMerchantInfo();
-                    if(!string.IsNullOrEmpty(merchant.KqMerNo))
-                    {
-                        string back = PublicImportDataService.Instance.SftSnBindOrUnbind(pos.PosSn, merchant.KqMerNo);
-                        function.WriteLog("back:" + back, "盛付通-设置押金-返回报文");
-                    }
-                }
-                string content = PublicImportDataService.Instance.SetDepositForSft(pos.PosSn, "2024POS" + DepositIdString);
+                // if(DepositId == "0")
+                // {
+                //     PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PosMerchantInfo();
+                //     if(!string.IsNullOrEmpty(merchant.KqMerNo))
+                //     {
+                //         string back = PublicImportDataService.Instance.SftSnBindOrUnbind(PosSn, merchant.KqMerNo);
+                //         function.WriteLog("back:" + back, "盛付通-设置押金-返回报文");
+                //     }
+                // }
+                string content = PublicImportDataService.Instance.SetDepositForSft(PosSn, "2024POS" + DepositIdString);
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "盛付通-设置押金-返回报文");
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["respCode"].ToString() != "00")
                 {
                     return jsonObj["errorMsg"].ToString();
                 }
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                pos.PrizeParams = DepositId.Replace("2024POS", "");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -365,7 +222,7 @@ namespace MySystem
 
 
         #region 海科-设置押金
-        public static string SetHKDeposit(string SnIds, string DepositId)
+        public static string SetHKDeposit(string SnIds, string DepositId, string BrandId = "8")
         {
             // string DepositId = "300";
             string check = RedisDbconn.Instance.Get<string>("SetHKPosDepositWait:" + SnIds);
@@ -378,68 +235,41 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
                 string OldId = "", NewId = "";
                 if (DepositId == "100")
                 {
-                    NewId = pos.BrandId == 8 ? "202207011718129" : "202207011718197";
+                    NewId = BrandId == "8" ? "202207011718129" : "202207011718197";
                 }
                 else if (DepositId == "200")
                 {
-                    NewId = pos.BrandId == 8 ? "747200504467566592" : "747199934126108672";
+                    NewId = BrandId == "8" ? "747200504467566592" : "747199934126108672";
                 }
                 else if (DepositId == "300")
                 {
-                    NewId = pos.BrandId == 8 ? "747193472108732416" : "747193820156276736";
+                    NewId = BrandId == "8" ? "747193472108732416" : "747193820156276736";
                 }
-                string content = PublicImportDataService.Instance.QueryActiveForConfigHK(pos.PosSn, pos.BrandId);
+                string content = PublicImportDataService.Instance.QueryActiveForConfigHK(PosSn, int.Parse(BrandId));
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() == "0")
                 {
                     OldId = jsonObj["data"]["posMarket"]["id"].ToString();
                 }
                 jsonObj = JsonMapper.ToObject(content);
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + OldId + ":" + NewId, "海科-设置押金-返回报文");
-                content = PublicImportDataService.Instance.SetDepositForHK(pos.PosSn, OldId, NewId, pos.BrandId);
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + OldId + ":" + NewId, "海科-设置押金-返回报文");
+                content = PublicImportDataService.Instance.SetDepositForHK(PosSn, OldId, NewId, int.Parse(BrandId));
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "海科-设置押金-返回报文");
                 if (content == "fail")
                 {
-                    return "机具" + pos.PosSn + "设置失败";
+                    return "机具" + PosSn + "设置失败";
                 }
                 jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() != "0")
                 {
                     return jsonObj["msg"].ToString();
                 }
-                decimal amount = decimal.Parse(DepositId);
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                if (pos.BrandId == 8 || pos.BrandId == 9)
-                {
-                    amount -= 1;
-                }
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
-
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -447,7 +277,7 @@ namespace MySystem
 
 
         #region 联动-设置押金
-        public static string SetLDDeposit(string SnIds, string DepositId)
+        public static string SetLDDeposit(string SnIds, string DepositId, string BrandId = "10")
         {
             // string DepositId = "299";
             string check = RedisDbconn.Instance.Get<string>("SetLDPosDepositWait:" + SnIds);
@@ -458,41 +288,18 @@ namespace MySystem
             RedisDbconn.Instance.Set("SetLDPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetLDPosDepositWait:" + SnIds, 10);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            WebCMSEntities db = new WebCMSEntities();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "联动-设置押金-返回报文");
-                string content = PublicImportDataService.Instance.LDServiceFee(pos.PosSn, int.Parse(DepositId), pos.BrandId);
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "联动-设置押金-返回报文");
+                string content = PublicImportDataService.Instance.LDServiceFee(PosSn, int.Parse(DepositId), int.Parse(BrandId));
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "联动-设置押金-返回报文");
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() != "000000")
                 {
                     return jsonObj["msg"].ToString();
                 }
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                decimal amount = decimal.Parse(DepositId);
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -500,7 +307,7 @@ namespace MySystem
 
 
         #region 盒易付-设置押金
-        public static string SetHYFDeposit(string SnIds, string DepositId)
+        public static string SetHYFDeposit(string SnIds, string DepositId, string UserId = "0")
         {
             // string DepositId = "299";
             string check = RedisDbconn.Instance.Get<string>("SetHYFPosDepositWait:" + SnIds);
@@ -510,46 +317,23 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetHYFPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetHYFPosDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "盒易付-设置押金-返回报文");
-                string content = PublicImportDataService.Instance.BoxServiceFee(pos.PosSn, DepositId, pos.BuyUserId);
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "盒易付-设置押金-返回报文");
+                string content = PublicImportDataService.Instance.BoxServiceFee(PosSn, DepositId, int.Parse(UserId));
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "盒易付-设置押金-返回报文");
                 if (content == "fail")
                 {
-                    return "机具" + pos.PosSn + "设置失败";
+                    return "机具" + PosSn + "设置失败";
                 }
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["resultCode"].ToString() != "1")
                 {
                     return jsonObj["errorDesc"].ToString();
                 }
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                decimal amount = decimal.Parse(DepositId);
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -588,48 +372,25 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetPosPDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetPosPDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "POSP-设置押金-返回报文");
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "POSP-设置押金-返回报文");
                 List<string> PosList = new List<string>();
-                PosList.Add(pos.PosSn);
+                PosList.Add(PosSn);
                 string content = PublicImportDataService.Instance.PospServiceFee(PosList, policy_code, policy_name);
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "POSP-设置押金-返回报文");
                 if (content == "fail")
                 {
-                    return "机具" + pos.PosSn + "设置失败";
+                    return "机具" + PosSn + "设置失败";
                 }
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() != "200")
                 {
                     return "设置失败";
                 }
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                decimal amount = decimal.Parse(DepositId);
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion
@@ -646,25 +407,18 @@ namespace MySystem
             }
             RedisDbconn.Instance.Set("SetLKLPosDepositWait:" + SnIds, SnIds);
             RedisDbconn.Instance.SetExpire("SetLKLPosDepositWait:" + SnIds, 10);
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string[] SnIdList = SnIds.Split(',');
-            foreach (string SnId in SnIdList)
+            foreach (string PosSn in SnIdList)
             {
-                int SnIdNum = int.Parse(SnId);
-                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum && m.BindingState == 0 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0"));
-                if (pos == null)
-                {
-                    return "机具" + pos.PosSn + "已设置押金，请勿重复设置";
-                }
                 //判断是否存在关联数据
                 string content = "";
-                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + pos.PosSn + ":" + DepositId, "拉卡拉-设置押金-返回报文");
-                content = PublicImportDataService.Instance.LkLSetDeposit(pos.PosSn, decimal.Parse(DepositId));
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + DepositId, "拉卡拉-设置押金-返回报文");
+                content = PublicImportDataService.Instance.LkLSetDeposit(PosSn, decimal.Parse(DepositId));
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "拉卡拉-设置押金-返回报文");
                 if (content == "fail")
                 {
-                    return "机具" + pos.PosSn + "设置失败";
+                    return "机具" + PosSn + "设置失败";
                 }
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 if (jsonObj["code"].ToString() != "000000")
@@ -678,23 +432,7 @@ namespace MySystem
                     return content;
                 }
                 function.WriteLog(DateTime.Now.ToString() + "\n" + content, "拉卡拉-设置押金-返回报文");
-                var BeforeDeposit = 0;
-                if (string.IsNullOrEmpty(pos.PrizeParams))
-                {
-                    BeforeDeposit = 299;
-                }
-                else
-                {
-                    BeforeDeposit = (int)decimal.Parse(pos.PrizeParams);
-                }
-                decimal amount = decimal.Parse(DepositId);
-                pos.PrizeParams = amount.ToString("f0");
-                db.SaveChanges();
-
-                //设置押金添加记录
-                PublicFunction.MerchantDepositSet(pos.BrandId, pos.BuyUserId, SnIdNum, pos.PosSn, BeforeDeposit, decimal.Parse(pos.PrizeParams), content);
             }
-            db.Dispose();
             return "设置成功";
         }
         #endregion

AppStart/Helper/SetDepositPostService.cs

@@ -35,384 +35,299 @@ namespace MySystem
                     {
                         WebCMSEntities db = new WebCMSEntities();
                         JsonData jsonObj = JsonMapper.ToObject(data);
-                        string PosIds = jsonObj["PosId"].ToString();
+                        string PosSn = jsonObj["PosSn"].ToString();
+                        string MerNo = jsonObj["MerNo"].ToString();
                         int Kind = int.Parse(function.CheckInt(jsonObj["Kind"].ToString()));
+                        int BrandId = int.Parse(function.CheckInt(jsonObj["BrandId"].ToString()));
                         int RecordId = 0;
                         if(data.Contains("\"RecordId\""))
                         {
                             RecordId = int.Parse(function.CheckInt(jsonObj["RecordId"].ToString()));
                         }
                         string OpMan = jsonObj["OpMan"].ToString();
-                        if(!string.IsNullOrEmpty(PosIds) && Kind > 0)
-                        {
-                            List<int> ids = new List<int>();
-                            string[] PosIdList = PosIds.Split(',');
-                            foreach(string sub in PosIdList)
-                            {
-                                ids.Add(int.Parse(sub));
-                            }
-                            List<KqProducts> brands = db.KqProducts.ToList();
-                            List<PosMachinesTwo> poslist = db.PosMachinesTwo.Where(m => ids.Contains(m.Id)).ToList();
-                            List<int> mids = poslist.Select(m => m.BindMerchantId).ToList();
-                            List<PosMerchantInfo> merchantlist = db.PosMerchantInfo.Where(m => mids.Contains(m.Id)).ToList();
-                            foreach(PosMachinesTwo pos in poslist)
+                        if(!string.IsNullOrEmpty(PosSn) && Kind > 0)
+                        {                            
+                            decimal Fee = 0.63M;
+                            int addRate = 0;
+                            if(BrandId != 12 && BrandId != 13)
                             {
-                                PosMerchantInfo merchant = merchantlist.FirstOrDefault(m => m.Id == pos.BindMerchantId);
-                                if(merchant != null)
+                                if(Kind == 1)
                                 {
-                                    decimal Fee = 0.63M;
-                                    int addRate = 0;
-                                    if(pos.BrandId != 12 && pos.BrandId != 13)
-                                    {
-                                        if(Kind == 1)
-                                        {
-                                            addRate = 3;
-                                        }
-                                        else
-                                        {
-                                            addRate = 0;
-                                            if(Kind == 3)
-                                            {
-                                                Fee = 0.6M;
-                                            }
-                                        }
-                                    }
-                                    if(pos.BrandId == 12 || pos.BrandId == 13)
-                                    {
-                                        if(Kind == 1) Kind = 2;
-                                        if(Kind == 3) Fee = 0.6M;
-                                    }
-                                    if(pos.BrandId == 7 && Kind == 4)
-                                    {
-                                        Fee = decimal.Parse(function.CheckNum(jsonObj["Fee"].ToString()));
-                                        addRate = int.Parse(function.CheckInt(jsonObj["AddRate"].ToString()));
-                                    }
-                                    if(pos.BrandId == 1 || pos.BrandId == 3) //金控
-                                    {
-                                        addRate = addRate * 100;
-                                        // string content = function.GetWebRequest("http://connect.kexiaoshuang.com/home/setfee?merNo=" + merchant.KqMerNo + "&sn=" + pos.PosSn + "&fee=" + Fee + "&addRate=" + addRate);
-                                        // string content = SetFee(merchant.KqMerNo, pos.PosSn, Fee, addRate);
-                                        string content = PublicImportDataService.Instance.LkbSetFee(pos.PosSn, Fee, addRate);
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if (obj["respCode"].ToString() == "00")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["respMsg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
-                                    }
-                                    else if(pos.BrandId == 2) //开店宝
-                                    {
-                                        Fee = Fee / 100;
-                                        string content = ModifyFee(pos.PosSn, Fee, addRate.ToString());
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(content.Contains("orderNo"))
-                                        {
-                                            pos.SeoDescription = "提交成功|" + obj["orderNo"].ToString() + "|" + RecordId;
-                                            // SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
-                                    }
-                                    else if(pos.BrandId == 4 || pos.BrandId == 5) //乐刷
+                                    addRate = 3;
+                                }
+                                else
+                                {
+                                    addRate = 0;
+                                    if(Kind == 3)
                                     {
-                                        // 电签
-                                        // 电签标准0.63 729702301652492288
-                                        // 电签优惠0.63 729702442300088320
-                                        // 电签pos不加  696339175297294336
-
-                                        // 大POS
-                                        // PY-传统POS标准0.63 554666598481842176
-                                        // PY-传统POS优惠0.63 683857388021264384
-                                        // 大pos不加  698228081038991360
-
-                                        // 大POS
-                                        // 大POS标准0.6：713806109336940544
-                                        // 大POS优惠0.6：713806774515802112
-
-                                        // 电签POS
-                                        // 电签标准0.6：712391426860134400
-                                        // 电签优惠0.6：712391668250718208
-                                        // S0电签pos不加：696339175297294336
-                                        string bzConfigId = "", yhConfigId = "", surfeeConfigId = "";
-                                        if(pos.BrandId == 4)
-                                        {
-                                            if(Kind == 1)
-                                            {
-                                                bzConfigId = "729702301652492288";
-                                                yhConfigId = "729702442300088320";
-                                                surfeeConfigId = "696339175297294336";
-                                            }
-                                            else
-                                            {
-                                                bzConfigId = "712391426860134400";
-                                                yhConfigId = "712391668250718208";
-                                                surfeeConfigId = "696339175297294336";
-                                            }
-                                        }
-                                        else
-                                        {
-                                            if(Kind == 1)
-                                            {
-                                                bzConfigId = "554666598481842176";
-                                                yhConfigId = "683857388021264384";
-                                                surfeeConfigId = "698228081038991360";
-                                            }
-                                            else
-                                            {
-                                                bzConfigId = "713806109336940544";
-                                                yhConfigId = "713806774515802112";
-                                                surfeeConfigId = "698228081038991360";
-                                            }
-                                        }
-                                        string content = SetFeeForBrand(pos.PosSn, bzConfigId, yhConfigId, surfeeConfigId, pos.BrandId);
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(obj["code"].ToString() == "0")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        Fee = 0.6M;
                                     }
-                                    else if(pos.BrandId == 6) //立刷
+                                }
+                            }
+                            if(BrandId == 12 || BrandId == 13)
+                            {
+                                if(Kind == 1) Kind = 2;
+                                if(Kind == 3) Fee = 0.6M;
+                            }
+                            if(BrandId == 7 && Kind == 4)
+                            {
+                                Fee = decimal.Parse(function.CheckNum(jsonObj["Fee"].ToString()));
+                                addRate = int.Parse(function.CheckInt(jsonObj["AddRate"].ToString()));
+                            }
+                            if(BrandId == 1 || BrandId == 3) //金控
+                            {
+                                addRate = addRate * 100;
+                                string content = PublicImportDataService.Instance.LkbSetFee(PosSn, Fee, addRate);
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if (obj["respCode"].ToString() == "00")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["respMsg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 2) //开店宝
+                            {
+                                Fee = Fee / 100;
+                                string content = ModifyFee(PosSn, Fee, addRate.ToString());
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(content.Contains("orderNo"))
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 4 || BrandId == 5) //乐刷
+                            {
+                                // 电签
+                                // 电签标准0.63 729702301652492288
+                                // 电签优惠0.63 729702442300088320
+                                // 电签pos不加  696339175297294336
+
+                                // 大POS
+                                // PY-传统POS标准0.63 554666598481842176
+                                // PY-传统POS优惠0.63 683857388021264384
+                                // 大pos不加  698228081038991360
+
+                                // 大POS
+                                // 大POS标准0.6：713806109336940544
+                                // 大POS优惠0.6：713806774515802112
+
+                                // 电签POS
+                                // 电签标准0.6：712391426860134400
+                                // 电签优惠0.6：712391668250718208
+                                // S0电签pos不加：696339175297294336
+                                string bzConfigId = "", yhConfigId = "", surfeeConfigId = "";
+                                if(BrandId == 4)
+                                {
+                                    if(Kind == 1)
                                     {
-                                        addRate = addRate * 100;
-                                        string content = PublicImportDataService.Instance.SetLiSFee(pos.PosSn, merchant.KqMerNo, Fee.ToString("f2"), addRate.ToString());
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if (obj["ret_code"].ToString() == "00")
-                                        {
-                                            SetRecordResult(db, RecordId, 1);
-                                            AddFeeRecord(db, merchant, pos);
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["ret_msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "729702301652492288";
+                                        yhConfigId = "729702442300088320";
+                                        surfeeConfigId = "696339175297294336";
                                     }
-                                    else if(pos.BrandId == 22) //立刷微电签
+                                    else
                                     {
-                                        addRate = addRate * 100;
-                                        string content = PublicImportDataService.Instance.SetLiSWeFee(pos.PosSn, merchant.KqMerNo, Fee.ToString("f2"), addRate.ToString());
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if (obj["ret_code"].ToString() == "00")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1);
-                                            AddFeeRecord(db, merchant, pos);
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["ret_msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "712391426860134400";
+                                        yhConfigId = "712391668250718208";
+                                        surfeeConfigId = "696339175297294336";
                                     }
-                                    else if(pos.BrandId == 7) //盛付通
+                                }
+                                else
+                                {
+                                    if(Kind == 1)
                                     {
-                                        string content = SetFeeForSft(merchant.KqMerNo, Fee.ToString("f4"), addRate.ToString());
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(obj["respCode"].ToString() == "00")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["errorMsg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "554666598481842176";
+                                        yhConfigId = "683857388021264384";
+                                        surfeeConfigId = "698228081038991360";
                                     }
-                                    else if(pos.BrandId == 8 || pos.BrandId == 9) //海科
+                                    else
                                     {
-                                        // 【融通金宝大POS】
-                                        // 584068951081226240    大POS标准贷0.60|借0.50
-                                        // 584070145207963648    大POS优惠贷0.60|借0.5
-                                        // 574600660289888256    大POS不加
-
-                                        // 691739824478494720    大POS标准贷0.63|借0.50
-                                        // 691740128238383104    大POS优惠贷0.63|借0.50
-                                        // 574600660289888256    大POS不加
-
-                                        // 【融通金宝电签POS】
-                                        // 585167132691009536    电签POS标准贷0.60|借0.50
-                                        // 579355312831074304    电签POS优惠贷0.6|借0.5
-                                        // 570331704834170880    电签POS不加
-
-                                        // 684753829778436096    电签POS标准贷0.63|借0.50
-                                        // 684754046342934528    电签POS优惠贷0.63|借0.5
-                                        // 570331704834170880    电签POS不加
-                                        string bzConfigId = "", yhConfigId = "", surfeeConfigId = "";
-                                        if(pos.BrandId == 8)
-                                        {
-                                            if(Kind == 1)
-                                            {
-                                                bzConfigId = "684753829778436096";
-                                                yhConfigId = "684754046342934528";
-                                                surfeeConfigId = "570331704834170880";
-                                            }
-                                            else
-                                            {
-                                                bzConfigId = "585167132691009536";
-                                                yhConfigId = "579355312831074304";
-                                                surfeeConfigId = "570331704834170880";
-                                            }
-                                        }
-                                        else
-                                        {
-                                            if(Kind == 1)
-                                            {
-                                                bzConfigId = "691739824478494720";
-                                                yhConfigId = "691740128238383104";
-                                                surfeeConfigId = "574600660289888256";
-                                            }
-                                            else
-                                            {
-                                                bzConfigId = "584068951081226240";
-                                                yhConfigId = "584070145207963648";
-                                                surfeeConfigId = "574600660289888256";
-                                            }
-                                        }
-                                        string content = HKSetFeeForBrand(pos.PosSn, bzConfigId, yhConfigId, surfeeConfigId, pos.BrandId);
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(obj["code"].ToString() == "0")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "713806109336940544";
+                                        yhConfigId = "713806774515802112";
+                                        surfeeConfigId = "698228081038991360";
                                     }
-                                    else if(pos.BrandId == 10 || pos.BrandId == 11) //联动
+                                }
+                                string content = SetFeeForBrand(PosSn, bzConfigId, yhConfigId, surfeeConfigId, BrandId);
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(obj["code"].ToString() == "0")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 6) //立刷
+                            {
+                                addRate = addRate * 100;
+                                string content = PublicImportDataService.Instance.SetLiSFee(PosSn, MerNo, Fee.ToString("f2"), addRate.ToString());
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if (obj["ret_code"].ToString() == "00")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["ret_msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 22) //立刷微电签
+                            {
+                                addRate = addRate * 100;
+                                string content = PublicImportDataService.Instance.SetLiSWeFee(PosSn, MerNo, Fee.ToString("f2"), addRate.ToString());
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if (obj["ret_code"].ToString() == "00")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["ret_msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 7) //盛付通
+                            {
+                                string content = SetFeeForSft(MerNo, Fee.ToString("f4"), addRate.ToString());
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(obj["respCode"].ToString() == "00")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["errorMsg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 8 || BrandId == 9) //海科
+                            {
+                                // 【融通金宝大POS】
+                                // 584068951081226240    大POS标准贷0.60|借0.50
+                                // 584070145207963648    大POS优惠贷0.60|借0.5
+                                // 574600660289888256    大POS不加
+
+                                // 691739824478494720    大POS标准贷0.63|借0.50
+                                // 691740128238383104    大POS优惠贷0.63|借0.50
+                                // 574600660289888256    大POS不加
+
+                                // 【融通金宝电签POS】
+                                // 585167132691009536    电签POS标准贷0.60|借0.50
+                                // 579355312831074304    电签POS优惠贷0.6|借0.5
+                                // 570331704834170880    电签POS不加
+
+                                // 684753829778436096    电签POS标准贷0.63|借0.50
+                                // 684754046342934528    电签POS优惠贷0.63|借0.5
+                                // 570331704834170880    电签POS不加
+                                string bzConfigId = "", yhConfigId = "", surfeeConfigId = "";
+                                if(BrandId == 8)
+                                {
+                                    if(Kind == 1)
                                     {
-                                        decimal LastFee = Fee / 100;
-                                        string content = LDFeeRate(merchant.KqMerNo, LastFee.ToString("f4"), pos.BrandId, addRate);
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(obj["code"].ToString() == "000000")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "684753829778436096";
+                                        yhConfigId = "684754046342934528";
+                                        surfeeConfigId = "570331704834170880";
                                     }
-                                    else if(pos.BrandId == 12 || pos.BrandId == 13) //盒易付
+                                    else
                                     {
-                                        string content = BoxFee(merchant.KqMerNo, Fee.ToString("f2"));
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(obj["resultCode"].ToString() == "1")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["errorDesc"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "585167132691009536";
+                                        yhConfigId = "579355312831074304";
+                                        surfeeConfigId = "570331704834170880";
                                     }
-                                    else if(pos.BrandId == 15 || pos.BrandId == 16) //联客宝
+                                }
+                                else
+                                {
+                                    if(Kind == 1)
                                     {
-                                        List<string> merno = new List<string>();
-                                        merno.Add(merchant.KqMerNo);
-                                        string policy_code = "";
-                                        string policy_name = "";
-                                        if(Kind == 1)
-                                        {
-                                            policy_code = "LKB_0.63+3";
-                                            policy_name = "联客宝";
-                                        }
-                                        else if(Kind == 2)
-                                        {
-                                            policy_code = "LKB_0.63+0";
-                                            policy_name = "联客宝0.63+0";
-                                        }
-                                        else if(Kind == 3)
-                                        {
-                                            policy_code = "LKB_0.6+0";
-                                            policy_name = "联客宝0.6+0";
-                                        }
-                                        string content = PublicImportDataService.Instance.PospFee(merno, policy_code, policy_name);
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if(obj["code"].ToString() == "200")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["msg"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "691739824478494720";
+                                        yhConfigId = "691740128238383104";
+                                        surfeeConfigId = "574600660289888256";
                                     }
-                                    else if(pos.BrandId == 30 || pos.BrandId == 31) //拉卡拉
+                                    else
                                     {
-                                        string content = PublicImportDataService.Instance.LkLSetFee(merchant.KqMerNo, Fee, addRate);
-                                        JsonData obj = JsonMapper.ToObject(content);
-                                        if (obj["message"].ToString() == "SUCCESS")
-                                        {
-                                            pos.SeoDescription = "设置成功";
-                                            SetRecordResult(db, RecordId, 1, "设置成功");
-                                            db.SaveChanges();
-                                        }
-                                        else
-                                        {
-                                            string msg = obj["message"].ToString();
-                                            pos.SeoDescription = msg;
-                                            SetRecordResult(db, RecordId, -1, msg);
-                                            db.SaveChanges();
-                                        }
+                                        bzConfigId = "584068951081226240";
+                                        yhConfigId = "584070145207963648";
+                                        surfeeConfigId = "574600660289888256";
                                     }
                                 }
+                                string content = HKSetFeeForBrand(PosSn, bzConfigId, yhConfigId, surfeeConfigId, BrandId);
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(obj["code"].ToString() == "0")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 10 || BrandId == 11) //联动
+                            {
+                                decimal LastFee = Fee / 100;
+                                string content = LDFeeRate(MerNo, LastFee.ToString("f4"), BrandId, addRate);
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(obj["code"].ToString() == "000000")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 12 || BrandId == 13) //盒易付
+                            {
+                                string content = BoxFee(MerNo, Fee.ToString("f2"));
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(obj["resultCode"].ToString() == "1")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["errorDesc"].ToString();
+                                }
+                            }
+                            else if(BrandId == 15 || BrandId == 16) //联客宝
+                            {
+                                List<string> merno = new List<string>();
+                                merno.Add(MerNo);
+                                string policy_code = "";
+                                string policy_name = "";
+                                if(Kind == 1)
+                                {
+                                    policy_code = "LKB_0.63+3";
+                                    policy_name = "联客宝";
+                                }
+                                else if(Kind == 2)
+                                {
+                                    policy_code = "LKB_0.63+0";
+                                    policy_name = "联客宝0.63+0";
+                                }
+                                else if(Kind == 3)
+                                {
+                                    policy_code = "LKB_0.6+0";
+                                    policy_name = "联客宝0.6+0";
+                                }
+                                string content = PublicImportDataService.Instance.PospFee(merno, policy_code, policy_name);
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if(obj["code"].ToString() == "200")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["msg"].ToString();
+                                }
+                            }
+                            else if(BrandId == 30 || BrandId == 31) //拉卡拉
+                            {
+                                string content = PublicImportDataService.Instance.LkLSetFee(MerNo, Fee, addRate);
+                                JsonData obj = JsonMapper.ToObject(content);
+                                if (obj["message"].ToString() == "SUCCESS")
+                                {
+                                }
+                                else
+                                {
+                                    string msg = obj["message"].ToString();
+                                }
                             }
                         }
-                        db.Dispose();
                         Thread.Sleep(500);
                     }
                     catch (Exception ex)