4 Комити be89511113 ... ff6a1f9c50

Аутор SHA1 Порука Датум
  DuGuYang ff6a1f9c50 Merge branch 'main' of http://47.109.31.237:13000/lichunlei/mp-ap-v2 into DuGuYang пре 6 месеци
  DuGuYang cecabdf04b 注释好哒通道配置 пре 6 месеци
  DuGuYang 03952c5ee6 修复银联通道参数 пре 6 месеци
  lcl e145d5343a 支付不需要判断通道 пре 6 месеци
2 измењених фајлова са 15 додато и 15 уклоњено
  1. 14 14
      Util/HaoDa/HaoDaHelper.cs
  2. 1 1
      Util/HaoDa/HaodaParam.cs

+ 14 - 14
Util/HaoDa/HaoDaHelper.cs

@@ -201,8 +201,8 @@ namespace MySystem
 
         public bool VerifySign(string toSignStr, string signStr, int BrandId = 0)
         {
-            var BoxPublicKey = HaodaParam.BoxPublicKey;
-            if (BrandId == 1) BoxPublicKey = HaodaUnionParam.BoxPublicKey;
+            // var BoxPublicKey = HaodaUnionParam.BoxPublicKey;
+            // if (BrandId == 1) BoxPublicKey = HaodaParam.BoxPublicKey;
 
             byte[] toSignByte = Encoding.Default.GetBytes(toSignStr);
             byte[] signByte = Convert.FromBase64String(signStr);
@@ -221,8 +221,8 @@ namespace MySystem
 
         public string SignData(string toSignStr, int BrandId = 0)
         {
-            var BoxPublicKey = HaodaParam.BoxPublicKey;
-            if (BrandId == 1) BoxPublicKey = HaodaUnionParam.BoxPublicKey;
+            //     var BoxPublicKey = HaodaUnionParam.BoxPublicKey;
+            //     if (BrandId == 1) BoxPublicKey = HaodaParam.BoxPublicKey;
 
             byte[] toSignByte = Encoding.UTF8.GetBytes(toSignStr);
             var toKey = Convert.FromBase64String(BoxPublicKey);
@@ -313,8 +313,8 @@ namespace MySystem
         /// <returns></returns>
         public string WeChatPay(string mchtNo, string storeNo, string outOrderNo, decimal transAmount, string callbackUrl, string subOpenId, string confirmCode, string subAppId, string subAppIdType, string ledgerModel, int BrandId = 0)
         {
-            var BoxRequestUrl = HaodaParam.BoxRequestUrl;
-            if (BrandId == 1) BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // var BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // if (BrandId == 1) BoxRequestUrl = HaodaParam.BoxRequestUrl;
 
             function.WriteLog(DateTime.Now.ToString(), "好哒微信公众号和小程序支付");
             Dictionary<string, object> reqdic = new Dictionary<string, object>();
@@ -357,8 +357,8 @@ namespace MySystem
         /// <returns></returns>
         public string Alipay(string mchtNo, string storeNo, string outOrderNo, decimal transAmount, string callbackUrl, string subOpenId, string confirmCode, string ledgerModel, int BrandId = 0)
         {
-            var BoxRequestUrl = HaodaParam.BoxRequestUrl;
-            if (BrandId == 1) BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // var BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // if (BrandId == 1) BoxRequestUrl = HaodaParam.BoxRequestUrl;
 
             function.WriteLog(DateTime.Now.ToString(), "好哒支付宝服务窗支付");
             Dictionary<string, object> reqdic = new Dictionary<string, object>();
@@ -399,8 +399,8 @@ namespace MySystem
         /// <returns></returns>
         public string CardInComeRecord(string mchtNo, string startTime, string endTime, string tradeMchtNo, string cardNo, string settleStatus, string page, string rows, int BrandId = 0)
         {
-            var BoxRequestUrl = HaodaParam.BoxRequestUrl;
-            if (BrandId == 1) BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // var BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // if (BrandId == 1) BoxRequestUrl = HaodaParam.BoxRequestUrl;
 
             function.WriteLog(DateTime.Now.ToString(), "好哒到账记录查询");
             Dictionary<string, object> reqdic = new Dictionary<string, object>();
@@ -434,8 +434,8 @@ namespace MySystem
         /// <returns></returns>
         public string CardInComeDetail(string mchtNo, string id, int BrandId = 0)
         {
-            var BoxRequestUrl = HaodaParam.BoxRequestUrl;
-            if (BrandId == 1) BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // var BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // if (BrandId == 1) BoxRequestUrl = HaodaParam.BoxRequestUrl;
 
             function.WriteLog(DateTime.Now.ToString(), "好哒到账记录详情");
             Dictionary<string, object> reqdic = new Dictionary<string, object>();
@@ -458,8 +458,8 @@ namespace MySystem
 
         public Dictionary<string, string> GetHeader(string req, int BrandId = 0)
         {
-            var BoxAppSecret = HaodaParam.BoxAppSecret;
-            if (BrandId == 1) BoxAppSecret = HaodaUnionParam.BoxAppSecret;
+            // var BoxRequestUrl = HaodaUnionParam.BoxRequestUrl;
+            // if (BrandId == 1) BoxRequestUrl = HaodaParam.BoxRequestUrl;
 
             Dictionary<string, string> headdic = new Dictionary<string, string>();
             string timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

+ 1 - 1
Util/HaoDa/HaodaParam.cs

@@ -11,6 +11,6 @@ namespace MySystem
         public static string BoxAppId = "AP8322645764893728768";
         public static string BoxAppSecret = "je1TElprp3jzWETsG3FcWqtmpreEHqZS";
         public static string BoxPublicKey = "";
-        public static string BrhCode = "";
+        public static string BrhCode = "015001";
     }
 }