Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

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) ;
         }