lcl пре 2 дана
родитељ
комит
3104a5e270
2 измењених фајлова са 69 додато и 47 уклоњено
  1. 36 22
      AppStart/Helper/SetDepositPostService.cs
  2. 33 25
      AppStart/Helper/TmpService.cs

+ 36 - 22
AppStart/Helper/SetDepositPostService.cs

@@ -46,7 +46,7 @@ namespace MySystem
                         }
                         string OpMan = jsonObj["OpMan"].ToString();
                         if(!string.IsNullOrEmpty(PosSn) && (Kind > 0 || BrandId == 7))
-                        {                            
+                        {
                             decimal Fee = 0.63M;
                             int addRate = 0;
                             if(BrandId != 12 && BrandId != 13 && BrandId != 35)
@@ -74,20 +74,34 @@ namespace MySystem
                                 Fee = decimal.Parse(function.CheckNum(jsonObj["Fee"].ToString()));
                                 addRate = int.Parse(function.CheckInt(jsonObj["AddRate"].ToString()));
                             }
+                            
+                            List<int> BrandIds = new List<int>();
+                            BrandIds.Add(7);
+                            BrandIds.Add(10);
+                            BrandIds.Add(11);
+                            BrandIds.Add(12);
+                            BrandIds.Add(13);
+                            BrandIds.Add(15);
+                            BrandIds.Add(16);
+                            bool op = true;
+                            if(BrandIds.Contains(BrandId))
+                            {
+                                op = !db.TmpTradeNo.Any(m => m.RecordNo == PosSn);
+                            }
                             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();
-                                }
+                                // 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) //开店宝
+                            else if(BrandId == 2 && op) //开店宝
                             {
                                 Fee = Fee / 100;
                                 string content = ModifyFee(PosSn, Fee, addRate.ToString());
@@ -100,7 +114,7 @@ namespace MySystem
                                     string msg = obj["msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 4 || BrandId == 5) //乐刷
+                            else if((BrandId == 4 || BrandId == 5) && op) //乐刷
                             {
                                 // 电签
                                 // 电签标准0.63 729702301652492288
@@ -161,7 +175,7 @@ namespace MySystem
                                     string msg = obj["msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 6) //立刷
+                            else if(BrandId == 6 && op) //立刷
                             {
                                 addRate = addRate * 100;
                                 string content = PublicImportDataService.Instance.SetLiSFee(PosSn, MerNo, Fee.ToString("f2"), addRate.ToString());
@@ -174,7 +188,7 @@ namespace MySystem
                                     string msg = obj["ret_msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 22) //立刷微电签
+                            else if(BrandId == 22 && op) //立刷微电签
                             {
                                 addRate = addRate * 100;
                                 string content = PublicImportDataService.Instance.SetLiSWeFee(PosSn, MerNo, Fee.ToString("f2"), addRate.ToString());
@@ -187,7 +201,7 @@ namespace MySystem
                                     string msg = obj["ret_msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 7) //盛付通
+                            else if(BrandId == 7 && op) //盛付通
                             {
                                 if(Kind == 0) Fee = decimal.Parse(function.CheckNum(jsonObj["Fee"].ToString()));
                                 string content = SetFeeForSft(MerNo, Fee.ToString("f4"), addRate.ToString());
@@ -200,7 +214,7 @@ namespace MySystem
                                     string msg = obj["errorMsg"].ToString();
                                 }
                             }
-                            else if(BrandId == 8 || BrandId == 9) //海科
+                            else if((BrandId == 8 || BrandId == 9) && op) //海科
                             {
                                 // 【融通金宝大POS】
                                 // 584068951081226240    大POS标准贷0.60|借0.50
@@ -260,7 +274,7 @@ namespace MySystem
                                     string msg = obj["msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 10 || BrandId == 11) //联动
+                            else if((BrandId == 10 || BrandId == 11) && op) //联动
                             {
                                 decimal LastFee = Fee / 100;
                                 string content = LDFeeRate(MerNo, LastFee.ToString("f4"), BrandId, addRate);
@@ -273,7 +287,7 @@ namespace MySystem
                                     string msg = obj["msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 34) //联动掌中宝
+                            else if(BrandId == 34 && op) //联动掌中宝
                             {
                                 string content = LDZZBFeeRate(MerNo, Fee, addRate);
                                 JsonData obj = JsonMapper.ToObject(content);
@@ -282,7 +296,7 @@ namespace MySystem
                                     string msg = obj["msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 12 || BrandId == 13 || BrandId == 35) //盒易付
+                            else if((BrandId == 12 || BrandId == 13 || BrandId == 35) && op) //盒易付
                             {
                                 string content = BoxFee(MerNo, Fee.ToString("f2"));
                                 JsonData obj = JsonMapper.ToObject(content);
@@ -294,7 +308,7 @@ namespace MySystem
                                     string msg = obj["errorDesc"].ToString();
                                 }
                             }
-                            else if(BrandId == 15 || BrandId == 16) //联客宝
+                            else if((BrandId == 15 || BrandId == 16) && op) //联客宝
                             {
                                 List<string> merno = new List<string>();
                                 merno.Add(MerNo);
@@ -325,7 +339,7 @@ namespace MySystem
                                     string msg = obj["msg"].ToString();
                                 }
                             }
-                            else if(BrandId == 30 || BrandId == 31) //拉卡拉
+                            else if((BrandId == 30 || BrandId == 31) && op) //拉卡拉
                             {
                                 string content = PublicImportDataService.Instance.LkLSetFee(MerNo, Fee, addRate);
                                 JsonData obj = JsonMapper.ToObject(content);

+ 33 - 25
AppStart/Helper/TmpService.cs

@@ -87,32 +87,40 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             try
             {
-                List<string> poslist = new List<string>();
-                List<int> merids = new List<int>();
-                List<string> mernos = new List<string>();
-
-                //盛付通
-                poslist = function.ReadInstance("tmpdata/1.txt").Replace("\r", "").Split('\n').ToList();
-                List<string> without1 = function.ReadInstance("tmpdata/sft1.txt").Replace("\r", "").Split('\n').ToList();
-                List<string> without2 = function.ReadInstance("tmpdata/sft2.txt").Replace("\r", "").Split('\n').ToList();
-                List<string> without3 = function.ReadInstance("tmpdata/11.txt").Replace("\r", "").Split('\n').ToList();
-                function.WriteLog(poslist.Count.ToString(), "tmp盛付通临时费率");
-                merids = db.KxsMachine.Where(m => poslist.Contains(m.PosSn) && !without1.Contains(m.PosSn) && !without2.Contains(m.PosSn) && !without3.Contains(m.PosSn) && m.BrandId == 7 && m.MerchantId > 0).ToList().Select(m => m.MerchantId).ToList();
-                function.WriteLog(merids.Count.ToString(), "tmp盛付通临时费率");
-                mernos = db.KxsMerchant.Where(m => merids.Contains(m.Id)).ToList().Select(m => m.MerchantNo).ToList();
-                function.WriteLog(mernos.Count.ToString(), "tmp盛付通临时费率");
-                foreach(string merno in mernos)
+                // List<string> poslist = new List<string>();
+                // List<int> merids = new List<int>();
+                // List<string> mernos = new List<string>();
+
+                // //盛付通
+                // poslist = function.ReadInstance("tmpdata/1.txt").Replace("\r", "").Split('\n').ToList();
+                // List<string> without1 = function.ReadInstance("tmpdata/sft1.txt").Replace("\r", "").Split('\n').ToList();
+                // List<string> without2 = function.ReadInstance("tmpdata/sft2.txt").Replace("\r", "").Split('\n').ToList();
+                // List<string> without3 = function.ReadInstance("tmpdata/11.txt").Replace("\r", "").Split('\n').ToList();
+                // function.WriteLog(poslist.Count.ToString(), "tmp盛付通临时费率");
+                // merids = db.KxsMachine.Where(m => poslist.Contains(m.PosSn) && !without1.Contains(m.PosSn) && !without2.Contains(m.PosSn) && !without3.Contains(m.PosSn) && m.BrandId == 7 && m.MerchantId > 0).ToList().Select(m => m.MerchantId).ToList();
+                // function.WriteLog(merids.Count.ToString(), "tmp盛付通临时费率");
+                // mernos = db.KxsMerchant.Where(m => merids.Contains(m.Id)).ToList().Select(m => m.MerchantNo).ToList();
+                // function.WriteLog(mernos.Count.ToString(), "tmp盛付通临时费率");
+                // foreach(string merno in mernos)
+                // {
+                //     if(int.Parse(DateTime.Now.ToString("HHmm")) < 2100)
+                //     {
+                //         string result = SetDepositPostService.Instance.SetFeeForSft(merno, "0.6500", "3");
+                //         function.WriteLog(merno + "\n" + DateTime.Now.ToString() + "\n" + result + "\n\n", "tmp盛付通临时费率");
+                //         Thread.Sleep(500);
+                //     }
+                //     else
+                //     {
+                //         function.WriteLog(merno, "tmp盛付通临时费率POSN");
+                //     }
+                // }
+
+                List<string> list = function.ReadInstance("tmpdata/sft3.txt").Replace("\r", "").Split('\n').ToList();
+                foreach(string merno in list)
                 {
-                    if(int.Parse(DateTime.Now.ToString("HHmm")) < 2100)
-                    {
-                        string result = SetDepositPostService.Instance.SetFeeForSft(merno, "0.6500", "3");
-                        function.WriteLog(merno + "\n" + DateTime.Now.ToString() + "\n" + result + "\n\n", "tmp盛付通临时费率");
-                        Thread.Sleep(500);
-                    }
-                    else
-                    {
-                        function.WriteLog(merno, "tmp盛付通临时费率POSN");
-                    }
+                    string result = SetDepositPostService.Instance.SetFeeForSft(merno, "0.6500", "3");
+                    function.WriteLog(merno + "\n" + DateTime.Now.ToString() + "\n" + result + "\n\n", "tmp盛付通临时费率");
+                    Thread.Sleep(500);
                 }