From c0a9a10f8da3ebaaffb01de6115392476f4f4197 Mon Sep 17 00:00:00 2001
From: chenzx <m15572880737@163.com>
Date: 星期一, 02 十二月 2024 18:30:27 +0800
Subject: [PATCH] czx20241202更新
---
GasolineBlend.BLL/AccountBLL.cs | 9 ++++
/dev/null | 0
GasolineBlend/Controllers/DefaultCompanyController.cs | 3 +
GasolineBlend/Controllers/SubsidyDataController.cs | 3 +
GasolineBlend.Entity/GasolineBlend.Entity.csproj | 1
GasolineBlend/GasolineBlend.csproj | 1
GasolineBlend.DAL/AccountDAL.cs | 14 +++++++
GasolineBlend/Controllers/UserController.cs | 29 ++++++++++++++
GasolineBlend.DAL/GasolineBlend.DAL.csproj | 1
GasolineBlend.Entity/DefaultCompany.cs | 2
GasolineBlend.BLL/GasolineBlend.BLL.csproj | 1
11 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/.vs/PolicyControl/FileContentIndex/04d3f97a-8414-4d0e-9d75-5ecea460a9b4.vsidx b/.vs/PolicyControl/FileContentIndex/04d3f97a-8414-4d0e-9d75-5ecea460a9b4.vsidx
deleted file mode 100644
index 0115622..0000000
--- a/.vs/PolicyControl/FileContentIndex/04d3f97a-8414-4d0e-9d75-5ecea460a9b4.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/PolicyControl/FileContentIndex/06bc2a9a-85f6-47eb-a2fc-2c8eb536d516.vsidx b/.vs/PolicyControl/FileContentIndex/06bc2a9a-85f6-47eb-a2fc-2c8eb536d516.vsidx
deleted file mode 100644
index 3c550a1..0000000
--- a/.vs/PolicyControl/FileContentIndex/06bc2a9a-85f6-47eb-a2fc-2c8eb536d516.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/PolicyControl/FileContentIndex/1669bd7f-25db-4263-9fcb-06ae30f47f94.vsidx b/.vs/PolicyControl/FileContentIndex/1669bd7f-25db-4263-9fcb-06ae30f47f94.vsidx
deleted file mode 100644
index bb96f8d..0000000
--- a/.vs/PolicyControl/FileContentIndex/1669bd7f-25db-4263-9fcb-06ae30f47f94.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/PolicyControl/FileContentIndex/65f4c7ec-ff52-4e7a-9fee-c640c785a1b7.vsidx b/.vs/PolicyControl/FileContentIndex/65f4c7ec-ff52-4e7a-9fee-c640c785a1b7.vsidx
deleted file mode 100644
index 11f12f7..0000000
--- a/.vs/PolicyControl/FileContentIndex/65f4c7ec-ff52-4e7a-9fee-c640c785a1b7.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/PolicyControl/FileContentIndex/ca6fd239-2f27-444a-b7d0-78af5c5aac4f.vsidx b/.vs/PolicyControl/FileContentIndex/ca6fd239-2f27-444a-b7d0-78af5c5aac4f.vsidx
deleted file mode 100644
index 3120308..0000000
--- a/.vs/PolicyControl/FileContentIndex/ca6fd239-2f27-444a-b7d0-78af5c5aac4f.vsidx
+++ /dev/null
Binary files differ
diff --git a/GasolineBlend.BLL/AccountBLL.cs b/GasolineBlend.BLL/AccountBLL.cs
index 3bb6e92..01f8e4b 100644
--- a/GasolineBlend.BLL/AccountBLL.cs
+++ b/GasolineBlend.BLL/AccountBLL.cs
@@ -248,6 +248,15 @@
}
/// <summary>
+ /// 鏇存柊鐢ㄦ埛鍩烘湰淇℃伅
+ /// </summary>
+ /// <param name="account"></param>
+ /// <returns></returns>
+ public bool UpdateAccountAddress(Account account)
+ {
+ return _acc.UpdateAccountAddress(account);
+ }
+ /// <summary>
/// 缁戝畾寰俊璐︽埛-鐧诲綍
/// </summary>
/// <param name="userName"></param>
diff --git a/GasolineBlend.BLL/GasolineBlend.BLL.csproj b/GasolineBlend.BLL/GasolineBlend.BLL.csproj
index 30fc314..27880f6 100644
--- a/GasolineBlend.BLL/GasolineBlend.BLL.csproj
+++ b/GasolineBlend.BLL/GasolineBlend.BLL.csproj
@@ -127,6 +127,7 @@
<ItemGroup>
<Compile Include="AccountBLL.cs" />
<Compile Include="AccountGroupBLL.cs" />
+ <Compile Include="EnterpriseInformationBLL.cs" />
<Compile Include="DefaultCompanyBLL.cs" />
<Compile Include="PushDataBLL.cs" />
<Compile Include="OrderDataBLL.cs" />
diff --git a/GasolineBlend.DAL/AccountDAL.cs b/GasolineBlend.DAL/AccountDAL.cs
index c703843..c00fa08 100644
--- a/GasolineBlend.DAL/AccountDAL.cs
+++ b/GasolineBlend.DAL/AccountDAL.cs
@@ -308,6 +308,20 @@
}
/// <summary>
+ /// 鏇存柊鐢ㄦ埛鍩烘湰淇℃伅
+ /// </summary>
+ /// <param name="account"></param>
+ /// <returns></returns>
+ public bool UpdateAccountAddress(Account account)
+ {
+ var sql = $"update sysAccount set Address=@Address where Id=@Id;";
+ DynamicParameters paras = new DynamicParameters();
+ paras.Add("Address", account.Address);
+ paras.Add("Id", account.Id);
+ return Conn.Execute(sql, paras) > 0;
+ }
+
+ /// <summary>
/// 缁戝畾寰俊璐︽埛-鐧诲綍
/// </summary>
/// <param name="userName"></param>
diff --git a/GasolineBlend.DAL/GasolineBlend.DAL.csproj b/GasolineBlend.DAL/GasolineBlend.DAL.csproj
index 0bcca27..23e91fa 100644
--- a/GasolineBlend.DAL/GasolineBlend.DAL.csproj
+++ b/GasolineBlend.DAL/GasolineBlend.DAL.csproj
@@ -85,6 +85,7 @@
<ItemGroup>
<Compile Include="AccountDAL.cs" />
<Compile Include="AccountGroupDAL.cs" />
+ <Compile Include="EnterpriseInformationDAL.cs" />
<Compile Include="DefaultCompanyDAL.cs" />
<Compile Include="PushDataDAL.cs" />
<Compile Include="OrderDataDAL.cs" />
diff --git a/GasolineBlend.Entity/DefaultCompany.cs b/GasolineBlend.Entity/DefaultCompany.cs
index 9a00513..76854ed 100644
--- a/GasolineBlend.Entity/DefaultCompany.cs
+++ b/GasolineBlend.Entity/DefaultCompany.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 鏄惁鎺ㄩ�佹斂绛�
/// </summary>
- public string Compose { get; set; }
+ public string Company { get; set; }
/// <summary>
///鐢ㄦ埛
diff --git a/GasolineBlend.Entity/GasolineBlend.Entity.csproj b/GasolineBlend.Entity/GasolineBlend.Entity.csproj
index 01aae95..6b681bf 100644
--- a/GasolineBlend.Entity/GasolineBlend.Entity.csproj
+++ b/GasolineBlend.Entity/GasolineBlend.Entity.csproj
@@ -47,6 +47,7 @@
<Compile Include="Account.cs" />
<Compile Include="AccountGroup.cs" />
<Compile Include="AccountRecAge.cs" />
+ <Compile Include="EnterpriseInformation.cs" />
<Compile Include="DefaultCompany.cs" />
<Compile Include="PushDataPage.cs" />
<Compile Include="OrderDataPage.cs" />
diff --git a/GasolineBlend/Controllers/DefaultCompanyController.cs b/GasolineBlend/Controllers/DefaultCompanyController.cs
index 2c189a1..18d62f2 100644
--- a/GasolineBlend/Controllers/DefaultCompanyController.cs
+++ b/GasolineBlend/Controllers/DefaultCompanyController.cs
@@ -68,6 +68,9 @@
}
}
+
+
+
/// <summary>
///娣诲姞鎺ㄩ��
/// </summary>
diff --git a/GasolineBlend/Controllers/SubsidyDataController.cs b/GasolineBlend/Controllers/SubsidyDataController.cs
index 7d24a94..5749068 100644
--- a/GasolineBlend/Controllers/SubsidyDataController.cs
+++ b/GasolineBlend/Controllers/SubsidyDataController.cs
@@ -116,7 +116,8 @@
{
try
{
- var id = OperatorProvider.Instance.Current.UserId;
+ //var id = OperatorProvider.Instance.Current.UserId;
+ var id = 1;
if (id == 0)
{
return Error(message: "璐︽埛鏈櫥褰曪紒璇风櫥褰曞悗鏌ヨ", data: "-1");
diff --git a/GasolineBlend/Controllers/UserController.cs b/GasolineBlend/Controllers/UserController.cs
index c955631..21deacd 100644
--- a/GasolineBlend/Controllers/UserController.cs
+++ b/GasolineBlend/Controllers/UserController.cs
@@ -655,6 +655,35 @@
}
}
+
+ [HttpPost]
+ public ActionResult UpdateAccountAddress(int id, string Address)
+ {
+ try
+ {
+ Account account = new Account();
+ account.Address = Address;
+ account.Id = id;
+ if (id > 0)
+ {
+ var rev = _acc.UpdateAccountAddress(account);
+ return rev ? Success() : Error();
+ }
+ else
+ {
+ return Error("淇敼澶辫触锛佸綋鍓嶇敤鎴蜂笉瀛樺湪锛�");
+ }
+ }
+ catch (Exception e)
+ {
+ LogHelper.Write(Level.Error, "淇敼鐢ㄦ埛鍩烘湰淇℃伅 UpdateAccountAddress", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
+ return Error();
+ }
+ }
+
+
+
+
/// <summary>
/// 鏇存柊椤圭洰榛樿鍔犺浇妯″紡
/// </summary>
diff --git a/GasolineBlend/GasolineBlend.csproj b/GasolineBlend/GasolineBlend.csproj
index 2b9be30..be8817d 100644
--- a/GasolineBlend/GasolineBlend.csproj
+++ b/GasolineBlend/GasolineBlend.csproj
@@ -222,6 +222,7 @@
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\WebExceptionFilterAttribute.cs" />
+ <Compile Include="Controllers\EnterpriseInformation.cs" />
<Compile Include="Controllers\DefaultCompanyController.cs" />
<Compile Include="Controllers\PushDataController.cs" />
<Compile Include="Controllers\OrderDataController.cs" />
--
Gitblit v1.8.0