暂存

Areas/Api/Controllers/Main/MerchantDepositOrderController.cs

@@ -22,6 +22,14 @@ namespace MySystem.Areas.Api.Controllers.v1
         public MerchantDepositOrderController(IHttpContextAccessor accessor) : base(accessor)
         {
         }
+        //AppId
+        private string AppId = "2021004123675441";
+        //私钥
+        private string PrivateKey = "MIIEogIBAAKCAQEAn6vdQjedN72fPHtU1a1zSBvoYoyn9fIrjJhnJg4tGAVPk20I4AMiiKpgWn9cDAEgLddceYfR0IRWw+ojZZqVjJsLG8D715H4xJ6AnllWyeNJd43CdTctTnXRAl25Cw2SuG1kanAA/BO186J2LyN/z7l70LkxOFUJVHXhTx0sKxAS7ZBA43ewjl7ycp108eNNbR63gLjy4VDP63pOnI4MuTNeXh3ET/eunREs8gGuvdXOfY9r2Dyj9lOiOPn1xyrZPpT+WGXrPxLyWnSAz1EkLx7d2aRPFFC1rwJQbcsdBnmN35d6hbofOOe9kPN23Z34d0X6ohD0VbiUUdpzU4f9ZwIDAQABAoIBAFK+U3i/LT/3ig9jskDRE86od7KqRVgU2TCQwdNcwU2TYvt5I4JC3aCI+kmrel3WL4DR++AW3En8aqI4MYOzqhAlQIpvZZL+2DW8Fdb5YRpaKHZGBiGMKHRiZZ+eRghOTlw4hDMMO9ZluIK7DBe9g7x32Iv/jFwu5RjZxZqj+YGOjnMTQvXdrHc5WH7nI9bJC4EJUD1WsO5wmgHkdwPLSKAPLoc+PcCD8manlq2XU560TycZJmaXhBNtkAwlhhu8tY/hPsbQBMwIN8VtWiE0sD0fgR8r0Hq3yLxG1ysXQfrL105UC6+6Srxz17MmcS/beIPvFUSu0GHYgeHHKc1FnVECgYEA3ZtDhG/e7/hCKWW3xAKse+xJ77T3lSxH9HP4Shh6fEaKefFx+aN3VddpAEJpt7w0WbxJTduwD0gtu3IY9XCIX8mJPMk/Thy14MI/VTynJheK2zGylPep4MF6nXP3QfBfgN+Kq/XYHTWZK7gD2vfgHjGKuAW7fHQLLhMjNZ3/o3UCgYEAuHPUiZueKXYIZ7hPdNvChb9UKQdyrx9SVS8gQph4uAbHmNT1caVyvdmWSOYP3h2/UnJ8dCGAEBzd1CFlf959jzT7uceabZXOLtgTKa8qfJfvM4a5uTfr7XxUfcJgQzaugAqXwl4Wiwe0Y8DrWudo+Umb5MvpfQCXQVpIBBJQDesCgYA2mXGKKNIBx+XtMy2SsqHyqmYRFEJH07Aqz4PmJZ/QDMVDhDRzsE3PrZImSTao2UsArP5Wm4EGUt9JprP1jPNcvlf8zQy23yYEqXdXNels3jINDXKVd2u4f5MJRjAuY93z75/H/HtxvuntNppkkdv7NHOcIXVvFVxHztlG9ZWtnQKBgB2OwjJC87dlKLemO2VYifVw0YW5odEaTdFEugCx+jZTL8z341UQ1DBEG+cWpthLIAuQOQ1LCQCL/6gsqd0xxCEctnHw4HhLFz0+duOpJD/PAQ/auQxLP81QrSFx8ocSzifKisMk3Kvu0iNiGNT6XEIGX6rsWkAjxhk85Glync19AoGAazxVqVo3SMOzfAZHxvYWu81asFDN7+wvnOhUwWM+BOIYrhd4rspmQ691tOPQSAsXFXeFOmVtJDguRp0TtnysFVTH2goljCvc9WTuBLjUlj/g0hyBNQA5bBItdvlA1aRhYQSa1yhGK3IGcCYW6agkDhb8LdLZMlEsTcEpkOLoSmQ=";
+        // 公钥
+        private string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6vdQjedN72fPHtU1a1zSBvoYoyn9fIrjJhnJg4tGAVPk20I4AMiiKpgWn9cDAEgLddceYfR0IRWw+ojZZqVjJsLG8D715H4xJ6AnllWyeNJd43CdTctTnXRAl25Cw2SuG1kanAA/BO186J2LyN/z7l70LkxOFUJVHXhTx0sKxAS7ZBA43ewjl7ycp108eNNbR63gLjy4VDP63pOnI4MuTNeXh3ET/eunREs8gGuvdXOfY9r2Dyj9lOiOPn1xyrZPpT+WGXrPxLyWnSAz1EkLx7d2aRPFFC1rwJQbcsdBnmN35d6hbofOOe9kPN23Z34d0X6ohD0VbiUUdpzU4f9ZwIDAQAB";
+        // 支付宝公钥
+        private string AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnw14hKejqS+si/XZpNQpFAVOVXJIThj5Qn7H14n/vsb7uRLug1+Jcve8ehTkaN3s5ibrrELCnz0dvshi3cOz9svDSbLG5OdC1biAvZzpDkvVPswOd9f9jO8Jvqk3QTXTI3MSN9gOpKomI0te3qs5kkOQx6kRozzKjU/G//o/PbJCxpBxf/QNRV3XmCwJLZMBE7ukYqi1WO9Jra8jdczFKwrd/nhiKBKdupAtVVeKlylGD2i2YLkGAH1cLsPUN9DtzrXNblGXm2HK3l9SnMDjqnakiVdEQJTNYNpEiHaOJsVmPQL38nM6miz5wNd4gTchKzXPtoZWqto+eIvYaEA/KwIDAQAB";
 
         #region 商户激活-确认支付
         // [Authorize]
@@ -53,8 +61,9 @@ namespace MySystem.Areas.Api.Controllers.v1
                     function.WriteLog(query.OrderNo, "支付宝支付日志");
                     function.WriteLog(TotalPrice.ToString(), "支付宝支付日志");
                     function.WriteLog("商户激活—确认订单", "支付宝支付日志");
-                    string ProductName = "商户激活—确认订单";
+                    string ProductName = "商户激活";
                     PayData = new Alipay.AlipayPublicClass(_accessor.HttpContext).GetAlipayInfo(query.OrderNo, TotalPrice, ProductName, set.AlipayAppId, set.AlipayPrivateKey, SpHost + "/Api/Alipay/NoticePay");
+                    // PayData = new Alipay.AlipayPublicClass(_accessor.HttpContext).GetAlipayInfo(query.OrderNo, TotalPrice, ProductName, AppId, PrivateKey, SpHost + "/Api/Alipay/NoticePay2");
                     function.WriteLog(PayData, "支付宝支付日志");
                 }
                 Obj.Add("PayData", PayData); //支付宝微信SDK所需数据

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -708,7 +708,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("IsAct", query.IsAct); //是否激活(0 否 1 是)
             if (query.IsAct == 1)
             {
-                var orderInfo = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + Id + "");
+                var orderInfo = MerchantDepositOrderService.Query(" 1=1 and Status>0 and MerchantId=" + Id + "");
                 var IsPay = 0;
                 if (orderInfo.Id > 0)
                 {