From f2fa318161407b936f70aa3b918dd38f24ea9a88 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 13 六月 2022 07:08:28 +0800
Subject: [PATCH] 数据字典表相关功能 系统账号管理优化 订单管理 API账号管理 客户信息管理

---
 web/Dao/GwSpDao.cs |  103 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/web/Dao/GwSpDao.cs b/web/Dao/GwSpDao.cs
index 7b57d1a..aa296c8 100644
--- a/web/Dao/GwSpDao.cs
+++ b/web/Dao/GwSpDao.cs
@@ -208,7 +208,7 @@
       return OracleHelper.Execute(PubConstant.doOracleSql(100000, stringBuilder.ToString()).ToString(), OracleHelper.Connection, oracleParameterArray);
     }
 
-    public List<GwSp> LoadInfoList(string spId, string apId, string clientId)
+    public List<GwSp> LoadInfoList(string spId, string apId, string clientId, string permissionsSQL)
     {
       List<GwSp> list1 = new List<GwSp>();
       StringBuilder stringBuilder = new StringBuilder();
@@ -232,7 +232,11 @@
         list2.Add(new OracleParameter(":ClientID", (object) clientId));
         stringBuilder.Append(" and CLIENT_ID=:ClientID");
       }
-      stringBuilder.Append(" order by SP_ID DESC");
+
+            //瀹㈡埛鏉冮檺SQL鑴氭湰
+            stringBuilder.Append(permissionsSQL);
+
+            stringBuilder.Append(" order by SP_ID DESC");
       using (OracleDataReader reader = OracleHelper.ExecuteReader("select * " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
       {
         while (((DbDataReader) reader).Read())
@@ -245,7 +249,8 @@
       return list1;
     }
 
-        public List<GwSp> LoadInfoList(string spId, string apId, string clientId, int routerType, string opID, int chargeType, int pageIndex, int pageSize, string resendStatus, out int recordCount, string productId )
+        public List<GwSp> LoadInfoList(string spId, string apId, string clientId, string clientName, int routerType, string opID, int chargeType, int pageIndex, int pageSize
+            , string resendStatus, string productId, string permissionsSQL, out int recordCount )
         {
             List<GwSp> list1 = new List<GwSp>();
             recordCount = 0;
@@ -257,13 +262,19 @@
             List<OracleParameter> list2 = new List<OracleParameter>();
             if (spId != null && spId != "")
             {
-                list2.Add(new OracleParameter(":SpID", (object)spId));
-                stringBuilder.Append(" and SP_ID=:SpID");
+                //list2.Add(new OracleParameter(":SpID", (object)spId));
+                //stringBuilder.Append(" and SP_ID=:SpID");
+                list2.Add(new OracleParameter(":SpID", (object)('%' + spId + '%')));
+                stringBuilder.Append(" and SP_ID like :SpID");
             }
             if (apId != null && apId != "")
             {
-                list2.Add(new OracleParameter(":ApID", (object)apId));
-                stringBuilder.Append(" and AP_ID=:ApID");
+                //list2.Add(new OracleParameter(":ApID", (object)apId));
+                //stringBuilder.Append(" and AP_ID=:ApID");
+
+
+                list2.Add(new OracleParameter(":ApID", (object)('%' + apId + '%')) );
+                stringBuilder.Append(" and AP_ID like :ApID");
             }
             if (resendStatus != null && resendStatus != "" &&int.Parse( resendStatus)!=3)
             {
@@ -272,13 +283,25 @@
             }
             if (clientId != null && clientId != "")
             {
-                list2.Add(new OracleParameter(":ClientID", (object)clientId));
-                stringBuilder.Append(" and CLIENT_ID=:ClientID");
+                //list2.Add(new OracleParameter(":ClientID", (object)clientId));
+                //stringBuilder.Append(" and CLIENT_ID=:ClientID");
+                list2.Add(new OracleParameter(":ClientID", (object)('%' + clientId + '%')));
+                stringBuilder.Append(" and CLIENT_ID like :ClientID");
             }
+            if (clientName != null && clientName != "")
+            {
+                stringBuilder.Append(" and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE CLIENT_NAME like '%" + clientName + "%' )");
+            }
+            /**
             if (chargeType > 0)
             {
                 list2.Add(new OracleParameter(":ChargeType", (object)chargeType));
                 stringBuilder.Append(" and CHARGE_TYPE=:ChargeType");
+            }
+            **/
+            if (chargeType > 0)
+            {
+                stringBuilder.Append(" and CHARGE_TYPE IN (SELECT CHARGE_TYPE FROM GW_CLIENT WHERE CHARGE_TYPE = " + chargeType + " )");
             }
             if (routerType > 0)
             {
@@ -308,6 +331,10 @@
                 list2.Add(new OracleParameter(":ProductId", (object)productId));
                 stringBuilder.Append(" and Product_Id=:ProductId");
             }
+
+            //瀹㈡埛鏉冮檺SQL鑴氭湰
+            stringBuilder.Append(permissionsSQL);
+
             stringBuilder.Append(" order by ID DESC");
             using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
             {
@@ -429,16 +456,23 @@
                 ) > 0;
             **/
 
-            return OracleHelper.ExecuteSql("UPDATE GW_SP SET AP_ID=:APID,COMBINATION_MODE=:COMBINATION_MODE,CLIENT_ID=:CLIENTID,STRATEGY_ID=:STRATEGYID,PASSWORD=:PASSWORD,\r\nCLIENT_IP=:CLIENTIP,CLIENT_PORT=:CLIENTPORT,ACCESS_CODE=:ACCESSCODE,\r\nPRIORITY=:PRIORITY,PRICE=:PRICE,CHARGE_TYPE=:CHARGETYPE,\r\nTHRESHOLD=:THRESHOLD,MAX_CONN_COUNT=:MAXCONNCOUNT,REMARK=:REMARK,\r\nTIME_PERMITTING=:TIME_PERMITTING,AUDITING_MODE=:AUDITINGMODE,\r\nDEDUCT_PERCENT=:DEDUCTPERCENT,\r\nCM_OP_ID=:CM_OP_ID,CT_OP_ID=:CT_OP_ID,UN_OP_ID=:UN_OP_ID,\r\nDEFISHING_TIMEOUT = :DEFISHING_TIMEOUT,DEFISHING_THRESHOLD =:DEFISHING_THRESHOLD,\r\nREJECT_IF_FORBIDDEN =:REJECT_IF_FORBIDDEN,\r\nREFUND_IF_UNDELIVERED =:REFUND_IF_UNDELIVERED,\r\nROUTER_TYPE=:ROUTER_TYPE,STATUS=:STATUS,ACCESSCODE_MODE=:ACCESSCODE_MODE,\r\nEXTNOEXTENSION_MODE=:EXTNOEXTENSION_MODE,DEFISHING_OP_ID =:DEFISHING_OP_ID,\r\nMODIFY_TIME=SYSDATE,FEE_SHORT_LENGTH=:FEE_SHORT_LENGTH,FEE_LONG_LENGTH=:FEE_LONG_LENGTH,\r\nBLACK_MODE=:BLACK_MODE,\r\nDIVERTER_ID=:DIVERTER_ID,\r\nMCPM=:MCPM,\r\nMC_EXPRESSION=:MC_EXPRESSION,\r\nCM_EXT_PARAMS=:CM_EXT_PARAMS,\r\nCT_EXT_PARAMS=:CT_EXT_PARAMS,\r\nCU_EXT_PARAMS=:CU_EXT_PARAMS,\r\nCM_GROUP_ID=:CM_GROUP_ID,\r\nCU_GROUP_ID=:CU_GROUP_ID,\r\nCT_GROUP_ID=:CT_GROUP_ID ,\r\nBALANCE_THRESHOLD = :BALANCE_THRESHOLD,\r\nALARM_MOBILE = :ALARM_MOBILE,\r\nFORCE_SIGN_FLAG = :FORCE_SIGN_FLAG,\r\nFORCE_SIGN = :FORCE_SIGN,\r\nSIGNATURE_MODE=:SIGNATURE_MODE,\r\nSIGNATURES=:SIGNATURES\r\n,VerCodeMode=:VerCodeMode \r\n,ProvincialNetworkMode=:ProvincialNetworkMode \r\n,RESEND_STATUS=:RESEND_STATUS \r\n,RESEND_CM_GROUPID=:RESEND_CM_GROUPID \r\n,RESEND_CU_GROUPID=:RESEND_CU_GROUPID \r\n,RESEND_CT_GROUPID=:RESEND_CT_GROUPID,TRANSFERFLAG=:TRANSFERFLAG WHERE SP_ID=:SPID", OracleHelper.Connection, new OracleParameter(":APID", (object)o.ApID), new OracleParameter(":COMBINATION_MODE", (object)o.CombinationMode), new OracleParameter(":CLIENTID", (object)o.ClientID), new OracleParameter(":STRATEGYID", (object)o.StrategyID), new OracleParameter(":PASSWORD", (object)o.Password), new OracleParameter(":CLIENTIP", (object)o.ClientIp), new OracleParameter(":CLIENTPORT", (object)o.ClientPort), new OracleParameter(":ACCESSCODE", (object)o.AccessCode), new OracleParameter(":PRIORITY", (object)o.Priority), new OracleParameter(":PRICE", (object)o.Price), new OracleParameter(":CHARGETYPE", (object)o.ChargeType), new OracleParameter(":THRESHOLD", (object)o.Threshold), new OracleParameter(":MAXCONNCOUNT", (object)o.MaxConnCount), new OracleParameter(":REMARK", (object)o.Remark), new OracleParameter(":TIME_PERMITTING", (object)o.TimePermitting), new OracleParameter(":AUDITINGMODE", (object)o.AuditingMode), new OracleParameter(":DEDUCTPERCENT", (object)o.DeductPercent), new OracleParameter(":SPID", (object)o.SpID), new OracleParameter(":CM_OP_ID", (object)o.CMOPID), new OracleParameter(":CT_OP_ID", (object)o.CTOPID), new OracleParameter(":UN_OP_ID", (object)o.UNOPID), new OracleParameter(":DEFISHING_TIMEOUT", (object)o.DefishingTimeout), new OracleParameter(":DEFISHING_THRESHOLD", (object)o.DefishingThreshold), new OracleParameter(":REJECT_IF_FORBIDDEN", (object)o.RejectIfForbidden), new OracleParameter(":REFUND_IF_UNDELIVERED", (object)o.RefundIfUndelivered), new OracleParameter(":STATUS", (object)o.Status), new OracleParameter(":ACCESSCODE_MODE", (object)o.AccessCodeMode), new OracleParameter(":EXTNOEXTENSION_MODE", (object)o.ExtnoExtensionMode), new OracleParameter(":DEFISHING_OP_ID", (object)o.DefishingOPID), new OracleParameter(":ROUTER_TYPE", (object)o.RouterType), new OracleParameter(":CM_EXT_PARAMS", (object)o.CMextparms), new OracleParameter(":CT_EXT_PARAMS", (object)o.CTextparams), new OracleParameter(":CU_EXT_PARAMS", (object)o.CUextparams), new OracleParameter(":FEE_SHORT_LENGTH", (object)o.FeeShortLength), new OracleParameter(":FEE_LONG_LENGTH", (object)o.FeeLongLength), new OracleParameter(":BLACK_MODE", (object)o.BlackMode), new OracleParameter(":DIVERTER_ID", (object)o.DiverterID), new OracleParameter(":MCPM", (object)o.MCPM), new OracleParameter(":MC_EXPRESSION", (object)o.McExpression), new OracleParameter(":CM_GROUP_ID", (object)o.CMGroupID), new OracleParameter(":CU_GROUP_ID", (object)o.CUGroupID), new OracleParameter(":CT_GROUP_ID", (object)o.CTGroupID), new OracleParameter(":BALANCE_THRESHOLD", (object)o.BalanceThreshold), new OracleParameter(":ALARM_MOBILE", (object)o.AlarmMobile), new OracleParameter(":FORCE_SIGN_FLAG", (object)o.ForceSignFlag), new OracleParameter(":FORCE_SIGN", (object)o.ForceSign), new OracleParameter(":SIGNATURE_MODE", (object)o.SignatureMode), new OracleParameter(":SIGNATURES", (object)o.Signatures), new OracleParameter(":VerCodeMode", (object)o.VerCodeMode), new OracleParameter(":ProvincialNetworkMode", (object)o.ProvincialNetworkMode), new OracleParameter(":RESEND_STATUS", (object)o.RESEND_STATUS), new OracleParameter(":RESEND_CM_GROUPID", (object)o.RESEND_CM_GROUPID), new OracleParameter(":RESEND_CU_GROUPID", (object)o.RESEND_CU_GROUPID), new OracleParameter(":RESEND_CT_GROUPID", (object)o.RESEND_CT_GROUPID), new OracleParameter(":TRANSFERFLAG", (object)o.TransferFlag)) > 0;
+            return OracleHelper.ExecuteSql("UPDATE GW_SP SET AP_ID=:APID,COMBINATION_MODE=:COMBINATION_MODE,CLIENT_ID=:CLIENTID,STRATEGY_ID=:STRATEGYID,PASSWORD=:PASSWORD,\r\nCLIENT_IP=:CLIENTIP,CLIENT_PORT=:CLIENTPORT,ACCESS_CODE=:ACCESSCODE,\r\nPRIORITY=:PRIORITY,PRICE=:PRICE,CHARGE_TYPE=:CHARGETYPE,IS_AUTO_RETURN=:IS_AUTO_RETURN,THRESHOLD=:THRESHOLD,MAX_CONN_COUNT=:MAXCONNCOUNT,REMARK=:REMARK,\r\nTIME_PERMITTING=:TIME_PERMITTING,AUDITING_MODE=:AUDITINGMODE,\r\nDEDUCT_PERCENT=:DEDUCTPERCENT,\r\nCM_OP_ID=:CM_OP_ID,CT_OP_ID=:CT_OP_ID,UN_OP_ID=:UN_OP_ID,\r\nDEFISHING_TIMEOUT = :DEFISHING_TIMEOUT,DEFISHING_THRESHOLD =:DEFISHING_THRESHOLD,\r\nREJECT_IF_FORBIDDEN =:REJECT_IF_FORBIDDEN,\r\nREFUND_IF_UNDELIVERED =:REFUND_IF_UNDELIVERED,\r\nROUTER_TYPE=:ROUTER_TYPE,STATUS=:STATUS,ACCESSCODE_MODE=:ACCESSCODE_MODE,\r\nEXTNOEXTENSION_MODE=:EXTNOEXTENSION_MODE,DEFISHING_OP_ID =:DEFISHING_OP_ID,\r\nMODIFY_TIME=SYSDATE,FEE_SHORT_LENGTH=:FEE_SHORT_LENGTH,FEE_LONG_LENGTH=:FEE_LONG_LENGTH,\r\nBLACK_MODE=:BLACK_MODE,\r\nDIVERTER_ID=:DIVERTER_ID,\r\nMCPM=:MCPM,\r\nMC_EXPRESSION=:MC_EXPRESSION,\r\nCM_EXT_PARAMS=:CM_EXT_PARAMS,\r\nCT_EXT_PARAMS=:CT_EXT_PARAMS,\r\nCU_EXT_PARAMS=:CU_EXT_PARAMS,\r\nCM_GROUP_ID=:CM_GROUP_ID,\r\nCU_GROUP_ID=:CU_GROUP_ID,\r\nCT_GROUP_ID=:CT_GROUP_ID ,\r\nBALANCE_THRESHOLD = :BALANCE_THRESHOLD,\r\nALARM_MOBILE = :ALARM_MOBILE,\r\nFORCE_SIGN_FLAG = :FORCE_SIGN_FLAG,\r\nFORCE_SIGN = :FORCE_SIGN,\r\nSIGNATURE_MODE=:SIGNATURE_MODE,\r\nSIGNATURES=:SIGNATURES\r\n,VerCodeMode=:VerCodeMode \r\n,ProvincialNetworkMode=:ProvincialNetworkMode \r\n,RESEND_STATUS=:RESEND_STATUS \r\n,RESEND_CM_GROUPID=:RESEND_CM_GROUPID \r\n,RESEND_CU_GROUPID=:RESEND_CU_GROUPID \r\n,RESEND_CT_GROUPID=:RESEND_CT_GROUPID,TRANSFERFLAG=:TRANSFERFLAG, SUB_PACKAGE_NUM=:SUB_PACKAGE_NUM, SINGLE_SUBMIT_MIN_RESTRICT=:SINGLE_SUBMIT_MIN_RESTRICT, IS_DISPALY_PRICE=:IS_DISPALY_PRICE, DEDUCTION_MODE=:DEDUCTION_MODE, IS_SEND_AUDIT=:IS_SEND_AUDIT, BELOW_NUM_AUDIT=:BELOW_NUM_AUDIT, ABOVE_NUM_AUDIT=:ABOVE_NUM_AUDIT, IS_CUMULATIVE_AUDIT=:IS_CUMULATIVE_AUDIT, CUMULATIVE_AUDIT_NUM=:CUMULATIVE_AUDIT_NUM, CUMULATIVE_AUDIT_TIME=:CUMULATIVE_AUDIT_TIME, IS_SYNC_CHILD_SEND_AUDIT=:IS_SYNC_CHILD_SEND_AUDIT WHERE SP_ID=:SPID", OracleHelper.Connection, new OracleParameter(":APID", (object)o.ApID), new OracleParameter(":COMBINATION_MODE", (object)o.CombinationMode), new OracleParameter(":CLIENTID", (object)o.ClientID), new OracleParameter(":STRATEGYID", (object)o.StrategyID), new OracleParameter(":PASSWORD", (object)o.Password), new OracleParameter(":CLIENTIP", (object)o.ClientIp), new OracleParameter(":CLIENTPORT", (object)o.ClientPort), new OracleParameter(":ACCESSCODE", (object)o.AccessCode), new OracleParameter(":PRIORITY", (object)o.Priority), new OracleParameter(":PRICE", (object)o.Price), new OracleParameter(":CHARGETYPE", (object)o.ChargeType), new OracleParameter(":IS_AUTO_RETURN", (object)o.IsAutoReturn), new OracleParameter(":THRESHOLD", (object)o.Threshold), new OracleParameter(":MAXCONNCOUNT", (object)o.MaxConnCount), new OracleParameter(":REMARK", (object)o.Remark), new OracleParameter(":TIME_PERMITTING", (object)o.TimePermitting), new OracleParameter(":AUDITINGMODE", (object)o.AuditingMode), new OracleParameter(":DEDUCTPERCENT", (object)o.DeductPercent), new OracleParameter(":SPID", (object)o.SpID), new OracleParameter(":CM_OP_ID", (object)o.CMOPID), new OracleParameter(":CT_OP_ID", (object)o.CTOPID), new OracleParameter(":UN_OP_ID", (object)o.UNOPID), new OracleParameter(":DEFISHING_TIMEOUT", (object)o.DefishingTimeout), new OracleParameter(":DEFISHING_THRESHOLD", (object)o.DefishingThreshold), new OracleParameter(":REJECT_IF_FORBIDDEN", (object)o.RejectIfForbidden), new OracleParameter(":REFUND_IF_UNDELIVERED", (object)o.RefundIfUndelivered), new OracleParameter(":STATUS", (object)o.Status), new OracleParameter(":ACCESSCODE_MODE", (object)o.AccessCodeMode), new OracleParameter(":EXTNOEXTENSION_MODE", (object)o.ExtnoExtensionMode), new OracleParameter(":DEFISHING_OP_ID", (object)o.DefishingOPID), new OracleParameter(":ROUTER_TYPE", (object)o.RouterType), new OracleParameter(":CM_EXT_PARAMS", (object)o.CMextparms), new OracleParameter(":CT_EXT_PARAMS", (object)o.CTextparams), new OracleParameter(":CU_EXT_PARAMS", (object)o.CUextparams), new OracleParameter(":FEE_SHORT_LENGTH", (object)o.FeeShortLength), new OracleParameter(":FEE_LONG_LENGTH", (object)o.FeeLongLength), new OracleParameter(":BLACK_MODE", (object)o.BlackMode), new OracleParameter(":DIVERTER_ID", (object)o.DiverterID), new OracleParameter(":MCPM", (object)o.MCPM), new OracleParameter(":MC_EXPRESSION", (object)o.McExpression), new OracleParameter(":CM_GROUP_ID", (object)o.CMGroupID), new OracleParameter(":CU_GROUP_ID", (object)o.CUGroupID), new OracleParameter(":CT_GROUP_ID", (object)o.CTGroupID), new OracleParameter(":BALANCE_THRESHOLD", (object)o.BalanceThreshold), new OracleParameter(":ALARM_MOBILE", (object)o.AlarmMobile), new OracleParameter(":FORCE_SIGN_FLAG", (object)o.ForceSignFlag), new OracleParameter(":FORCE_SIGN", (object)o.ForceSign), new OracleParameter(":SIGNATURE_MODE", (object)o.SignatureMode), new OracleParameter(":SIGNATURES", (object)o.Signatures), new OracleParameter(":VerCodeMode", (object)o.VerCodeMode), new OracleParameter(":ProvincialNetworkMode", (object)o.ProvincialNetworkMode), new OracleParameter(":RESEND_STATUS", (object)o.RESEND_STATUS), new OracleParameter(":RESEND_CM_GROUPID", (object)o.RESEND_CM_GROUPID), new OracleParameter(":RESEND_CU_GROUPID", (object)o.RESEND_CU_GROUPID), new OracleParameter(":RESEND_CT_GROUPID", (object)o.RESEND_CT_GROUPID), new OracleParameter(":TRANSFERFLAG", (object)o.TransferFlag), new OracleParameter(":SUB_PACKAGE_NUM", (object)o.SubPackageNum), new OracleParameter(":SINGLE_SUBMIT_MIN_RESTRICT", (object)o.SingleSubmitMinRestrict), new OracleParameter(":IS_DISPALY_PRICE", (object)o.IsDispalyPrice), new OracleParameter(":DEDUCTION_MODE", (object)o.DeductionMode), new OracleParameter(":IS_SEND_AUDIT", (object)o.IsSendAudit), new OracleParameter(":BELOW_NUM_AUDIT", (object)o.BelowNumAudit), new OracleParameter(":ABOVE_NUM_AUDIT", (object)o.AboveNumAudit), new OracleParameter(":IS_CUMULATIVE_AUDIT", (object)o.IsCumulativeAudit), new OracleParameter(":CUMULATIVE_AUDIT_NUM", (object)o.CumulativeAuditNum), new OracleParameter(":CUMULATIVE_AUDIT_TIME", (object)o.CumulativeAuditTime), new OracleParameter(":IS_SYNC_CHILD_SEND_AUDIT", (object)o.IsSyncChildSendAudit) ) > 0;
         }
 
-        //鏍规嵁璁㈠崟鏇存柊浣欓
-        public bool UpdateBalanceByOrder(int Balance,int basicNum, int givingNum, string spid)
+        //鏇存柊璐﹀彿鍏呭�兼暟鎹�
+        /**
+         * AddBalance:鍏呭�奸噾棰�
+         * AddBasicNum锛氬厖鍊煎熀鏈潯鏁�
+         * AddGivingNum锛氬厖鍊艰禒閫佹潯鏁�
+         * spid锛氳处鍙�
+         * 
+         */
+        public bool UpdateBalanceByOrder(int AddBalance,int AddBasicNum, int AddGivingNum, string spid)
         {
-            return OracleHelper.ExecuteSql("UPDATE GW_SP SET BALANCE=:BALANCE, BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM WHERE SP_ID=:SP_ID", OracleHelper.Connection
-                , new OracleParameter(":BALANCE", (object)Balance)
-                , new OracleParameter(":BASIC_NUM", (object)basicNum)
-                , new OracleParameter(":GIVING_NUM", (object)givingNum)
+            return OracleHelper.ExecuteSql("UPDATE GW_SP SET BALANCE=(BALANCE + :BALANCE), BASIC_NUM=(BASIC_NUM + :BASIC_NUM锛�, GIVING_NUM= (GIVING_NUM + :GIVING_NUM) WHERE SP_ID=:SP_ID", OracleHelper.Connection
+                , new OracleParameter(":BALANCE", (object)AddBalance)
+                , new OracleParameter(":BASIC_NUM", (object)AddBasicNum)
+                , new OracleParameter(":GIVING_NUM", (object)AddGivingNum)
                 , new OracleParameter(":SP_ID", (object)spid)
                 ) > 0;
         }
@@ -462,21 +496,21 @@
 
     public bool Add(GwSp o)
     {
-        return OracleHelper.ExecuteSql("INSERT INTO GW_SP\r\n (\r\n SP_ID,AP_ID,COMBINATION_MODE,CLIENT_ID,STRATEGY_ID,PASSWORD,CLIENT_IP,CLIENT_PORT,ACCESS_CODE,BALANCE,PRIORITY,PRICE,CHARGE_TYPE,THRESHOLD,MAX_CONN_COUNT,CREATE_TIME,REMARK,TIME_PERMITTING,AUDITING_MODE,DEDUCT_PERCENT,CM_OP_ID,CT_OP_ID,UN_OP_ID,DEFISHING_TIMEOUT,DEFISHING_THRESHOLD,REJECT_IF_FORBIDDEN,REJECT_IF_NO_SIGNATURE,REFUND_IF_UNDELIVERED,ROUTER_TYPE,STATUS,ACCESSCODE_MODE,EXTNOEXTENSION_MODE,DEFISHING_OP_ID,MODIFY_TIME,FEE_SHORT_LENGTH,FEE_LONG_LENGTH,BLACK_MODE,DIVERTER_ID,MCPM,MC_EXPRESSION,CM_EXT_PARAMS,CT_EXT_PARAMS,CU_EXT_PARAMS,CM_GROUP_ID,CU_GROUP_ID,CT_GROUP_ID,BALANCE_THRESHOLD,ALARM_MOBILE,FORCE_SIGN_FLAG,FORCE_SIGN,SIGNATURE_MODE,SIGNATURES,VerCodeMode,ProvincialNetworkMode,RESEND_STATUS,RESEND_CM_GROUPID,RESEND_CU_GROUPID,RESEND_CT_GROUPID\r\n )\r\n VALUES\r\n (\r\n :SPID,:APID,:COMBINATION_MODE,:CLIENTID,:STRATEGYID,:PASSWORD,:CLIENTIP,:CLIENTPORT,:ACCESSCODE,:BALANCE,:PRIORITY,:PRICE,:CHARGETYPE,:THRESHOLD,:MAXCONNCOUNT,:CREATETIME,:REMARK,:TIME_PERMITTING,:AUDITINGMODE,:DEDUCTPERCENT,:CM_OP_ID,:CT_OP_ID,:UN_OP_ID,:DEFISHING_TIMEOUT,:DEFISHING_THRESHOLD,:REJECT_IF_FORBIDDEN,:REJECT_IF_NO_SIGNATURE,:REFUND_IF_UNDELIVERED,:ROUTER_TYPE,:STATUS,:ACCESSCODE_MODE,:EXTNOEXTENSION_MODE,:DEFISHING_OP_ID,:MODIFY_TIME,:FEE_SHORT_LENGTH,:FEE_LONG_LENGTH,:BLACK_MODE,:DIVERTER_ID,:MCPM,:MC_EXPRESSION,:CM_EXT_PARAMS,:CT_EXT_PARAMS,:CU_EXT_PARAMS,:CM_GROUP_ID,:CU_GROUP_ID,:CT_GROUP_ID,:BALANCE_THRESHOLD,:ALARM_MOBILE,:FORCE_SIGN_FLAG,:FORCE_SIGN,:SIGNATURE_MODE,:SIGNATURES,:VerCodeMode,:ProvincialNetworkMode,:RESEND_STATUS,:RESEND_CM_GROUPID,:RESEND_CU_GROUPID,:RESEND_CT_GROUPID\r\n            )", OracleHelper.Connection, new OracleParameter(":SPID", (object)o.SpID), new OracleParameter(":APID", (object)o.ApID), new OracleParameter(":COMBINATION_MODE", (object)o.CombinationMode), new OracleParameter(":CLIENTID", (object)o.ClientID), new OracleParameter(":STRATEGYID", (object)o.StrategyID), new OracleParameter(":PASSWORD", (object)o.Password), new OracleParameter(":CLIENTIP", (object)o.ClientIp), new OracleParameter(":CLIENTPORT", (object)o.ClientPort), new OracleParameter(":ACCESSCODE", (object)o.AccessCode), new OracleParameter(":BALANCE", (object)o.Balance), new OracleParameter(":PRIORITY", (object)o.Priority), new OracleParameter(":PRICE", (object)o.Price), new OracleParameter(":CHARGETYPE", (object)o.ChargeType), new OracleParameter(":THRESHOLD", (object)o.Threshold), new OracleParameter(":MAXCONNCOUNT", (object)o.MaxConnCount), new OracleParameter(":CREATETIME", (object)DateTime.Now), new OracleParameter(":REMARK", (object)o.Remark), new OracleParameter(":TIME_PERMITTING", (object)o.TimePermitting), new OracleParameter(":AUDITINGMODE", (object)o.AuditingMode), new OracleParameter(":DEDUCTPERCENT", (object)o.DeductPercent), new OracleParameter(":CM_OP_ID", (object)o.CMOPID), new OracleParameter(":CT_OP_ID", (object)o.CTOPID), new OracleParameter(":UN_OP_ID", (object)o.UNOPID), new OracleParameter(":DEFISHING_TIMEOUT", (object)o.DefishingTimeout), new OracleParameter(":DEFISHING_THRESHOLD", (object)o.DefishingThreshold), new OracleParameter(":REJECT_IF_FORBIDDEN", (object)o.RejectIfForbidden), new OracleParameter(":REJECT_IF_NO_SIGNATURE", (object)o.RejectIfNoSignature), new OracleParameter(":REFUND_IF_UNDELIVERED", (object)o.RefundIfUndelivered), new OracleParameter(":ROUTER_TYPE", (object)o.RouterType), new OracleParameter(":STATUS", (object)o.Status), new OracleParameter(":ACCESSCODE_MODE", (object)o.AccessCodeMode), new OracleParameter(":EXTNOEXTENSION_MODE", (object)o.ExtnoExtensionMode), new OracleParameter(":DEFISHING_OP_ID", (object)o.DefishingOPID), new OracleParameter(":MODIFY_TIME", (object)DateTime.Now), new OracleParameter(":FEE_SHORT_LENGTH", (object)o.FeeShortLength), new OracleParameter(":FEE_LONG_LENGTH", (object)o.FeeLongLength), new OracleParameter(":BLACK_MODE", (object)o.BlackMode), new OracleParameter(":DIVERTER_ID", (object)o.DiverterID), new OracleParameter(":MCPM", (object)o.MCPM), new OracleParameter(":MC_EXPRESSION", (object)o.McExpression), new OracleParameter(":CM_EXT_PARAMS", (object)o.CMextparms), new OracleParameter(":CT_EXT_PARAMS", (object)o.CTextparams), new OracleParameter(":CU_EXT_PARAMS", (object)o.CUextparams), new OracleParameter(":CM_GROUP_ID", (object)o.CMGroupID), new OracleParameter(":CU_GROUP_ID", (object)o.CUGroupID), new OracleParameter(":CT_GROUP_ID", (object)o.CTGroupID), new OracleParameter(":BALANCE_THRESHOLD", (object)o.BalanceThreshold), new OracleParameter(":ALARM_MOBILE", (object)o.AlarmMobile), new OracleParameter(":FORCE_SIGN_FLAG", (object)o.ForceSignFlag), new OracleParameter(":FORCE_SIGN", (object)o.ForceSign), new OracleParameter(":SIGNATURE_MODE", (object)o.SignatureMode), new OracleParameter(":SIGNATURES", (object)o.Signatures), new OracleParameter(":VerCodeMode", (object)o.VerCodeMode), new OracleParameter(":ProvincialNetworkMode",(object)o.ProvincialNetworkMode), new OracleParameter(":RESEND_STATUS", (object)o.RESEND_STATUS), new OracleParameter(":RESEND_CM_GROUPID", (object)o.RESEND_CM_GROUPID), new OracleParameter(":RESEND_CU_GROUPID", (object)o.RESEND_CU_GROUPID), new OracleParameter(":RESEND_CT_GROUPID", (object)o.RESEND_CT_GROUPID)) > 0;
+        return OracleHelper.ExecuteSql("INSERT INTO GW_SP\r\n (\r\n SP_ID,AP_ID,COMBINATION_MODE,CLIENT_ID,STRATEGY_ID,PASSWORD,CLIENT_IP,CLIENT_PORT,ACCESS_CODE,BALANCE,PRIORITY,PRICE,CHARGE_TYPE,IS_AUTO_RETURN,THRESHOLD,MAX_CONN_COUNT,CREATE_TIME,REMARK,TIME_PERMITTING,AUDITING_MODE,DEDUCT_PERCENT,CM_OP_ID,CT_OP_ID,UN_OP_ID,DEFISHING_TIMEOUT,DEFISHING_THRESHOLD,REJECT_IF_FORBIDDEN,REJECT_IF_NO_SIGNATURE,REFUND_IF_UNDELIVERED,ROUTER_TYPE,STATUS,ACCESSCODE_MODE,EXTNOEXTENSION_MODE,DEFISHING_OP_ID,MODIFY_TIME,FEE_SHORT_LENGTH,FEE_LONG_LENGTH,BLACK_MODE,DIVERTER_ID,MCPM,MC_EXPRESSION,CM_EXT_PARAMS,CT_EXT_PARAMS,CU_EXT_PARAMS,CM_GROUP_ID,CU_GROUP_ID,CT_GROUP_ID,BALANCE_THRESHOLD,ALARM_MOBILE,FORCE_SIGN_FLAG,FORCE_SIGN,SIGNATURE_MODE,SIGNATURES,VerCodeMode,ProvincialNetworkMode,RESEND_STATUS,RESEND_CM_GROUPID,RESEND_CU_GROUPID,RESEND_CT_GROUPID, SUB_PACKAGE_NUM, SINGLE_SUBMIT_MIN_RESTRICT, IS_DISPALY_PRICE, DEDUCTION_MODE, IS_SEND_AUDIT, BELOW_NUM_AUDIT, ABOVE_NUM_AUDIT, IS_CUMULATIVE_AUDIT, CUMULATIVE_AUDIT_NUM, CUMULATIVE_AUDIT_TIME, IS_SYNC_CHILD_SEND_AUDIT \r\n )\r\n VALUES\r\n (\r\n :SPID,:APID,:COMBINATION_MODE,:CLIENTID,:STRATEGYID,:PASSWORD,:CLIENTIP,:CLIENTPORT,:ACCESSCODE,:BALANCE,:PRIORITY,:PRICE,:CHARGETYPE,:IS_AUTO_RETURN,:THRESHOLD,:MAXCONNCOUNT,:CREATETIME,:REMARK,:TIME_PERMITTING,:AUDITINGMODE,:DEDUCTPERCENT,:CM_OP_ID,:CT_OP_ID,:UN_OP_ID,:DEFISHING_TIMEOUT,:DEFISHING_THRESHOLD,:REJECT_IF_FORBIDDEN,:REJECT_IF_NO_SIGNATURE,:REFUND_IF_UNDELIVERED,:ROUTER_TYPE,:STATUS,:ACCESSCODE_MODE,:EXTNOEXTENSION_MODE,:DEFISHING_OP_ID,:MODIFY_TIME,:FEE_SHORT_LENGTH,:FEE_LONG_LENGTH,:BLACK_MODE,:DIVERTER_ID,:MCPM,:MC_EXPRESSION,:CM_EXT_PARAMS,:CT_EXT_PARAMS,:CU_EXT_PARAMS,:CM_GROUP_ID,:CU_GROUP_ID,:CT_GROUP_ID,:BALANCE_THRESHOLD,:ALARM_MOBILE,:FORCE_SIGN_FLAG,:FORCE_SIGN,:SIGNATURE_MODE,:SIGNATURES,:VerCodeMode,:ProvincialNetworkMode,:RESEND_STATUS,:RESEND_CM_GROUPID,:RESEND_CU_GROUPID,:RESEND_CT_GROUPID, :SUB_PACKAGE_NUM, :SINGLE_SUBMIT_MIN_RESTRICT, :IS_DISPALY_PRICE, :DEDUCTION_MODE, :IS_SEND_AUDIT, :BELOW_NUM_AUDIT, :ABOVE_NUM_AUDIT, :IS_CUMULATIVE_AUDIT, :CUMULATIVE_AUDIT_NUM, :CUMULATIVE_AUDIT_TIME, :IS_SYNC_CHILD_SEND_AUDIT\r\n            )", OracleHelper.Connection, new OracleParameter(":SPID", (object)o.SpID), new OracleParameter(":APID", (object)o.ApID), new OracleParameter(":COMBINATION_MODE", (object)o.CombinationMode), new OracleParameter(":CLIENTID", (object)o.ClientID), new OracleParameter(":STRATEGYID", (object)o.StrategyID), new OracleParameter(":PASSWORD", (object)o.Password), new OracleParameter(":CLIENTIP", (object)o.ClientIp), new OracleParameter(":CLIENTPORT", (object)o.ClientPort), new OracleParameter(":ACCESSCODE", (object)o.AccessCode), new OracleParameter(":BALANCE", (object)o.Balance), new OracleParameter(":PRIORITY", (object)o.Priority), new OracleParameter(":PRICE", (object)o.Price), new OracleParameter(":CHARGETYPE", (object)o.ChargeType), new OracleParameter(":IS_AUTO_RETURN", (object)o.IsAutoReturn), new OracleParameter(":THRESHOLD", (object)o.Threshold), new OracleParameter(":MAXCONNCOUNT", (object)o.MaxConnCount), new OracleParameter(":CREATETIME", (object)DateTime.Now), new OracleParameter(":REMARK", (object)o.Remark), new OracleParameter(":TIME_PERMITTING", (object)o.TimePermitting), new OracleParameter(":AUDITINGMODE", (object)o.AuditingMode), new OracleParameter(":DEDUCTPERCENT", (object)o.DeductPercent), new OracleParameter(":CM_OP_ID", (object)o.CMOPID), new OracleParameter(":CT_OP_ID", (object)o.CTOPID), new OracleParameter(":UN_OP_ID", (object)o.UNOPID), new OracleParameter(":DEFISHING_TIMEOUT", (object)o.DefishingTimeout), new OracleParameter(":DEFISHING_THRESHOLD", (object)o.DefishingThreshold), new OracleParameter(":REJECT_IF_FORBIDDEN", (object)o.RejectIfForbidden), new OracleParameter(":REJECT_IF_NO_SIGNATURE", (object)o.RejectIfNoSignature), new OracleParameter(":REFUND_IF_UNDELIVERED", (object)o.RefundIfUndelivered), new OracleParameter(":ROUTER_TYPE", (object)o.RouterType), new OracleParameter(":STATUS", (object)o.Status), new OracleParameter(":ACCESSCODE_MODE", (object)o.AccessCodeMode), new OracleParameter(":EXTNOEXTENSION_MODE", (object)o.ExtnoExtensionMode), new OracleParameter(":DEFISHING_OP_ID", (object)o.DefishingOPID), new OracleParameter(":MODIFY_TIME", (object)DateTime.Now), new OracleParameter(":FEE_SHORT_LENGTH", (object)o.FeeShortLength), new OracleParameter(":FEE_LONG_LENGTH", (object)o.FeeLongLength), new OracleParameter(":BLACK_MODE", (object)o.BlackMode), new OracleParameter(":DIVERTER_ID", (object)o.DiverterID), new OracleParameter(":MCPM", (object)o.MCPM), new OracleParameter(":MC_EXPRESSION", (object)o.McExpression), new OracleParameter(":CM_EXT_PARAMS", (object)o.CMextparms), new OracleParameter(":CT_EXT_PARAMS", (object)o.CTextparams), new OracleParameter(":CU_EXT_PARAMS", (object)o.CUextparams), new OracleParameter(":CM_GROUP_ID", (object)o.CMGroupID), new OracleParameter(":CU_GROUP_ID", (object)o.CUGroupID), new OracleParameter(":CT_GROUP_ID", (object)o.CTGroupID), new OracleParameter(":BALANCE_THRESHOLD", (object)o.BalanceThreshold), new OracleParameter(":ALARM_MOBILE", (object)o.AlarmMobile), new OracleParameter(":FORCE_SIGN_FLAG", (object)o.ForceSignFlag), new OracleParameter(":FORCE_SIGN", (object)o.ForceSign), new OracleParameter(":SIGNATURE_MODE", (object)o.SignatureMode), new OracleParameter(":SIGNATURES", (object)o.Signatures), new OracleParameter(":VerCodeMode", (object)o.VerCodeMode), new OracleParameter(":ProvincialNetworkMode",(object)o.ProvincialNetworkMode), new OracleParameter(":RESEND_STATUS", (object)o.RESEND_STATUS), new OracleParameter(":RESEND_CM_GROUPID", (object)o.RESEND_CM_GROUPID), new OracleParameter(":RESEND_CU_GROUPID", (object)o.RESEND_CU_GROUPID), new OracleParameter(":RESEND_CT_GROUPID", (object)o.RESEND_CT_GROUPID), new OracleParameter(":SUB_PACKAGE_NUM", (object)o.SubPackageNum), new OracleParameter(":SINGLE_SUBMIT_MIN_RESTRICT", (object)o.SingleSubmitMinRestrict), new OracleParameter(":IS_DISPALY_PRICE", (object)o.IsDispalyPrice), new OracleParameter(":DEDUCTION_MODE", (object)o.DeductionMode), new OracleParameter(":IS_SEND_AUDIT", (object)o.IsSendAudit), new OracleParameter(":BELOW_NUM_AUDIT", (object)o.BelowNumAudit), new OracleParameter(":ABOVE_NUM_AUDIT", (object)o.AboveNumAudit), new OracleParameter(":IS_CUMULATIVE_AUDIT", (object)o.IsCumulativeAudit), new OracleParameter(":CUMULATIVE_AUDIT_NUM", (object)o.CumulativeAuditNum), new OracleParameter(":CUMULATIVE_AUDIT_TIME", (object)o.CumulativeAuditTime), new OracleParameter(":IS_SYNC_CHILD_SEND_AUDIT", (object)o.IsSyncChildSendAudit) ) > 0;
     }
 
     public GwSp Get(string spid)
-    {
-      using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select * from GW_SP where SP_ID=:SP_ID"), OracleHelper.Connection, new OracleParameter(":SP_ID", (object) spid)))
-      {
-        if (((DbDataReader) reader).Read())
         {
-          GwSp o = new GwSp();
-          this.ReadInfo(reader, o);
-          return o;
-        }
-      }
-      return (GwSp) null;
+            GwSp o = new GwSp();
+            using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select gs.*, gc.company COMPANY, gp.name PRODUCT_NAME from gw_sp gs left join gw_client gc on gc.client_id = gs.client_id left join gw_product gp on gp.id = gs.product_id where gs.SP_ID=:SP_ID"), OracleHelper.Connection, new OracleParameter(":SP_ID", (object) spid)))
+              {
+                if (((DbDataReader) reader).Read())
+                {
+                  this.ReadInfo(reader, o);
+                  return o;
+                }
+            }
+            return o;
     }
 
     public bool IsSpIDExists(string spid)
@@ -534,6 +568,7 @@
             o.ApID = oracleReaderWrapper.GetInt("AP_ID", 0);
             o.CombinationMode = oracleReaderWrapper.GetInt("COMBINATION_MODE", 0);
             o.ClientID = oracleReaderWrapper.GetString("CLIENT_ID", "");
+            o.Company = oracleReaderWrapper.GetString("COMPANY", "");
             o.StrategyID = oracleReaderWrapper.GetInt("STRATEGY_ID", 0);
             o.ChannelType = oracleReaderWrapper.GetString("CHANNEL_TYPE", "");
             o.Password = oracleReaderWrapper.GetString("PASSWORD", "");
@@ -544,6 +579,7 @@
             o.Priority = oracleReaderWrapper.GetInt("PRIORITY", 0);
             o.Price = oracleReaderWrapper.GetInt("PRICE", 0);
             o.ChargeType = oracleReaderWrapper.GetInt("CHARGE_TYPE", 0);
+            o.IsAutoReturn = oracleReaderWrapper.GetInt("IS_AUTO_RETURN", 0);   //鏄惁鑷姩杩旇繕锛�0-鍚︼紱1-鏄�
             o.Threshold = oracleReaderWrapper.GetInt("THRESHOLD", 0);
             o.MaxConnCount = oracleReaderWrapper.GetInt("MAX_CONN_COUNT", 0);
             o.CreateTime = oracleReaderWrapper.GetDateTime("CREATE_TIME");
@@ -596,9 +632,22 @@
             o.TransferFlag = oracleReaderWrapper.GetInt("TransferFlag",0);
 
             o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");  //浜у搧ID
+            o.ProductName = oracleReaderWrapper.GetString("PRODUCT_NAME", "");  //浜у搧ID
             o.BasicNum = oracleReaderWrapper.GetInt("BASIC_NUM", 0);  //鍩烘湰鏉℃暟(鍓╀綑鏁�)
             o.GivingNum = oracleReaderWrapper.GetInt("GIVING_NUM", 0);  //璧犻�佹潯鏁�(鍓╀綑鏁�)
             o.DelFlag = oracleReaderWrapper.GetInt("DelFlag", 0); //鍒犻櫎鏍囧織锛�0-姝e父锛�2-閫昏緫鍒犻櫎
+
+            o.SubPackageNum = oracleReaderWrapper.GetInt("SUB_PACKAGE_NUM", 4000);  //鍒嗗寘鏉℃暟: 琛ㄧず鍚庡彴鏁版嵁鍒嗗寘鏁伴噺锛屼笉鑳戒负0锛屽惁鍒欐病鍔炴硶鍒嗗寘锛岄粯璁�4000涓彿鐮佷竴涓暟鎹寘,寤鸿鍦�2000鑷�5000
+            o.SingleSubmitMinRestrict = oracleReaderWrapper.GetInt("SINGLE_SUBMIT_MIN_RESTRICT", 0);  //鐭俊鍗曟鎻愪氦鏈�灏忛檺鍒�:榛樿0琛ㄧず涓嶉檺鍒讹紝鍚敤闄愬埗鍚庡皬浜庤鎻愪氦鏉℃暟鐨勫皢琚嫆缁濄��
+            o.IsDispalyPrice = oracleReaderWrapper.GetInt("IS_DISPALY_PRICE", 0);  //鏄惁鏄剧ず鍗曚环
+            o.DeductionMode = oracleReaderWrapper.GetInt("DEDUCTION_MODE", 1); //鎵h垂鏂瑰紡锛�1-鎻愪氦閲忥紱2-鎴愪氦閲�
+            o.IsSendAudit = oracleReaderWrapper.GetInt("IS_SEND_AUDIT", 0);  //鍙戦�佹槸鍚﹀鏍革細0-鍋滅敤锛�1-鍚敤
+            o.BelowNumAudit = oracleReaderWrapper.GetInt("BELOW_NUM_AUDIT", 0);  //浣庝簬杩欎釜鏉℃暟闇�瑕佸鏍�
+            o.AboveNumAudit = oracleReaderWrapper.GetInt("ABOVE_NUM_AUDIT", 0);  //楂樹簬杩欎釜鏉℃暟闇�瑕佸鏍�
+            o.IsCumulativeAudit = oracleReaderWrapper.GetInt("IS_CUMULATIVE_AUDIT", 0); //鏄惁绱瀹℃牳锛�0-鍋滅敤锛�1-鍚敤
+            o.CumulativeAuditNum = oracleReaderWrapper.GetInt("CUMULATIVE_AUDIT_NUM", 0); //绱鏉℃暟瀹℃牳
+            o.CumulativeAuditTime = oracleReaderWrapper.GetInt("CUMULATIVE_AUDIT_TIME", 0); //绱鏃堕棿锛堝皬鏃讹級
+            o.IsSyncChildSendAudit = oracleReaderWrapper.GetInt("IS_SYNC_CHILD_SEND_AUDIT", 0); //鏄惁鍚屾瀛愯处鍙�(鍙戦�佸鏍�)锛�0-鍚︼紱2-鏄�
             return true;
         }
 

--
Gitblit v1.9.1