From 148b7e632c249c2a9d1dd077de3d181737bb37b6 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 11 五月 2022 11:55:03 +0800
Subject: [PATCH] 订单列表增加充值金额；客户列表增加账户余额；累计充值金额除以1000
---
web/web/GwClient.ashx | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 617bcaf..151e4be 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -89,7 +89,9 @@
{
Certification_StatusResult = "宸茶璇�";
}
- str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
+ //edit:yangzh by 20220511
+ //str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
+ str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
str += @"<td>";
string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;
@@ -229,13 +231,23 @@
{
int id = Int32.Parse(context.GetString("id"));
string clientID = context.GetString("clientID");
+ string company = context.GetString("company");
string password = context.GetString("password");
string clientName = context.GetString("clientName");
string address = context.GetString("address");
string telephone = context.GetString("telephone");
string remark = context.GetString("remark");
string agent = context.GetString("agent");
- string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(context.GetString("permissionData").Split(','));
+ string data = context.GetString("permissionData");
+ if(data.Contains("1"))
+ {
+ data += ",sp.aspx,GwTaskSmssend,SpPrePattern.aspx";
+ }
+ if(data.Contains("2"))
+ {
+ data += ",molog.aspx,mtlog.aspx#stat,mtlog.aspx,statis.aspx";
+ }
+ string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(data.Split(','));
if (string.IsNullOrEmpty(clientID))
{
@@ -257,6 +269,7 @@
client.Id = id;
client.ClientID = clientID;
+ client.Company = company;
client.Password = password;
client.ClientName = clientName;
client.Address = address;
@@ -275,13 +288,22 @@
{
string clientID = context.GetString("clientID");
string password = context.GetString("password");
- //string clientName = context.GetString("clientName");
+ string clientName = context.GetString("clientName");
string address = context.GetString("address");
string telephone = context.GetString("telephone");
string remark = context.GetString("remark");
string agent = context.GetString("agent");
string company = context.GetString("company");
- string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(context.GetString("permissionData").Split(','));
+ string data = context.GetString("permissionData");
+ if(data.Contains("1"))
+ {
+ data += ",sp.aspx,GwTaskSmssend,SpPrePattern.aspx";
+ }
+ if(data.Contains("2"))
+ {
+ data += ",molog.aspx,mtlog.aspx#stat,mtlog.aspx,statis.aspx";
+ }
+ string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(data.Split(','));
if (string.IsNullOrEmpty(clientID))
{
@@ -347,7 +369,7 @@
client.ClientID = clientID;
client.Password = password;
- //client.ClientName = clientName;
+ client.ClientName = clientName;
client.Address = address;
client.Remark = remark;
client.Telephone = telephone;
@@ -360,6 +382,8 @@
//淇濆瓨浜у搧璁板綍
//鑾峰彇鍚敤鐨勯粯璁ょ殑浜у搧
+ /**
+ //edit:鍦ㄥ鎴锋縺娲绘椂娣诲姞璁板綍
List<string> defaultProductList = GwProductDao.Instance.GetDefaultProduct();
if (defaultProductList.Count > 0)
{
@@ -372,6 +396,7 @@
GwClientProductDao.Instance.Add(gcp);
}
}
+ **/
return new JsonPageResult(true, "鍒涘缓璐︽埛鎴愬姛锛�");
}
--
Gitblit v1.9.1