修改联客宝秒到费政策

.gitignore

@@ -1,4 +1,5 @@
 /bin
 /publish
 /obj
-/appsettings.json
+/appsettings.json
+.DS_Store

AppStart/Helper/SetDepositPostService.cs

@@ -64,7 +64,7 @@ namespace MySystem
                                     int addRate = 0;
                                     if(pos.BrandId != 12 && pos.BrandId != 13 && pos.BrandId != 15)
                                     {
-                                        if(Kind == 1) 
+                                        if(Kind == 1)
                                         {
                                             addRate = 3;
                                         }
@@ -72,7 +72,7 @@ namespace MySystem
                                         {
                                             addRate = 0;
                                             if(Kind == 3)
-                                            { 
+                                            {
                                                 Fee = 0.6M;
                                             }
                                         }
@@ -80,6 +80,9 @@ namespace MySystem
                                     if(pos.BrandId == 12 || pos.BrandId == 13 || pos.BrandId == 15)
                                     {
                                         if(Kind > 1) Fee = 0.6M;
+                                        // 调整联客宝政策方案
+                                        if(pos.BrandId == 15) Kind = 2;
+                                        if(Fee == 0.6M) Kind = 3;
                                     }
                                     if(pos.BrandId == 1 || pos.BrandId == 3) //金控
                                     {
@@ -144,12 +147,12 @@ namespace MySystem
                                         // 大pos不加  698228081038991360
 
                                         // 大POS
-                                        // 大POS标准0.6：713806109336940544 
-                                        // 大POS优惠0.6：713806774515802112 
+                                        // 大POS标准0.6：713806109336940544
+                                        // 大POS优惠0.6：713806774515802112
 
                                         // 电签POS
-                                        // 电签标准0.6：712391426860134400 
-                                        // 电签优惠0.6：712391668250718208 
+                                        // 电签标准0.6：712391426860134400
+                                        // 电签优惠0.6：712391668250718208
                                         // S0电签pos不加：696339175297294336
                                         string bzConfigId = "", yhConfigId = "", surfeeConfigId = "";
                                         if(pos.BrandId == 4)
@@ -221,7 +224,7 @@ namespace MySystem
                                     //     string content = SetLiSFee(pos.PosSn, Fee);
                                     //     JsonData obj = JsonMapper.ToObject(content);
                                     //     if (obj["ret_code"].ToString() == "00")
-                                    //     { 
+                                    //     {
                                     //         if(Kind == 1)
                                     //         {
                                     //             pos.UpFeeFlag = 1;
@@ -691,7 +694,7 @@ namespace MySystem
                 function.WriteLog(postUrl, "请求开店宝API日志");
                 function.WriteLog(paramData, "请求开店宝API日志");
                 byte[] postData = System.Text.Encoding.UTF8.GetBytes(paramData);
-                // 设置提交的相关参数 
+                // 设置提交的相关参数
                 System.Net.HttpWebRequest request = System.Net.WebRequest.Create(postUrl) as System.Net.HttpWebRequest;
                 System.Text.Encoding myEncoding = System.Text.Encoding.UTF8;
                 request.Method = "POST";
@@ -706,7 +709,7 @@ namespace MySystem
 
                 request.ContentLength = postData.Length;
 
-                // 提交请求数据 
+                // 提交请求数据
                 System.IO.Stream outputStream = request.GetRequestStream();
                 outputStream.Write(postData, 0, postData.Length);
                 outputStream.Close();
@@ -753,7 +756,7 @@ namespace MySystem
         }
 
         #endregion
-        
+
         #region 乐刷
 
         string LSPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMjld3flY+R+9WTR2MvcR9qWISdmpayL3GNGg9gvzwkXkhDI/E7rX6ndLvVuaBbLWXB+UOh+8Pfw3Gvfv3D2GHZCTzPHOKrs2tyzqC8EmMUDQaoVOI2BY4vtB7IjNe9FlLGZx62JEJrMkHKnOSQxsi+flCoexKc2t1q7kQsO2F+3AgMBAAECgYBmQ7EB/mpQOXSPYucaN0L4eW3dEbqKUBPbEV0yInwgo7f+BWGyhsyGuooZ857W46Leyd5Dy8K8ZAbAfwCD7zJZsSzWsuvWQE991f+n0V7AAnKc3h4OsHa4oITUNo2nD3PvOpWfQx8vSuQuSFQgx0ExdnywS3So16mG2X6J2k87wQJBAPTfV10MNpA1e5oRdX4D4lQ2tVyg5GW72NMhUGWct/FvgcEW3V7xZ0z/gSLfFcGI8c4LGYWRVPIsBnWFx0LSZ6ECQQDSBoqXuF/LobfFFT3D47ixL8d+qDbOJ+ro3p4+iCkdxxJ/ncaqouxsr3fBbkSWh4t+UkbbihO/isPdBwLPZihXAkAc2jwHAKtlLogTzT7UzExcs92GvoZq3klcBy7b6i1aS1M0lycaSsNrNSfYHgUIOsSTDIfDTy59ImbYbhzeaMBBAkEAyfz6i4IJt3jXmZadKWk4NkhiT6CN3OUtGjsH69Hd4UKUuuFNsMwyHzD+NqzLEA5aDOoqNXftGDjnuAnHHRn9zwJAHqPHR5ZOKDN/ujeAIUTwmFFJh8vx6ujv7UTesBbtTsFYW6bZln+X6aS2G3Kdvz3e2cxQyH8ncc0yIh64a1fqyg==";
@@ -923,7 +926,7 @@ namespace MySystem
                 function.WriteLog(postUrl, "请求立刷API日志");
                 function.WriteLog(paramData, "请求立刷API日志");
                 byte[] postData = System.Text.Encoding.UTF8.GetBytes(paramData);
-                // 设置提交的相关参数 
+                // 设置提交的相关参数
                 System.Net.HttpWebRequest request = System.Net.WebRequest.Create(postUrl) as System.Net.HttpWebRequest;
                 System.Text.Encoding myEncoding = System.Text.Encoding.UTF8;
                 request.Method = "POST";
@@ -938,7 +941,7 @@ namespace MySystem
 
                 request.ContentLength = postData.Length;
 
-                // 提交请求数据 
+                // 提交请求数据
                 System.IO.Stream outputStream = request.GetRequestStream();
                 outputStream.Write(postData, 0, postData.Length);
                 outputStream.Close();
@@ -1001,13 +1004,13 @@ namespace MySystem
             feeItem.Add("feeRate", Rate);
             feeItem.Add("feeDisRate", Rate);
             feeList.Add(feeItem);
-            
+
             feeItem = new Dictionary<string, object>();
             feeItem.Add("feeType", "T0_CC");
             feeItem.Add("feeRate", fee);
             feeItem.Add("feeDisRate", fee);
             feeList.Add(feeItem);
-                
+
             item.Add("feeList", feeList);
             merchantFeeList.Add(item);
             req.Add("merchantFeeList", merchantFeeList);
@@ -1037,7 +1040,7 @@ namespace MySystem
         }
 
         #endregion
-        
+
         #region 海科
 
         string HKPrivateKey1 = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAK5iJ2q2nF+9jEnof9VYhMdbAgI0ZS4cYmgWTMW2JR61lJhR0GH+A/m6mjN9FsTS6Bq03u/+e6BKdE6VqMGk0q7asi2VZIgD59zj4HubS8EFrcb5ZprwmGLnG71cBga7V5EWnHxSB9BlbFt6rGeQiit8NSbv62NxGh1U+rAVE/a3AgMBAAECgYEApQGxpJNowls8bQ74LytUcMMX0ng7qXcoUq+PM6IX28gb9EmuMZtHrb05fjEGI3YiNGsjbNpTpqftCBMrHRjWVRgb0PDf/zD9YYrxmcP9DWKQjG5f1ygYtQBlnOPEX963Y2SXrsTKr4+szTpI8r6YqFfVbbooKVMesCBtshgg16kCQQDYHGDuCuOzULP84QvGi8z+wHNv0arFpYYxvwitntD7K3iolAh8gTDWeaC03MHruGM43ybCUi9EHhCrcVKjgpK1AkEAzpIUajdmAAwtwGg4G0v7tP/ulmpGhnALVN84gSMAc5f8D6aCnoUyle+GylwRBw9WblHBLxsOtARQIvvdphDrOwJBAIFvXc60zvQTHfoTf84G5VyfP4R1e2atYNZiqHv0Zw5IVxgAsaSAbBPI/SvWHH9mDGd/n+M6/fw6VZmZYfl0txECQQCQB3yifpPpDpTL5h7QsY8EKbqyN9GKpQ7Rk35zU/NZpawDQYcrfhXCQytJZx4cPQ53hxtae9QpoiQ58EEgLAXHAkABzJ/QDS1QfYrkP9t9X+Pny2iEuWGeIHyfsfSKQKr5pv16k1WqiIvlFRyDPl+aw5IOedkYb0vSkcU1KzjMW+Ra";
@@ -1050,7 +1053,7 @@ namespace MySystem
 
         public string HKDecrypt(string data, string sign, int Kind)
         {
-            string HKPrivateKey = Kind == 8 ? HKPrivateKey1 : HKPrivateKey2; 
+            string HKPrivateKey = Kind == 8 ? HKPrivateKey1 : HKPrivateKey2;
             var toDecryptArray = Convert.FromBase64String(sign);
             var rsa2 = RSA.Create();
             rsa2.ImportPkcs8PrivateKey(Convert.FromBase64String(HKPrivateKey), out _);
@@ -1242,7 +1245,7 @@ namespace MySystem
         }
 
         #endregion
-        
+
         #region 盒易付
 
         //测试环境