zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Model/SiteConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Views/Home/login.cshtml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Left.cshtml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/wwwroot/img/images/logo.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/wwwroot/img/images/logo1.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/wwwroot/img/logo.png | 补丁 | 查看 | 原始文档 | blame | 历史 |
zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs
@@ -17,6 +17,7 @@ public string ShenqingtimeName { get; set; } public string Remark { get; set; } public string ShenpiStatus { get; set; } public string ShenpiStatusName { get; set; } public string RecStatus { get; set; } public string Creater { get; set; } public DateTime Createtime { get; set; } zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs
@@ -180,5 +180,88 @@ } return new JsonResult(returnMsg); } /// <summary> /// 会员提现申请,审批结果 /// </summary> /// <param name="data"></param> /// <returns></returns> public IActionResult GetCustomerWithdrawal(string OrderNo) { ReturnMsg<AdmCustomerWithdrawalDTO> returnMsg = new ReturnMsg<AdmCustomerWithdrawalDTO>(); returnMsg.code = 2; try { //验证数据完整性 if (string.IsNullOrWhiteSpace(OrderNo)) { returnMsg.code = 2; returnMsg.error = "没有订单号!"; returnMsg.count = 0; return new JsonResult(returnMsg); } ResultEntity resultEntity = new ResultEntity(); var customerWithdrawalDTO = _askService.GetCustomerWithdrawalList(OrderNo).FirstOrDefault(); //验证是否重复发起 if (customerWithdrawalDTO == null) { returnMsg.code = 2; returnMsg.error = "没有查找到审批流程!"; returnMsg.count = 0; return new JsonResult(returnMsg); } var sysCodeDtls = _liaotianService.GetSYScode("wf_run_process", "shenpi_status"); var sysCodeDtl = sysCodeDtls.Where(x => x.CodeSn == customerWithdrawalDTO.ShenpiStatus).FirstOrDefault(); if (sysCodeDtl != null) { customerWithdrawalDTO.ShenpiStatusName = sysCodeDtl.Comments; } var wfRunProcessDTO = _wfRunProcessService.GetList(customerWithdrawalDTO.Id, "20").FirstOrDefault(); if (wfRunProcessDTO == null) { returnMsg.code = 2; returnMsg.error = "没有查找到审批流程!"; returnMsg.count = 0; return new JsonResult(returnMsg); } var lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id).LastOrDefault() ; if (lishiyijian == null) { returnMsg.code = 2; returnMsg.error = "没有查找到审批流程!"; returnMsg.count = 0; return new JsonResult(returnMsg); } customerWithdrawalDTO.Content = lishiyijian.Content; customerWithdrawalDTO.Step = wfRunProcessDTO.Step; returnMsg.code = 1; returnMsg.returnObj = customerWithdrawalDTO; returnMsg.count = 1; } catch (Exception ex) { returnMsg.code = 2; returnMsg.error = "没有获取到token"; returnMsg.count = 0; } return new JsonResult(returnMsg); } } } zhengcaioa/zhengcaioa/Model/SiteConfig.cs
@@ -67,7 +67,7 @@ { get { return "/img/logo.png"; return "/img/logo.png?v=3"; } set zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -101,18 +101,24 @@ // new TransactionScope(TransactionScopeOption.Required, // new TransactionOptions // { // IsolationLevel = IsolationLevel.ReadCommitted, // Timeout = TransactionManager.MaximumTimeout // } //) //using (TransactionScope scope = new TransactionScope()) //{ //获取最后更新时间 DateTime start = DateTime.Now.AddYears(-10); //获取最后更新时间 DateTime start = DateTime.Now.AddYears(-10); DateTime end = DateTime.Now; var ssss = _liaotianService.GetSysUpdatetime("getCustomers"); @@ -132,7 +138,7 @@ Uri getUrl = new Uri(Shuchengurl + GetShopUsers + "?start="+ start.ToString("yyyy-MM-dd HH:mm:ss") + "&end="+ end.ToString("yyyy-MM-dd HH:mm:ss")); var httpClient = _clientFactory.CreateClient(); httpClient.Timeout = new TimeSpan(0, 0, 60); httpClient.Timeout = new TimeSpan(0, 0, 10); var Result = await httpClient.GetAsync(getUrl); result = Result.Content.ReadAsStringAsync().Result; @@ -168,7 +174,7 @@ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json"); var httpClient2 = _clientFactory.CreateClient(); httpClient2.Timeout = new TimeSpan(0, 0, 60); httpClient2.Timeout = new TimeSpan(0, 0, 10); var Result2 = await httpClient2.PostAsync(postUrl2, httpContent); result2 = Result2.Content.ReadAsStringAsync().Result; } @@ -176,13 +182,13 @@ _logger.LogInformation("result2:" + result2); JObject jobjectresult2 = (JObject)JsonConvert.DeserializeObject(result2); if (jobjectresult2["code"] == null && jobjectresult2["code"].ToString() != "1") if (jobjectresult2["code"] == null || jobjectresult2["code"].ToString() != "1") { throw new Exception(jobjectresult2["msg"].ToString()); } JObject jobjectkehu = (JObject)jobjectresult2["data"]; if (jobjectkehu["Name"] == null || jobjectkehu["Name"].ToString() == "") if (jobjectkehu == null || jobjectkehu["Name"] == null || jobjectkehu["Name"].ToString() == "") { throw new Exception("未找到对应的会员!"); } @@ -272,7 +278,7 @@ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json"); var httpClient1 = _clientFactory.CreateClient(); httpClient1.Timeout = new TimeSpan(0, 0, 60); httpClient1.Timeout = new TimeSpan(0, 0, 10); var Result1 = await httpClient1.PostAsync(postUrl, httpContent); result1 = Result1.Content.ReadAsStringAsync().Result; } zhengcaioa/zhengcaioa/Views/Home/login.cshtml
@@ -232,7 +232,7 @@ <div class="container"> <form class="form-signin" action="/Home/Login" method="post"> <div class="form-signin-heading text-center"> <img src="~/img/images/logo.png?v=1" alt="" style="height:100px;" /> <img src="~/img/images/logo.png?v=3" alt="" style="height:100px;" /> </div> <div class="login-wrap"> <div class="form-group has-feedback"> zhengcaioa/zhengcaioa/Views/Shared/_Layout_Left.cshtml
@@ -10,7 +10,7 @@ <div class="sidebar-collapse"> <ul class="nav" id="side-menu"> <li class="nav-header"> <img src="/img/images/logo.png?v=1" alt="" /> <img src="/img/images/logo.png?v=3" alt="" /> </li> @(new HtmlString(UserPage.GetMeum(actionlist.Id))) <li> zhengcaioa/zhengcaioa/wwwroot/img/images/logo.pngzhengcaioa/zhengcaioa/wwwroot/img/images/logo1.png
zhengcaioa/zhengcaioa/wwwroot/img/logo.png