From f63d8ead25bdb3c32dacca817a059bd30390e9bc Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 15 六月 2022 22:20:07 +0800
Subject: [PATCH] 1.系统账户数据库优化： 修改“账户类型”的数据类型为VARCHAR2(1024)，多个角色时以半角“,”分隔。 加密盐。 密码加密优化；账户登录优化；角色权限管理（作废用户权限）； 2.字典类型管理（定义：用户角色） 3.字典数据管理（初始化用户角色数据） 3.角色权限管理 4.系统账户管理，账户类型对应用户角色（可多选）。
---
web/Dao/GwOrderDao.cs | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/web/Dao/GwOrderDao.cs b/web/Dao/GwOrderDao.cs
index 84b510b..0e1a091 100644
--- a/web/Dao/GwOrderDao.cs
+++ b/web/Dao/GwOrderDao.cs
@@ -32,7 +32,7 @@
//flag: 0-寰呭鏍歌鍗�(宸叉彁浜ゃ�佸鏍镐腑)锛�1-宸插畬鎴愯鍗曪紙瀹℃牳閫氳繃銆佸鏍镐笉閫氳繃銆佸彇娑堬級
- public List<GwOrder> LoadInfoList(string spId, string clientId, string clientName, int flag, DateTime startDate, DateTime endDate, int pageSize, int PageIndex, out int recordcount)
+ public List<GwOrder> LoadInfoList(string spId, string clientId, string compay, int flag, DateTime startDate, DateTime endDate, int pageSize, int PageIndex, string permissionsSQL, out int recordcount)
{
List<GwOrder> list = new List<GwOrder>();
@@ -41,8 +41,9 @@
{
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.Append(" FROM ( ");
- stringBuilder.Append("SELECT GWO.*, GWC.CLIENT_NAME ");
+ stringBuilder.Append("SELECT GWO.*, GWC.CLIENT_NAME, GWC.COMPANY, GWOA.AUDITOR ");
stringBuilder.Append(" FROM GW_ORDER GWO ");
+ stringBuilder.Append(" LEFT JOIN (select ORDER_ID, wm_concat(SU.USER_NAME) AUDITOR from (select ORDER_ID, AUDITOR FROM GW_ORDER_AUDIT order by ORDER_ID, AUDIT_SORT) GOA LEFT JOIN SYS_USER SU ON SU.ACCOUNT = GOA.AUDITOR group by ORDER_ID ) GWOA ON GWOA.ORDER_ID = GWO.ORDER_ID ");
stringBuilder.Append(" LEFT JOIN GW_SP GWS ON GWS.SP_ID = GWO.SP_ID ");
stringBuilder.Append(" LEFT JOIN GW_CLIENT GWC ON GWC.CLIENT_ID = GWO.CLIENT_ID ");
stringBuilder.Append(" WHERE 1=1 ");
@@ -81,10 +82,13 @@
{
stringBuilder.Append(" and GWO.CLIENT_ID like '%" + clientId + "%'");
}
- if ((clientName != null) && (clientName != ""))
+ if ((compay != null) && (compay != ""))
{
- stringBuilder.Append(" and GWC.CLIENT_NAME like '%" + clientName + "%'");
+ stringBuilder.Append(" and GWC.COMPANY like '%" + compay + "%'");
}
+ //瀹㈡埛鏉冮檺SQL鑴氭湰
+ stringBuilder.Append(permissionsSQL);
+
stringBuilder.Append(" ) T ");
OracleParameter[] parameterArray = new OracleParameter[] { new OracleParameter(":START_TIME", startDate), new OracleParameter(":END_TIME", endDate) };
@@ -170,11 +174,11 @@
{
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.Append("INSERT INTO GW_ORDER ( ");
- stringBuilder.Append(" ORDER_ID, SP_ID, CLIENT_ID, PRODUCT_ID, COMBO_ID, BASIC_NUM, GIVING_NUM, PRICE, ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL, BEFORE_BALANCE_NUM ");
+ stringBuilder.Append(" ORDER_ID, SP_ID, CLIENT_ID, PRODUCT_ID, COMBO_ID, BASIC_NUM, GIVING_NUM, PRICE, ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL, PAY_AMOUNT, BEFORE_BALANCE_NUM ");
stringBuilder.Append(" , CREATOR, CREATE_TIME, STATUS, REMARK ");
//stringBuilder.Append(" , AUDITOR, AUDIT_TIME ");
stringBuilder.Append(" ) ");
- stringBuilder.Append(" VALUES (:ORDER_ID, :SP_ID, :CLIENT_ID, :PRODUCT_ID, :COMBO_ID, :BASIC_NUM, :GIVING_NUM, :PRICE, :ORDER_NUM_TOTAL, :ORDER_AMOUNT_TOTAL, :BEFORE_BALANCE_NUM ");
+ stringBuilder.Append(" VALUES (:ORDER_ID, :SP_ID, :CLIENT_ID, :PRODUCT_ID, :COMBO_ID, :BASIC_NUM, :GIVING_NUM, :PRICE, :ORDER_NUM_TOTAL, :ORDER_AMOUNT_TOTAL, :PAY_AMOUNT, :BEFORE_BALANCE_NUM ");
stringBuilder.Append(" , :CREATOR, :CREATE_TIME, :STATUS, :REMARK ");
//stringBuilder.Append(" , :AUDITOR, :AUDIT_TIME ");
stringBuilder.Append(" ) ");
@@ -193,6 +197,7 @@
new OracleParameter(":PRICE", (object)o.Price),
new OracleParameter(":ORDER_NUM_TOTAL", (object)o.OrderNumTotal),
new OracleParameter(":ORDER_AMOUNT_TOTAL", (object)o.OrderAmountTotal),
+ new OracleParameter(":PAY_AMOUNT", (object)o.PayAmount),
new OracleParameter(":BEFORE_BALANCE_NUM", (object)o.BeforeBalanceNum),
new OracleParameter(":CREATOR", (object)o.Creator),
new OracleParameter(":CREATE_TIME", (object)o.CreateTime),
@@ -218,6 +223,24 @@
return OracleHelper.ExecuteSql("update GW_ORDER SET STATUS = :STATUS where ORDER_ID=:ORDER_ID", OracleHelper.Connection, new OracleParameter(":STATUS", (object)status), new OracleParameter(":ORDER_ID", (object)orderId)) > 0;
}
+ //鏇存柊璁㈠崟淇敼鍓嶄綑棰�
+ public bool UpdateBalanceAndStatus(int basicNum, int givingNum, int orderNumTotal, int orderAmountTotal, int payAmount , int beforeGivingNum, int orderStatus, string orderId )
+ {
+ if (string.IsNullOrEmpty(orderId))
+ return false;
+ //status:4-鍙栨秷
+ return OracleHelper.ExecuteSql("update GW_ORDER SET BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM, ORDER_NUM_TOTAL=:ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL=:ORDER_AMOUNT_TOTAL, PAY_AMOUNT=:PAY_AMOUNT, BEFORE_BALANCE_NUM=:BEFORE_BALANCE_NUM, STATUS = :STATUS where ORDER_ID=:ORDER_ID", OracleHelper.Connection
+ , new OracleParameter(":BASIC_NUM", (object)basicNum)
+ , new OracleParameter(":GIVING_NUM", (object)givingNum)
+ , new OracleParameter(":ORDER_NUM_TOTAL", (object)orderNumTotal)
+ , new OracleParameter(":ORDER_AMOUNT_TOTAL", (object)orderAmountTotal)
+ , new OracleParameter(":PAY_AMOUNT", (object)payAmount)
+ , new OracleParameter(":BEFORE_BALANCE_NUM", (object)beforeGivingNum)
+ , new OracleParameter(":STATUS", (object)orderStatus)
+ , new OracleParameter(":ORDER_ID", (object)orderId)
+ ) > 0;
+ }
+
//鏇存柊浜у搧鎴栦骇鍝佸垎绫讳俊鎭�
public bool Update(GwOrder o)
{
@@ -232,6 +255,7 @@
new OracleParameter(":PRICE", (object)o.Price),
new OracleParameter(":ORDER_NUM_TOTAL", (object)o.OrderNumTotal),
new OracleParameter(":ORDER_AMOUNT_TOTAL", (object)o.OrderAmountTotal),
+ new OracleParameter(":PAY_AMOUNT", (object)o.PayAmount),
new OracleParameter(":BEFORE_BALANCE_NUM", (object)o.BeforeBalanceNum),
new OracleParameter(":CREATOR", (object)o.Creator),
new OracleParameter(":CREATE_TIME", (object)o.CreateTime),
@@ -247,7 +271,7 @@
stringBuilder.Append(" , PRODUCT_ID =:PRODUCT_ID ");
stringBuilder.Append(" , COMBO_ID =:COMBO_ID ");
stringBuilder.Append(" , BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM, PRICE=:PRICE, ORDER_NUM_TOTAL=:ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL=:ORDER_AMOUNT_TOTAL ");
- stringBuilder.Append(" , BEFORE_BALANCE_NUM =:BEFORE_BALANCE_NUM, CREATOR=:CREATOR, CREATE_TIME=:CREATE_TIME ");
+ stringBuilder.Append(" , PAY_AMOUNT =:PAY_AMOUNT, BEFORE_BALANCE_NUM =:BEFORE_BALANCE_NUM, CREATOR=:CREATOR, CREATE_TIME=:CREATE_TIME ");
stringBuilder.Append(" , STATUS=:STATUS, REMARK=:REMARK ");
stringBuilder.Append(" WHERE ORDER_ID=:ORDER_ID ");
@@ -261,7 +285,7 @@
GwOrder o = new GwOrder();
if (string.IsNullOrEmpty(orderId))
return o;
- using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select * from GW_ORDER where ORDER_ID=:ORDER_ID"), OracleHelper.Connection, new OracleParameter(":ORDER_ID", (object)orderId)))
+ using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select gwo.*, gc.COMPANY, gp.name PRODUCT_NAME from gw_order gwo left join gw_client gc on gc.client_id = gwo.client_id left join gw_product gp on gp.id = gwo.product_id where gwo.ORDER_ID=:ORDER_ID"), OracleHelper.Connection, new OracleParameter(":ORDER_ID", (object)orderId)))
{
if (((DbDataReader)reader).Read())
{
@@ -285,19 +309,22 @@
OracleReaderWrapper oracleReaderWrapper = new OracleReaderWrapper(reader);
o.OrderId = oracleReaderWrapper.GetString("ORDER_ID", "");
o.SpId = oracleReaderWrapper.GetString("SP_ID", "");
- o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
+ o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
+ o.Company = oracleReaderWrapper.GetString("COMPANY", "");
o.ClientName = oracleReaderWrapper.GetString("CLIENT_NAME", "");
o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");
+ o.ProductName = oracleReaderWrapper.GetString("PRODUCT_NAME", "");
o.ComboId = oracleReaderWrapper.GetString("COMBO_ID", "");
o.BasicNum = oracleReaderWrapper.GetInt("BASIC_NUM", 0);
o.GivingNum = oracleReaderWrapper.GetInt("GIVING_NUM", 0);
o.Price = oracleReaderWrapper.GetInt("PRICE", 0);
o.OrderNumTotal = oracleReaderWrapper.GetInt("ORDER_NUM_TOTAL", 0);
o.OrderAmountTotal = oracleReaderWrapper.GetInt("ORDER_AMOUNT_TOTAL", 0);
+ o.PayAmount = oracleReaderWrapper.GetInt("PAY_AMOUNT", 0);
o.BeforeBalanceNum = oracleReaderWrapper.GetInt("BEFORE_BALANCE_NUM", 0);
o.Creator = oracleReaderWrapper.GetString("CREATOR", "");
o.CreateTime = oracleReaderWrapper.GetDateTime("CREATE_TIME");
- //o.Auditor = oracleReaderWrapper.GetString("AUDITOR", "");
+ o.Auditor = oracleReaderWrapper.GetString("AUDITOR", ""); //鍚勭骇瀹℃牳浜�
//o.AuditTime = oracleReaderWrapper.GetDateTime("AUDIT_TIME");
o.Status = oracleReaderWrapper.GetInt("STATUS", 0);
o.Remark = oracleReaderWrapper.GetString("REMARK", "");
--
Gitblit v1.9.1