页面修改

Edu.Common/bin/Release/netcoreapp3.0/Edu.Common.deps.json

@@ -15,7 +15,8 @@
           "NPOI": "2.5.1",
           "Newtonsoft.Json": "12.0.3",
           "RabbitMQ.Client": "5.1.2",
-          "Spire.Doc": "8.12.14"
+          "Spire.Doc": "8.12.14",
+          "System.Security.Cryptography.Cng": "5.0.0"
         },
         "runtime": {
           "Edu.Common.dll": {}
@@ -677,6 +678,14 @@
           "System.Threading": "4.0.11"
         }
       },
+      "System.Formats.Asn1/5.0.0": {
+        "runtime": {
+          "lib/netstandard2.0/System.Formats.Asn1.dll": {
+            "assemblyVersion": "5.0.0.0",
+            "fileVersion": "5.0.20.51904"
+          }
+        }
+      },
       "System.Globalization/4.0.11": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "2.0.0",
@@ -868,10 +877,28 @@
           "System.Security.Principal.Windows": "4.5.0"
         }
       },
-      "System.Security.Cryptography.Cng/4.5.0": {},
+      "System.Security.Cryptography.Cng/5.0.0": {
+        "dependencies": {
+          "System.Formats.Asn1": "5.0.0"
+        },
+        "runtime": {
+          "lib/netcoreapp3.0/System.Security.Cryptography.Cng.dll": {
+            "assemblyVersion": "5.0.0.0",
+            "fileVersion": "5.0.20.51904"
+          }
+        },
+        "runtimeTargets": {
+          "runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Cng.dll": {
+            "rid": "win",
+            "assetType": "runtime",
+            "assemblyVersion": "5.0.0.0",
+            "fileVersion": "5.0.20.51904"
+          }
+        }
+      },
       "System.Security.Cryptography.Pkcs/4.5.0": {
         "dependencies": {
-          "System.Security.Cryptography.Cng": "4.5.0"
+          "System.Security.Cryptography.Cng": "5.0.0"
         },
         "runtime": {
           "lib/netcoreapp2.1/System.Security.Cryptography.Pkcs.dll": {
@@ -1379,6 +1406,13 @@
       "path": "system.dynamic.runtime/4.0.11",
       "hashPath": "system.dynamic.runtime.4.0.11.nupkg.sha512"
     },
+    "System.Formats.Asn1/5.0.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-MTvUIktmemNB+El0Fgw9egyqT9AYSIk6DTJeoDSpc3GIHxHCMo8COqkWT1mptX5tZ1SlQ6HJZ0OsSvMth1c12w==",
+      "path": "system.formats.asn1/5.0.0",
+      "hashPath": "system.formats.asn1.5.0.0.nupkg.sha512"
+    },
     "System.Globalization/4.0.11": {
       "type": "package",
       "serviceable": true,
@@ -1540,12 +1574,12 @@
       "path": "system.security.accesscontrol/4.5.0",
       "hashPath": "system.security.accesscontrol.4.5.0.nupkg.sha512"
     },
-    "System.Security.Cryptography.Cng/4.5.0": {
+    "System.Security.Cryptography.Cng/5.0.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==",
-      "path": "system.security.cryptography.cng/4.5.0",
-      "hashPath": "system.security.cryptography.cng.4.5.0.nupkg.sha512"
+      "sha512": "sha512-jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
+      "path": "system.security.cryptography.cng/5.0.0",
+      "hashPath": "system.security.cryptography.cng.5.0.0.nupkg.sha512"
     },
     "System.Security.Cryptography.Pkcs/4.5.0": {
       "type": "package",

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -41,6 +41,7 @@ namespace Edu.Model.ViewModel.Course
                     case 2: str = "退学"; break;
                     case 3: str = "申请退学中"; break;
                     case 4: str = "驳回申请"; break;
+                    case 5: str = "停课"; break;
                 }
                 return str;
             }

Edu.WebApi/Controllers/WeChatPay/WeChatPayController.cs

@@ -54,7 +54,7 @@ namespace Edu.WebApi.Controllers.WeChatPay
 
         [HttpPost]
         [AllowAnonymous]
-        public async Task<NativePayModel> GenerateOrder()
+        public ApiResult GenerateOrder()
         {
             JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
             int contractId = jobj.GetInt("contractId");
@@ -63,15 +63,16 @@ namespace Edu.WebApi.Controllers.WeChatPay
             LogHelper.WriteInfo("合同Id:" + contractId + " 商户订单号：" + orderNumber);
             var helper = new WxPayHelper(WxPayConst.appid, WxPayConst.mchid, WxPayConst.serialNo, WxPayConst.privateKey);
             var notify_url = Config.sTenpayNotifyUrl;//ConfigurationManager.AppSettings["notify_url"]; //这个放在配置文件，从配置文件读取比较灵活，或者写到数据库中
-            var payodel = await helper.UnionGenerateOrder(orderModle.CourseName, Convert.ToInt32(orderModle.Money * 100), orderNumber, notify_url, orderModle.OrderId.ToString());
+
+            Task<WxPayRespModel> payodel= helper.UnionGenerateOrder(orderModle.CourseName, Convert.ToInt32(orderModle.Money * 100), orderNumber, notify_url, orderModle.OrderId.ToString());
 
             #region 为APP生成下单所需的参数，看个人实际需求，也可以APP自己生成所需的参数
 
-            var signModel = WxPayForAppHelper.GetSign(WxPayConst.appid, payodel.code_url, WxPayConst.privateKey);
+            var signModel = WxPayForAppHelper.GetSign(WxPayConst.appid, payodel.Result.code_url, WxPayConst.privateKey);
 
             #endregion
 
-            return signModel;//ApiResult.Success("",data:new { url = payodel.code_url, signModel }) ;
+            return ApiResult.Success(data: signModel) ;
         }