Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

代码/System.Model/T_Cus_VipInfo.cs

@@ -18,13 +18,13 @@ namespace System.Model
         private string _f_sex;
         private string _f_label;
         private string _f_recommender;
-        private int? _f_state;
+        private int _f_state;
         private string _f_note;
         private string _f_city;
         private string _f_nickname;
         private string _f_address;
         private string _f_address1;
-        private DateTime? _f_regtime;
+        private DateTime _f_regtime;
         /// <summary>
         /// id标识，自增
         /// </summary>
@@ -92,7 +92,7 @@ namespace System.Model
         /// <summary>
         /// 状态：0禁用 1启用 2删除
         /// </summary>
-        public int? F_State
+        public int F_State
         {
             set { _f_state = value; }
             get { return _f_state; }
@@ -140,7 +140,7 @@ namespace System.Model
         /// <summary>
         /// 注册时间
         /// </summary>
-        public DateTime? F_RegTime
+        public DateTime F_RegTime
         {
             set { _f_regtime = value; }
             get { return _f_regtime; }
@@ -148,7 +148,7 @@ namespace System.Model
         /// <summary>
         /// 添加时间
         /// </summary>
-        public DateTime? F_CreateOn { get; set; }
+        public DateTime F_CreateOn { get; set; }
         /// <summary>
         /// 添加工号
         /// </summary>
@@ -157,7 +157,7 @@ namespace System.Model
         /// <summary>
         /// 最后一次修改时间
         /// </summary>
-        public DateTime? F_LastModifyOn { get; set; }
+        public DateTime F_LastModifyOn { get; set; }
         /// <summary>
         /// 最后一次修改工号
         /// </summary>
@@ -165,7 +165,7 @@ namespace System.Model
         /// <summary>
         /// 删除时间
         /// </summary>
-        public DateTime? F_DeleteOn { get; set; }
+        public DateTime F_DeleteOn { get; set; }
         /// <summary>
         /// 删除工号
         /// </summary>
@@ -201,7 +201,7 @@ namespace System.Model
         /// <summary>
         /// 鞋码
         /// </summary>				
-        public int? F_ShoeSize { get; set; }
+        public int F_ShoeSize { get; set; }
         /// <summary>
         /// 会员积分
         /// </summary>				

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -171,7 +171,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Nickname = input.nickname;
             model.F_Address = input.address;
             model.F_Address1 = input.address1;
-            model.F_RegTime = DateTime.Now;
+            if (input.regtime != null && input.regtime.ToString() != "")
+            {
+                model.F_RegTime = input.regtime;
+            }
+            else
+            {
+                model.F_RegTime = DateTime.Now;
+            }
             model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             model.F_CreateOn = DateTime.Now;
             model.F_Age = input.age;
@@ -243,7 +250,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Nickname = input.nickname;
             model.F_Address = input.address;
             model.F_Address1 = input.address1;
-            model.F_RegTime = DateTime.Now;
+            if (input.regtime != null && input.regtime.ToString() != "")
+            {
+                model.F_RegTime = input.regtime;
+            }
             model.F_LastModifyOn = DateTime.Now.ToLocalTime();
             model.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             model.F_Age = input.age;
@@ -550,7 +560,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     var model = new T_Cus_VipInfo();
                     
                     model.F_State = 1;
-                    model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+                    //model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
                     model.F_CreateOn = DateTime.Now;
 
                     var dbcolslist = dbcols.ToList();

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/VIPInfoInput.cs

@@ -52,7 +52,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         /// <summary>
         /// 鞋码
         /// </summary>				
-        public int? shoesize { get; set; }
+        public int shoesize { get; set; }
         /// <summary>
         /// 会员积分
         /// </summary>				
@@ -77,5 +77,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         /// 会员类型
         /// </summary>				
         public string type { get; set; }
+
+        public DateTime regtime { get; set; }
     }
 }