From a829564b85fa72a2074fb6a0cbfaeb0fcb7d1c6b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 05 八月 2021 11:51:51 +0800
Subject: [PATCH] 今日开发 更换登录页面logo ，获取会员提现申请审批结果接口
---
zhengcaioa/zhengcaioa/wwwroot/img/images/logo.png | 0
zhengcaioa/zhengcaioa/wwwroot/img/logo.png | 0
zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs | 1
zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs | 83 +++++++++++++++++++++++++++++++++++++++++
zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 22 +++++++----
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Left.cshtml | 2
zhengcaioa/zhengcaioa/Model/SiteConfig.cs | 2
zhengcaioa/zhengcaioa/Views/Home/login.cshtml | 2
zhengcaioa/zhengcaioa/wwwroot/img/images/logo1.png | 0
9 files changed, 101 insertions(+), 11 deletions(-)
diff --git a/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs b/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs
index d47495d..4770749 100644
--- a/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs
+++ b/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; }
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs
index b3cdab9..1927179 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs
+++ b/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 = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Model/SiteConfig.cs b/zhengcaioa/zhengcaioa/Model/SiteConfig.cs
index 9941cbd..0ff8b0d 100644
--- a/zhengcaioa/zhengcaioa/Model/SiteConfig.cs
+++ b/zhengcaioa/zhengcaioa/Model/SiteConfig.cs
@@ -67,7 +67,7 @@
{
get
{
- return "/img/logo.png";
+ return "/img/logo.png?v=3";
}
set
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index 3258c76..ae5d141 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/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;
}
diff --git a/zhengcaioa/zhengcaioa/Views/Home/login.cshtml b/zhengcaioa/zhengcaioa/Views/Home/login.cshtml
index 1aed591..01919e4 100644
--- a/zhengcaioa/zhengcaioa/Views/Home/login.cshtml
+++ b/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">
diff --git a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Left.cshtml b/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Left.cshtml
index fe746b2..e20e4ee 100644
--- a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Left.cshtml
+++ b/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>
diff --git a/zhengcaioa/zhengcaioa/wwwroot/img/images/logo.png b/zhengcaioa/zhengcaioa/wwwroot/img/images/logo.png
index dd862f7..33be89f 100644
--- a/zhengcaioa/zhengcaioa/wwwroot/img/images/logo.png
+++ b/zhengcaioa/zhengcaioa/wwwroot/img/images/logo.png
Binary files differ
diff --git a/zhengcaioa/zhengcaioa/wwwroot/img/images/logo1.png b/zhengcaioa/zhengcaioa/wwwroot/img/images/logo1.png
new file mode 100644
index 0000000..dd862f7
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/wwwroot/img/images/logo1.png
Binary files differ
diff --git a/zhengcaioa/zhengcaioa/wwwroot/img/logo.png b/zhengcaioa/zhengcaioa/wwwroot/img/logo.png
index 503d8f8..e09e45a 100644
--- a/zhengcaioa/zhengcaioa/wwwroot/img/logo.png
+++ b/zhengcaioa/zhengcaioa/wwwroot/img/logo.png
Binary files differ
--
Gitblit v1.9.1