From 2f74eb23c0d2d4a246bc612c5c34bdfa8dea5603 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期五, 11 十一月 2022 09:25:02 +0800
Subject: [PATCH] 修改账号产品关联的bug 修改产品不显示的bug
---
web/web/GwSp.ashx | 78 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index 864549e..feafff4 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -343,12 +343,12 @@
if (gwSp.RouterType == 1)
{
str1 += "<td rowspan=\"1\"><span class='label label-primary'>閫氶亾</span>";
- str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetOpName(gwSp.CMOPID), (object)this.GetOpName(gwSp.CTOPID), (object)this.GetOpName(gwSp.UNOPID));
+ str1 += string.Format("<div style='margin-top:10px;'>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetOpName(gwSp.CMOPID), (object)this.GetOpName(gwSp.CTOPID), (object)this.GetOpName(gwSp.UNOPID));
}
else if (gwSp.RouterType == 3)
{
str1 += "<td rowspan=\"1\"><span class='label label-success'>閫氶亾缁�</span>";
- str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(gwSp.CMGroupID), (object)this.GetGroupName(gwSp.CTGroupID), (object)this.GetGroupName(gwSp.CUGroupID));
+ str1 += string.Format("<div style='margin-top:10px;'>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(gwSp.CMGroupID), (object)this.GetGroupName(gwSp.CTGroupID), (object)this.GetGroupName(gwSp.CUGroupID));
}
/**
if (gwSp.RESEND_STATUS == 1)
@@ -373,7 +373,7 @@
str1 = str1 + (object)"<td>" + (object)(gwSp.BasicNum + (long)gwSp.GivingNum) + "鏉� / " + (object)(gwSp.BasicNum) + "鏉� / " + (object)(gwSp.GivingNum) + "鏉�";
//add: yangzh by 2022-03-14 end
if (gwSp.BalanceThreshold > 0 && !string.IsNullOrEmpty(gwSp.AlarmMobile))
- str1 = str1 + (object)"<div class=\"text-danger\">" + (object)(gwSp.BalanceThreshold / 1000) + "鍏�(" + gwSp.AlarmMobile + ")</div>";
+ str1 = str1 + "<div class=\"text-danger\">" + gwSp.BalanceThreshold + "鏉�(" + gwSp.AlarmMobile + ")</div>";
str1 += "</td>";
/**
str1 = str1 + "<td>" + this.GetDiverterName(gwSp.DiverterID);
@@ -385,20 +385,20 @@
str1 = str1 + "<div class=\"text-muted\">" + (gwSp.ExtnoExtensionMode == 1 ? "绂佹瀹㈡埛鎵╁睍" : "鍏佽瀹㈡埛鎵╁睍") + "</div>";
str1 = str1 + "<div>" + (gwSp.AccessCodeMode == 1 ? "閫氶亾鐩磋繛妯″紡" : "铏氭嫙鎺ュ叆妯″紡") + "</div></td>";
**/
- str1 = str1 + "<td>" + this.FormatIpHtml(gwSp.ClientIp) + "</td>";
+ //str1 = str1 + "<td>" + this.FormatIpHtml(gwSp.ClientIp) + "</td>";//鍘绘帀IP
// str1 = str1 + "<td>" + this.GetStatusText(gwSp.Status);
str1 = str1 + "<td>" + this.GetStatusText(gwSp.Status, gwSp.SpID);
str1 += "</td>";
str1 += "<td>" + gwSp.CreateTime + "</td>";
- str1 += "<td rowspan=\"1\" class=\"text-center\">";
+ str1 += "<td rowspan=\"1\" class=\"text-center\" >";
if (context.HasRight("3023"))
- str1 += string.Format(" <a class=\"btn btn-primary btn-xs action-modal-edit\" data-id=\"{0}\"><i class=\"fa fa-edit\"></i> 缂栬緫</a>", (object)gwSp.SpID);
+ str1 += string.Format(" <a style='margin-top:5px;' class=\"btn btn-primary btn-xs action-modal-edit\" data-id=\"{0}\"><i class=\"fa fa-edit\"></i> 缂栬緫</a>", (object)gwSp.SpID);
//str1 += string.Format(" <a class=\"btn-block btn btn-success btn-xs action-create-summary\" data-id=\"{0}\">璐﹀彿鎽樿</a>", (object)gwSp.SpID);
- str1 = gwSp.Status != 0 ? str1 + string.Format(" <a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"0\" class=\"action-updateStatus btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a><br> ", (object) gwSp.SpID ) : str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"1\" class=\"action-updateStatus btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a><br> ", (object) gwSp.SpID );
+ str1 = gwSp.Status != 0 ? str1 + string.Format(" <a style='margin-top:5px;' href=\"javascript:;\" data-spid=\"{0}\" data-status=\"0\" class=\"action-updateStatus btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a><br> ", (object) gwSp.SpID ) : str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"1\" class=\"action-updateStatus btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a><br> ", (object) gwSp.SpID );
if (context.HasRight("3021"))
- str1 += string.Format(" <a class=\"btn btn-xs btn-success action-modal-charge\" data-id=\"{0}\"><i class=\"fa fa-cny\"></i> 鍏呭��</a>", (object)gwSp.SpID);
+ str1 += string.Format(" <a style='margin-top:5px;' class=\"btn btn-xs btn-success action-modal-charge\" data-id=\"{0}\"><i class=\"fa fa-cny\"></i> 鍏呭��</a>", (object)gwSp.SpID);
if (context.HasRight("3022"))
- str1 += string.Format(" <a class=\" btn btn-success btn-xs action-modal-Acctunchargelog\" data-id=\"{0}\"><i class=\"fa fa-list-alt\"></i> 鍏呭�兼棩蹇�</a>", (object)gwSp.SpID);
+ str1 += string.Format(" <a style='margin-top:5px;' class=\" btn btn-success btn-xs action-modal-Acctunchargelog\" data-id=\"{0}\"><i class=\"fa fa-list-alt\"></i> 鍏呭�兼棩蹇�</a>", (object)gwSp.SpID);
//if (context.HasRight("3024"))
// str1 += string.Format(" <a class=\"btn-block btn btn-xs btn-default action-delete\" data-id=\"{0}\"><i class=\"fa fa-trash\"></i> 鍒犻櫎</a>", (object)gwSp.SpID);
@@ -593,7 +593,7 @@
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);
@@ -619,6 +619,8 @@
o.CumulativeAuditNum = context.GetInt("CumulativeAuditNum");
o.CumulativeAuditTime = context.GetInt("CumulativeAuditTime");
o.IsSyncChildSendAudit = context.GetInt("IsSyncChildSendAudit");
+
+ o.ProductId = context.GetString("ProductId","");//浜у搧ID
if (context.GetInt("RouterType", 1) == 1)
{
@@ -661,8 +663,8 @@
o.CUGroupID = 0;
o.CTGroupID = 0;
}
- o.BalanceThreshold = context.GetInt("BalanceThreshold") * 1000;
- o.AlarmMobile = context.GetString("AlarmMobile");
+ o.BalanceThreshold = context.GetInt("BalanceThreshold");//鍛婅鏉℃暟
+ o.AlarmMobile = context.GetString("AlarmMobile");//鍛婅鍙风爜
o.ForceSignFlag = context.GetInt("ForceSignFlag");
o.ForceSign = context.GetString("ForceSign");
o.SignatureMode = context.GetInt("signatureMode");
@@ -713,6 +715,27 @@
throw new Exception("璐﹀彿瀵嗙爜涓嶈兘涓虹┖");
this._Dao.Update(o);
this._Dao.UpdatePattern(cTPattern, context.OperatorID); //鏇存柊璐﹀彿閲岄潰鐨勬姤澶囧唴瀹�
+
+ //鍚屾椂淇敼瀹㈡埛-浜у搧琛ㄨ褰曪紝鑻ュ瓨鍦紝鍒欐洿鏂帮紝鍚﹀垯鏂板缓
+ bool flag = GwClientProductDao.Instance.FindBySp(o.SpID);
+ GwClientProduct clientProduct = new GwClientProduct()
+ {
+ ClientId = o.ClientID,
+ ProductId = o.ProductId,
+ SpId = o.SpID,
+ ActivateStatus = 1,
+ Id=Guid.NewGuid().ToString()
+ };
+ if (flag)//瀛樺湪,鏇存柊
+ {
+ GwClientProductDao.Instance.Update(clientProduct);
+ }
+ else
+ {
+
+ GwClientProductDao.Instance.Add(clientProduct);
+ }
+
return new JsonPageResult(true, (object)("璐︽埛" + o.SpID + "淇敼鎴愬姛锛�"));
}
@@ -731,7 +754,7 @@
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);
@@ -815,6 +838,33 @@
throw new Exception("SPID宸茬粡瀛樺湪锛岃閲嶆柊濉啓锛�");
this._Dao.Add(o);
this._Dao.UpdatePattern(string1, @int, string2, context.OperatorID);//娣诲姞璐﹀彿鐨勬椂鍊欓厤缃姤澶�
+
+
+ //濡傛灉閫夋嫨浜嗕骇鍝侊紝琛ㄧず鍒涘缓鐨勬椂鍊欏氨婵�娲汇�傚悗鍙板垱寤烘棤璧犻��
+ if (!string.IsNullOrEmpty(o.ProductId))
+ {
+ //鍚屾椂淇敼瀹㈡埛-浜у搧琛ㄨ褰曪紝鑻ュ瓨鍦紝鍒欐洿鏂帮紝鍚﹀垯鏂板缓
+ bool flag = GwClientProductDao.Instance.FindBySp(o.SpID);
+ GwClientProduct clientProduct = new GwClientProduct()
+ {
+ ClientId = o.ClientID,
+ ProductId = o.ProductId,
+ SpId = o.SpID,
+ ActivateStatus = 1,
+ Id = Guid.NewGuid().ToString()
+ };
+ if (flag)//瀛樺湪,鏇存柊
+ {
+ GwClientProductDao.Instance.Update(clientProduct);
+ }
+ else
+ {
+
+ GwClientProductDao.Instance.Add(clientProduct);
+ }
+ }
+
+
return new JsonPageResult(true, (object)("璐︽埛" + o.SpID + "娣诲姞鎴愬姛锛�"));
}
@@ -891,7 +941,7 @@
int cuGroupId = context.GetInt("cuGroupID");
int ctGroupId = context.GetInt("ctGroupID");
- if (cmOpId == 0 || cuOpId == 0 || ctOpId == 0||cmGroupId ==0 ||cuGroupId==0||ctGroupId==0)
+ if (cmOpId == 0 && cuOpId == 0 && ctOpId == 0 && cmGroupId ==0 && cuGroupId==0 &&ctGroupId==0)
{
throw new ArgumentException("閫夐」涓嶅厑璁稿叏閮ㄤ负绌猴紝璇疯嚦灏戦�夋嫨涓�椤癸紒");
}
--
Gitblit v1.9.1