From a6a84e6f677447342e8c5984fdc0b52241b92ce3 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 01:20:34 +0800
Subject: [PATCH] 客户管理分配个性产品优化、返回URL优化
---
web/web/GwOrder.ashx | 156 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 109 insertions(+), 47 deletions(-)
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index cdb1c66..434b392 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -25,7 +25,7 @@
//private List<GwProduct> _ProductClassList; //浜у搧鍒嗙被
private int _userId = -1;
- private int _userType = -1;
+ private string _userType = "";
private string _account = "";
public override JsonPageResult ProcessRequestInternal(PageContext<SysUser> context)
@@ -55,6 +55,8 @@
return this.Cancel(context); //鍙栨秷
case "audit":
return this.Audit(context); //璁㈠崟瀹℃牳
+ case "getOrderBySpId":
+ return this.GetOrderBySpId(context); //璁㈠崟瀹℃牳
default:
throw new Exception("Invalid Action=" + @string);
@@ -67,10 +69,10 @@
//Console.WriteLine("List.............[" + context.GetInt("name") + "][" + context.GetInt("classes") + "]");
string spId = context.GetString("spId");
string clientId = context.GetString("clientId");
- string clientName = context.GetString("clientName");
+ string compay = context.GetString("compay");
int flag = context.GetInt("flag");
DateTime startDate = context.GetDateTime("startDate");
- DateTime endDate = context.GetDateTime("endDate");
+ DateTime endDate = context.GetDateTime("endDate")==DateTime.Parse("0001-01-01 00:00:00")? DateTime.Now : context.GetDateTime("endDate");
int recordCount = 0;
int pageSize = context.GetInt("pageSize", 50);
@@ -78,7 +80,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");
- List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, clientName, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
+ List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, compay, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
@@ -89,18 +91,20 @@
{
++num;
- str1 += "<tr><td>" + bean.OrderId + "</td>";
- str1 = str1 + "<td>" + bean.SpId + "</td>";
- str1 = str1 + "<td>" + bean.ClientId + "-" + bean.ClientName + "</td>";
+ //str1 += "<tr><td>" + bean.OrderId + "</td>";
+ str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
+ str1 = str1 + "<td>" + bean.ClientId + "</td>";
+ str1 = str1 + "<td>" + bean.Company + "</td>";
str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
+ str1 = str1 + "<td>" + bean.Auditor + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = str1 + "<td>" + StatusToName(bean.Status) + "</td>";
@@ -113,7 +117,7 @@
}
}
else
- str1 += "<tr><td colspan=\"15\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+ str1 += "<tr><td colspan=\"16\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
return new JsonPageResult(true, new
{
@@ -127,10 +131,10 @@
{
string spId = context.GetString("spId");
string clientId = context.GetString("clientId");
- string clientName = context.GetString("clientName");
+ string company = context.GetString("company");
int flag = context.GetInt("flag");
DateTime startDate = context.GetDateTime("startDate");
- DateTime endDate = context.GetDateTime("endDate");
+ DateTime endDate = context.GetDateTime("endDate")==DateTime.Parse("0001-01-01 00:00:00")? DateTime.Now : context.GetDateTime("endDate");
int recordCount = 0;
int pageSize = context.GetInt("pageSize", 50);
@@ -138,7 +142,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");
- List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, clientName, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
+ List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, company, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
@@ -149,18 +153,20 @@
{
++num;
- str1 += "<tr><td>" + bean.OrderId + "</td>";
- str1 = str1 + "<td>" + bean.SpId + "</td>";
- str1 = str1 + "<td>" + bean.ClientId + "-" + bean.ClientName + "</td>";
+ //str1 += "<tr><td>" + bean.OrderId + "</td>";
+ str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
+ str1 = str1 + "<td>" + bean.ClientId + "</td>";
+ str1 = str1 + "<td>" + bean.Company + "</td>";
str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
+ str1 = str1 + "<td>" + bean.Auditor + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = str1 + "<td>" + StatusToName(bean.Status) + "</td>";
@@ -177,7 +183,7 @@
}
}
else
- str1 += "<tr><td colspan=\"15\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+ str1 += "<tr><td colspan=\"16\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
return new JsonPageResult(true, new
{
@@ -203,12 +209,12 @@
string spId = context.GetString("spId");
string clientId = context.GetString("clientId");
- string clientName = context.GetString("clientName");
+ string company = context.GetString("company");
int flag = context.GetInt("flag");
//string startDate = context.GetString("startDate");
//string endDate = context.GetString("endDate");
DateTime startDate = context.GetDateTime("startDate");
- DateTime endDate = context.GetDateTime("endDate");
+ DateTime endDate = context.GetDateTime("endDate")==DateTime.Parse("0001-01-01 00:00:00")? DateTime.Now : context.GetDateTime("endDate");
int recordCount = 0;
int pageSize = context.GetInt("pageSize", 50);
@@ -217,7 +223,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");
//List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, clientName, flag, Convert.ToDateTime(startDate), Convert.ToDateTime(endDate).AddDays(1.0), pageSize, pageIndex, out recordCount);
- List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, clientName, flag, startDate, endDate.AddDays(1.0), pageSize, pageIndex, permissionsSQL, out recordCount);
+ List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, company, flag, startDate, endDate.AddDays(1.0), pageSize, pageIndex, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
@@ -228,24 +234,26 @@
{
++num;
- str1 += "<tr><td>" + bean.OrderId + "</td>";
- str1 = str1 + "<td>" + bean.SpId + "</td>";
- str1 = str1 + "<td>" + bean.ClientId + "-" + bean.ClientName + "</td>";
+ //str1 += "<tr><td>" + bean.OrderId + "</td>";
+ str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
+ str1 = str1 + "<td>" + bean.ClientId + "</td>";
+ str1 = str1 + "<td>" + bean.Company + "</td>";
str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
+ str1 = str1 + "<td>" + bean.Auditor + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = str1 + "<td>" + StatusToName(bean.Status) + "</td>";
//str1 = str1 + "<td>" + bean.Remark + "</td>";
- str1 += "<td class=\"text-right\">";
+ str1 += "<td class=\"text-center\">";
str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 鏌ョ湅</a> ", (object) bean.OrderId);
//str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-audit btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 瀹℃牳</a> ", (object) bean.OrderId);
//if(bean.Status == 0) {
@@ -256,7 +264,7 @@
}
}
else
- str1 += "<tr><td colspan=\"15\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+ str1 += "<tr><td colspan=\"16\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
return new JsonPageResult(true, new
{
@@ -316,6 +324,11 @@
string remark = context.GetString("remark");
int status = context.GetInt("status"); //0-瀹℃牳涓嶉�氳繃锛�1-瀹℃牳閫氳繃
string auditReason = context.GetString("auditReason");
+
+ if (status == 0 && string.IsNullOrEmpty(auditReason) )
+ {
+ throw new ArgumentException("璇疯緭鍏ヤ笉閫氳繃鍘熷洜锛�");
+ }
DateTime createTime = DateTime.Now;
string creator = context.OperatorID;
@@ -560,11 +573,11 @@
if (string.IsNullOrEmpty(clientId))
{
- throw new ArgumentException("瀹㈡埛涓嶈兘涓虹┖锛�");
+ throw new ArgumentException("瀹㈡埛璐﹀彿涓嶈兘涓虹┖锛�");
}
if (string.IsNullOrEmpty(spId))
{
- throw new ArgumentException("璐﹀彿涓嶈兘涓虹┖锛�");
+ throw new ArgumentException("鐭俊璐﹀彿涓嶈兘涓虹┖锛�");
}
if (basicNum<=0 && givingNum <= 0 && payAmount <=0)
@@ -743,11 +756,11 @@
if (string.IsNullOrEmpty(clientId))
{
- throw new ArgumentException("瀹㈡埛涓嶈兘涓虹┖锛�");
+ throw new ArgumentException("瀹㈡埛璐﹀彿涓嶈兘涓虹┖锛�");
}
if (string.IsNullOrEmpty(spId))
{
- throw new ArgumentException("璐﹀彿涓嶈兘涓虹┖锛�");
+ throw new ArgumentException("鐭俊璐﹀彿涓嶈兘涓虹┖锛�");
}
if (basicNum<=0 && givingNum <= 0)
@@ -783,6 +796,55 @@
private JsonPageResult Get(PageContext<SysUser> context)
{
return new JsonPageResult(true, this._Dao.Get(context.GetString("orderId")));
+ }
+
+ //鏍规嵁瀹㈡埛API璐﹀彿鑾峰彇鍏呭�煎垵濮嬩俊鎭�
+ private JsonPageResult GetOrderBySpId(PageContext<SysUser> context)
+ {
+ string spId = context.GetString("spId");
+
+ if (!string.IsNullOrEmpty(spId))
+ {
+ GwSp gwSp = new GwSpDao().Get(spId);
+ if(gwSp==null)
+ {
+ throw new ArgumentException("璐﹀彿涓嶅瓨鍦紒");
+
+ }
+ else if (gwSp.Status==0)
+ {
+ throw new ArgumentException("璐﹀彿鐘舵�佸凡鍋滅敤锛�");
+
+ }
+
+
+ GwOrder gwOrder = new GwOrder();
+
+ GwClient gwClient = new GwClient();
+ using (GwClientDao gwClientDao = new GwClientDao())
+ {
+ gwClient = gwClientDao.Get(gwSp.ClientID);
+ gwOrder.Company = gwClient.Company;
+ gwOrder.Balance = long.Parse(gwClient.Balance.ToString() ); //浣欓
+ }
+
+ gwOrder.SpId = gwSp.SpID;
+ gwOrder.ClientId = gwSp.ClientID;
+ gwOrder.ProductId = gwSp.ProductId;
+ gwOrder.ProductName = gwSp.ProductName;
+ gwOrder.Price = gwSp.Price;
+ gwOrder.BasicNum = gwSp.BasicNum; //鍩烘湰鏉℃暟
+ gwOrder.GivingNum = gwSp.GivingNum;
+
+ return new JsonPageResult(true, gwOrder);
+ }
+ else
+ {
+ throw new ArgumentException("璇烽�夋嫨鐭俊璐﹀彿锛�");
+
+ }
+
+
}
//鑾峰彇閫氶亾鍒楄〃
@@ -830,9 +892,9 @@
if (classes == -1)
return string.Empty;
else if(classes == 0)
- return "0-浜у搧鍒嗙被";
+ return "浜у搧鍒嗙被";
else if(classes == 1)
- return "1-浜у搧";
+ return "浜у搧";
return string.Empty;
}
@@ -843,9 +905,9 @@
if (isDefault == -1)
return string.Empty;
else if(isDefault == 0)
- return "0-涓�у寲";
+ return "涓�у寲";
else if(isDefault == 1)
- return "1-绯荤粺榛樿";
+ return "绯荤粺榛樿";
return string.Empty;
}
@@ -856,9 +918,9 @@
if (isEnable == -1)
return string.Empty;
else if(isEnable == 0)
- return "0-鍋滅敤";
+ return "鍋滅敤";
else if(isEnable == 1)
- return "1-鍚敤";
+ return "鍚敤";
return string.Empty;
}
@@ -880,15 +942,15 @@
if (status == -1)
return string.Empty;
else if(status == 0)
- return "0-寰呭鏍革紙宸叉彁浜わ級";
+ return "寰呭鏍革紙宸叉彁浜わ級";
else if(status == 1)
- return "1-瀹℃牳涓�";
+ return "瀹℃牳涓�";
else if(status == 2)
- return "2-瀹℃牳閫氳繃";
+ return "瀹℃牳閫氳繃";
else if(status == 3)
- return "3-瀹℃牳涓嶉�氳繃";
+ return "瀹℃牳涓嶉�氳繃";
else if(status == 4)
- return "4-鍙栨秷";
+ return "鍙栨秷";
return string.Empty;
}
--
Gitblit v1.9.1