From 3a3e585d9dd93688ed237bfc46bf06991d0772a1 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 19 五月 2022 15:00:52 +0800
Subject: [PATCH] 账号信息增加是否自动返还 系统账号信息增加：用户类型 客户信息增加：归属客户经理、归属业务员、归属客服人员、归属财务等 客户账号查询优化 账号查询充值优化
---
web/web/GwSp.ashx | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index 0a168f7..1c5f53f 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -312,10 +312,10 @@
string apId = "0";
if (this.IsInt(string1))
apId = string1;
- if (string.IsNullOrEmpty(clientId) && !string.IsNullOrEmpty(string4))
- clientId = new GwClientDao().GetClientName(string4).ClientID;
+ //if (string.IsNullOrEmpty(clientId) && !string.IsNullOrEmpty(string4))
+ // clientId = new GwClientDao().GetClientName(string4).ClientID;
//鍔犺浇璐﹀彿鍒楄〃淇℃伅
- List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, int1, string3, int2, int4, int3, int5.ToString(),out recordCount, productId);
+ List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, string4, int1, string3, int2, int4, int3, int5.ToString(),out recordCount, productId);
string str1 = "";
if (list != null && list.Count > 0)
{
@@ -571,7 +571,8 @@
o.AccessCode = context.GetString("AccessCode");
o.Priority = context.GetInt("Priority", 0);
o.Price = Math.Max((int)(context.GetDecimal("Price", new Decimal(4, 0, 0, false, (byte)2)) * new Decimal(1000)), 1);
- o.ChargeType = context.GetInt("ChargeType", 0);
+ //o.ChargeType = context.GetInt("ChargeType", 0);
+ o.IsAutoReturn = context.GetInt("IsAutoReturn", 0);
o.Threshold = Math.Max(context.GetInt("Threshold", 10), 10);
o.MaxConnCount = context.GetInt("MaxConnCount", 1);
o.Remark = context.GetString("Remark");
@@ -651,8 +652,11 @@
cTPattern.SpID = context.GetString("SpID");
cTPattern.Enabled = context.GetInt("enabled");
cTPattern.Pattern = context.GetString("patternContent");
- if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
- throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楋紒");
+ string pattern = @"^[A-Za-z0-9]+$"; //鍒ゆ柇鏄瓧绗︽垨鏁板瓧
+ //if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
+ // throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楋紒");
+ if (!Regex.IsMatch(o.SpID, "^[A-Za-z0-9]{6}$"))
+ throw new Exception("璐﹀彿蹇呴』涓�6浣嶅瓧绗︽垨鏁板瓧锛�");
if (o.AccessCodeMode == 1)
{
if (o.DiverterID != 0)
@@ -692,7 +696,8 @@
o.AccessCode = context.GetString("AccessCode");
o.Priority = context.GetInt("Priority", 0);
o.Price = Math.Max((int)(context.GetDecimal("Price", new Decimal(4, 0, 0, false, (byte)2)) * new Decimal(1000)), 1);
- o.ChargeType = context.GetInt("ChargeType", 0);
+ //o.ChargeType = context.GetInt("ChargeType", 0);
+ o.IsAutoReturn = context.GetInt("IsAutoReturn", 0);
o.Threshold = Math.Max(context.GetInt("Threshold", 10), 10);
o.MaxConnCount = context.GetInt("MaxConnCount", 1);
o.Remark = context.GetString("Remark");
--
Gitblit v1.9.1