From 02fe59564a19996974a9d36be6ab61f29ee4c004 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 02 十一月 2022 17:06:36 +0800
Subject: [PATCH] 修复好几个bug

---
 web/web/GwSp.ashx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index 864549e..94d6dc6 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -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","");
 
         if (context.GetInt("RouterType", 1) == 1)
         {
@@ -731,7 +733,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);
@@ -891,7 +893,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