From 1961452ebc018cf758924f26d9c7aa0b31495227 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 25 十月 2022 16:56:13 +0800
Subject: [PATCH] 开发第三版，主要是修复bug
---
web/Model/Model/GwClient.cs | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs
index a6abdcc..75fdb7f 100644
--- a/web/Model/Model/GwClient.cs
+++ b/web/Model/Model/GwClient.cs
@@ -6,18 +6,13 @@
namespace Model
{
-<<<<<<< HEAD
/// <summary>
/// 璐︽埛绫�
/// </summary>
public class GwClient : ISessionObject
{
- private List<string> _PermissionList = new List<string>();//鏉冮檺鍒楄〃
-=======
- public class GwClient : ISessionObject
- {
+
private List<string> _PermissionList = new List<string>();
->>>>>>> remotes/origin/Release
private string _clientId;
private string _clientName;
private string _telephone;
@@ -26,17 +21,15 @@
private string _company;
private string _remark;
private string _password;
+ public string Salt { get; set; } //瀵嗙爜鍔犲瘑鐩�
-<<<<<<< HEAD
- private string _parentId;
-=======
- private string _parentId;//涓婄骇ID
->>>>>>> remotes/origin/Release
+
+ //private string _parentId;//涓婄骇ID //浣滃簾浜�
private Decimal _totalAmount;
private Decimal _balance;
private int _id;
-<<<<<<< HEAD
+
private int _certification_Status;//璁よ瘉鐘舵��:0-鏈璇�/1-宸茶璇�
private int _client_Classes;//瀹㈡埛绫诲埆:0-浼佷笟/1-涓汉
@@ -45,11 +38,39 @@
private int _is_Enable;//鏄惁鍚敤鐘舵��(1-鍚�/0-鍋�)
private Decimal _top_up_Amount_Total;//绱鍏呭��(閲戦)
private string _salesman;//褰掑睘涓氬姟鍛�
+ public string CustomerManager { get; set; } //褰掑睘瀹㈡埛缁忕悊
+ public string SupportStaff { get; set; } //褰掑睘瀹㈡湇浜哄憳
+ public string FinancialStaff { get; set; } //褰掑睘璐㈠姟浜哄憳
+ public int ChargeType { get; set; } //璁¤垂鏂瑰紡锛�1-棰勪粯璐癸紱2-鍚庝粯璐�.
+ public int SmsStatusReport { get; set; } //鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶆樉绀�;1-鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�;2-鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�.
+ public int MmsStatusReport { get; set; } //褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶆樉绀�;1-鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�;2-鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�.
+ public int IsEnableSubAccount{ get; set; } //鏄惁鏀寔鍒涘缓瀛愯处鎴凤細0-绂佺敤锛�1-鍚敤
+ public string SubAccountPath { get; set; } //瀛愯处鎴疯矾寰�
+ public int IsEnableWhite { get; set; } //鏄惁鍚敤鐧藉悕鍗�:0-绂佺敤锛�1-鍚敤銆傝繃婊ゅ鎴风櫧鍚嶅崟搴撱��
+ public int IsSyncChileWhite { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鐧藉悕鍗曪級:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsEnableBlack { get; set; } //鏄惁鍚敤榛戝悕鍗�:0-绂佺敤锛�1-鍚敤銆傝繃婊ゅ鎴烽粦鍚嶅崟搴撳拰绯荤粺榛戝悕鍗曞簱銆�
+ public int IsSyncChileBlack { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙榛戝悕鍗曪級:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsRemoteLoginNotice { get; set; } //鏄惁寮傚湴鐧诲綍閫氱煡:0-绂佺敤锛�1-鍚敤
+ public int IsSyncChileRemoteLogin { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙寮傚湴鐧诲綍閫氱煡锛�:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsMobileCaptcha { get; set; } //鏄惁鍚敤鎵嬫満楠岃瘉鐮�:0-绂佺敤锛�1-鍚敤
+ public int IsSyncChileMobileCaptcha { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鎵嬫満楠岃瘉鐮侊級:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsHideMobile { get; set; } //鏄惁闅愯棌瀹㈡埛绔墜鏈哄彿:0-绂佺敤锛�1-鍚敤
+ public int IsSyncChileHideMobile { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙闅愯棌瀹㈡埛绔墜鏈哄彿锛�:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsDisplayStatus { get; set; } //鏄惁鏄剧ず鐘舵�佹帴鍙�: 涓嶆樉绀�-0 鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�-1 鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�-2
+ public int IsSyncChileDisplayStatus { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鏄剧ず鐘舵�侊級:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsLoginIpRestrict { get; set; } //鏄惁鍚敤鐧诲綍IP闄愬埗:0-绂佺敤锛�1-鍚敤
+ public int IsSyncChileLoginIpRestrict { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鐧诲綍IP闄愬埗锛�:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public string IsLoginIpAllowGather { get; set; } //鐧诲綍IP鍏佽闆嗗悎:閰嶅悎鏄惁鍚敤鐧诲綍IP闄愬埗涓�璧蜂娇鐢紝澶氫釜闄愬埗IP鏃讹紝鎸夊崐瑙掗�楀彿","鍒嗛殧銆傚彲浣跨敤IP娈碉紝濡傦細202.203.1.*銆�
+ public int IsSyncChileIpAllows { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙IP鍏佽闆嗗悎锛�:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public int IsLoginCityRestrict { get; set; } //鏄惁鍚敤鐧诲綍鍦板尯锛堝煄甯傦級闄愬埗:0-绂佺敤锛�1-鍚敤
+ public int IsSyncChileCityRestrict { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鐧诲綍鍩庡競闄愬埗锛�:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public string IsLoginCityAllowGather { get; set; } //鐧诲綍鍦板尯锛堝煄甯傦級鍏佽闆嗗悎锛�:閰嶅悎鏄惁鍚敤鐧诲綍鍩庡競闄愬埗涓�璧蜂娇鐢紝澶氫釜闄愬埗鍦板尯鏃讹紝鎸夊崐瑙掗�楀彿","鍒嗛殧銆�
+ public int IsSyncChileCityAllows { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鍩庡競鍏佽闆嗗悎锛�:0-涓嶅悓姝ワ紱1-鍚屾銆�
+ public string LastLoginIp { get; set; } //鏈�鍚庣櫥褰旾P
+ public string LastLoginCity { get; set; } //鏈�鍚庣櫥褰曞湴鍖猴紙鍩庡競锛夌紪鐮�
+ public DateTime LastLoginTime { get; set; } //鏈�鍚庣櫥褰曟椂闂�
-
-=======
->>>>>>> remotes/origin/Release
public int Id
{
get
@@ -158,11 +179,11 @@
}
}
- public string ParentId
- {
- get { return this._parentId; }
- set { this._parentId = value; }
- }
+ //public string ParentId
+ //{
+ // get { return this._parentId; }
+ // set { this._parentId = value; }
+ //}
public Decimal TotalAmount
{
@@ -178,6 +199,10 @@
public int BalanceThreshold { get; set; }
public string AlarmMobile { get; set; }
+
+ //宸插垎閰嶇殑涓�т骇鍝侀泦锛屽涓互鈥�,鈥濆垎闅�
+ public string ProductIds { get; set; }
+
public string PermissionData
{
@@ -206,7 +231,7 @@
}
}
-<<<<<<< HEAD
+
public int Certification_Status { get => _certification_Status; set => _certification_Status = value; }
public int Client_Classes { get => _client_Classes; set => _client_Classes = value; }
public string Client_Parentid { get => _client_Parentid; set => _client_Parentid = value; }
@@ -215,8 +240,6 @@
public decimal Top_up_Amount_Total { get => _top_up_Amount_Total; set => _top_up_Amount_Total = value; }
public string Salesman { get => _salesman; set => _salesman = value; }
-=======
->>>>>>> remotes/origin/Release
public bool HasRight(string functionID)
{
return this._PermissionList.Contains(functionID);
--
Gitblit v1.9.1