档案

代码/System.Model/Bus/T_Bus_Order.cs

@@ -72,7 +72,7 @@ namespace System.Model
 
         private string _f_membernotes = "";
         private string _f_recommendName = "";
-      
+        private string _f_recommendertel = "";
 
         /// <summary>
         /// 推荐人姓名
@@ -416,10 +416,19 @@ namespace System.Model
 			set { _f_totleprice = value; }
 			get { return _f_totleprice; }
 		}
-		/// <summary>
-		/// 使用营销活动
-		/// </summary>
-		public string F_UseActivity
+        /// <summary>
+        /// 推荐人手机号
+        /// </summary>
+        public string F_RecommenderTel
+        {
+            set { _f_recommendertel = value; }
+            get { return _f_recommendertel; }
+
+        }
+        /// <summary>
+        /// 使用营销活动
+        /// </summary>
+        public string F_UseActivity
 		{
 			set { _f_useactivity = value; }
 			get { return _f_useactivity; }

代码/System.Model/Cus/T_Cus_VipInfo.cs

@@ -25,6 +25,7 @@ namespace System.Model
         private string _f_nickname;
         private string _f_address;
         private string _f_address1;
+        private string _f_address2;
         /// <summary>
         /// id标识，自增
         /// </summary>
@@ -147,6 +148,16 @@ namespace System.Model
             get { return _f_address1; }
         }
         /// <summary>
+        /// 地址备用
+        /// </summary>
+        public string F_Address2
+        {
+            set { _f_address2 = value; }
+            get { return _f_address2; }
+        }
+        public int F_RecommenderID
+        { get; set; }
+        /// <summary>
         /// 添加时间
         /// </summary>
         public DateTime? F_CreateOn { get; set; }
@@ -264,6 +275,20 @@ namespace System.Model
         { get; set; }
        
         public string F_Mobile2 { get; set; }
+        /// <summary>
+        /// 省
+        /// </summary>				
+        public string F_Province2 { get; set; }
+        /// <summary>
+        /// 县、区
+        /// </summary>				
+        public string F_Area2 { get; set; }
+        /// <summary>
+        /// 乡镇
+        /// </summary>				
+        public string F_Town2 { get; set; }
+        public string F_City2 { get; set; }
+        public int F_ParentID { get; set; }
         #endregion Model
     }
 }

代码/System.Model/Cus/V_Cus_VipInfo.cs

@@ -166,6 +166,41 @@ namespace System.Model
         /// 备用邮编
         /// </summary>				
         public string F_Postcode1 { get; set; }
+        /// <summary>
+        /// 推荐人手机号
+        /// </summary>
+        public string F_RecommenderTel
+        { get; set; }
+        /// <summary>
+        /// 第一次通话时间
+        /// </summary>
+        public DateTime? F_Firstcalltime
+        { get; set; }
+        /// <summary>
+        /// 最后一次通话时间
+        /// </summary>
+        public DateTime? F_Lastholetime
+        { get; set; }
+        public int F_RecommenderID
+        { get; set; }
+        /// 省
+        /// </summary>				
+        public string F_Province2 { get; set; }
+        /// <summary>
+        /// 县、区
+        /// </summary>				
+        public string F_Area2 { get; set; }
+        /// <summary>
+        /// 乡镇
+        /// </summary>				
+        public string F_Town2 { get; set; }
+        public string F_City2 { get; set; }
+        /// <summary>
+        /// 地址备用
+        /// </summary>
+        public string F_Address2
+        { get; set; }
+      
         #endregion Model
     }
 }

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

@@ -18,10 +18,11 @@ using System.Text.RegularExpressions;
 using System.IRepositories.Call;
 using System.Model.Call;
 using System.Utility.Encrypt;
+using System.IRepositories.Bus;
 
 namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
 {
-    [Authorize]
+  //  [Authorize]
     [Produces("application/json")]
     [Route("api/[controller]")]
     public class VipInfoController : BaseController
@@ -33,8 +34,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         private readonly ISMS_InternalMessagesReposytory _sys_internalMessagesrepository;
         private readonly ICall_CallRecordsRepository busCallRecordsRepository;
         private readonly Ipoint_agentRepository _point_agentrepository;
+        private readonly IBus_OrderRepository busOrderRepository;
         public VipInfoController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_UserAccountRepository sys_user_accountRepository, ICus_MsgRepository cus_msgRepository,IConfiguration configuration,
-            ISMS_InternalMessagesReposytory sys_internalMessagesrepository, ICall_CallRecordsRepository _busCallRecordsRepository, Ipoint_agentRepository point_agentrepository)
+            ISMS_InternalMessagesReposytory sys_internalMessagesrepository, ICall_CallRecordsRepository _busCallRecordsRepository, Ipoint_agentRepository point_agentrepository, IBus_OrderRepository _busOrderRepository)
         {
             _cus_vip_infoRepository = cus_vip_infoRepository;
             _sys_user_accountRepository = sys_user_accountRepository;
@@ -43,6 +45,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             _sys_internalMessagesrepository = sys_internalMessagesrepository;
             busCallRecordsRepository = _busCallRecordsRepository;
             _point_agentrepository = point_agentrepository;
+            busOrderRepository = _busOrderRepository;
         }
 
         [HttpGet]
@@ -139,6 +142,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             return Content(obj.ToJson());
         }
 
+
+
+
         /// <summary>
         /// 获取会员信息详情
         /// </summary>
@@ -157,7 +163,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             if (model != null)
             {
                 var modellist = await _cus_msgRepository.GetListALL(x => x.F_VipInfoID == model.F_ID);
-                var viplist = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1&& x.F_Recommender == model.F_Name&&(x .F_RecommenderTel ==model .F_Phone || x.F_RecommenderTel == model.F_Mobile &&x.F_RecommenderTel == model.F_Mobile1));
+                var viplist = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1&& x.F_RecommenderID  == model.F_ID  );
                 var obj =new 
                 {
                     model,
@@ -174,7 +180,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         /// 号码加密
         /// </summary>
         /// <param name="id"></param>
-        /// <param name="type"></param>
+        /// <param name="type"></  param>
         /// <returns></returns>
         [HttpGet("encryptphone")]
         public async Task<IActionResult> GetEncrypt(int id,int type=0)
@@ -201,6 +207,218 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             return Error("加密失败!");
 
         }
+
+        /// <summary>
+        /// 档案合并
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("Merge")]
+        public async Task<IActionResult> Merge(int MainID=0,int  ViceID=0)
+        {
+            if (MainID<=0)
+                return Error("请选择主档案");
+            if (ViceID<=0)
+                return Error("请选择副档案");
+
+            var model = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == MainID && x.F_State == (int)EnumDelState.Enabled);
+            if (model == null)
+                return Error("操作失败，主档案不存在");
+            var model1 = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == ViceID && x.F_State == (int)EnumDelState.Enabled);
+            if (model1 == null)
+                return Error("操作失败，副档案不存在");
+
+
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            var modelInfo = new T_Cus_VipInfo();
+            //model.F_VIPCode = input.vipcode;//会员卡号
+            modelInfo.F_Name = model.F_Name;
+            modelInfo.F_Birthday = model.F_Birthday;
+            modelInfo.F_Phone = model.F_Phone;
+            modelInfo.F_RecommenderID = model.F_RecommenderID;
+            modelInfo.F_Recommender = model.F_Recommender;
+            modelInfo.F_RecommenderTel = model.F_RecommenderTel;
+            modelInfo.F_Sex = model.F_Sex;
+            modelInfo.F_Label = model.F_Label;
+            modelInfo.F_Note = model.F_Note;
+            modelInfo.F_City = model.F_City;
+            modelInfo.F_Nickname = model.F_Nickname;
+            modelInfo.F_Address = model.F_Address;
+            modelInfo.F_Address1 = model.F_Address1;
+            modelInfo.F_Age = model.F_Age;
+
+            if (!string.IsNullOrEmpty(model.F_Mobile))
+            {
+                if (!string.IsNullOrEmpty(model1.F_Mobile))
+                {
+                    modelInfo.F_Mobile += "," + model1.F_Mobile;
+                   string [] Mobile = modelInfo.F_Mobile.Split(',');
+                   var Mobilelist= Mobile.Distinct().ToList();
+                    string phone = "";
+                    foreach (var it in Mobilelist)
+                    {
+                        if (phone == "")
+                            phone += it;
+                        else
+                            phone += "," + it;
+                    }
+                    modelInfo.F_Mobile = phone;
+                }
+
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(model1.F_Mobile))
+                {
+                    modelInfo.F_Mobile = model1.F_Mobile;
+                }
+
+            }
+
+            modelInfo.F_Province = model.F_Province;
+            modelInfo.F_Area = model.F_Area;
+            modelInfo.F_Town = model.F_Town;
+            modelInfo.F_Postcode = model.F_Postcode;
+            modelInfo.F_Province1 = model.F_Province1;
+            modelInfo.F_Area1 = model.F_Area1;
+            modelInfo.F_Town1 = model.F_Town1;
+            modelInfo.F_City1 = model.F_City1;
+            modelInfo.F_Address1 = model.F_Address1;
+            modelInfo.F_Province2 = model.F_Province2;
+            modelInfo.F_Area2 = model.F_Area2;
+            modelInfo.F_Town2 = model.F_Town2;
+            modelInfo.F_City2 = model.F_City2;
+            modelInfo.F_Address2 = model.F_Address2;
+            modelInfo.F_Postcode1 = model.F_Postcode1;
+            modelInfo.F_ShoeSize = model.F_ShoeSize;
+            modelInfo.F_Score = model .F_Score + model1.F_Score;
+            modelInfo.F_Money = model.F_Money + model1.F_Money;
+            modelInfo.F_TotalScore = model.F_TotalScore + model1.F_TotalScore;
+            modelInfo.F_Saleperson = user;
+            modelInfo.F_Type = model.F_Type;
+            modelInfo.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value; //"8000";
+            modelInfo.F_CreateOn = model.F_CreateOn;
+            modelInfo.F_State = (int)EnumDelState.Enabled;
+            modelInfo.F_GiftYear = model.F_GiftYear;
+            modelInfo.F_Firstcalltime = model.F_Firstcalltime;
+            modelInfo.F_Lastholetime = model.F_Lastholetime;
+            var res = await _cus_vip_infoRepository.Add(modelInfo);
+            if (res > 0)
+            {
+                model .F_State = (int)EnumDelState.Delete;
+                model.F_ParentID = res;
+                await _cus_vip_infoRepository.Update(model);
+                model1.F_State = (int)EnumDelState.Delete;
+                model1.F_ParentID = res;
+                await _cus_vip_infoRepository.Update(model1);
+                return Success("合并成功");
+            }
+            else
+            {
+                return Error("合并失败");
+            }
+        }
+        /// <summary>
+        /// 档案拆分
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("SplitvIP")]
+        public async Task<IActionResult> SplitvIP(int id)
+        {
+            if (id <= 0)
+                return Error("请选择要拆分档案");
+            var model = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == id && x.F_State == (int)EnumDelState.Enabled);
+            if (model == null)
+                return Error("操作失败，档案不存在");
+            var call = await busCallRecordsRepository.GetListALL(x => x.CusId==model .F_ID );
+            if (call!=null && call.Count >0)
+                return Error("操作失败，该档案已产生新的信息，不可拆分");
+            var order = await busOrderRepository.GetListALL(x => x.F_VipId   == model.F_ID);
+            if (order != null && order.Count > 0)
+                return Error("操作失败，该档案已产生新的信息，不可拆分");
+            var modellist = await _cus_vip_infoRepository.GetListALL (x => x.F_ParentID  == id && x.F_State == (int)EnumDelState.Delete );
+            if (modellist == null|| modellist.Count <=0)
+                return Error("操作失败，该档案未进行过合并");
+
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            int res = 0;
+           foreach (var it in modellist)
+            {
+               // var ml = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == item);
+                it.F_State = (int)EnumDelState.Enabled ;
+                if (_cus_vip_infoRepository.Update(it).Result)
+                    res += 1;
+            }
+            if (res == modellist.Count)
+            {
+                model .F_State = (int)EnumDelState.Delete ;
+                await _cus_vip_infoRepository.Update(model);
+                return Success("拆分成功");
+               
+            }
+                
+            else
+                return Error ("部分档案拆分成功");
+        }
+
+
+        /// <summary>
+        /// 获取会员所有手机号
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("getVipMobie")]
+        public async Task<IActionResult> GetVipMobie(int id)
+        {
+            if (id <= 0)
+                return Error("请选择会员");
+            var model = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == id && x.F_State == (int)EnumDelState.Enabled);
+            if (model == null)
+                return Error("操作失败，会员不存在");
+            List<string> Mobile = new List<string>();
+            Mobile.Add(model.F_Phone);
+            if (!string.IsNullOrEmpty (model.F_Mobile) )
+            {
+                var modellist = model.F_Mobile.Split(',');
+                foreach (var it in modellist)
+                {
+                    Mobile.Add(it);
+                }
+            }
+                return Success("获取成功", Mobile);
+           
+        }
+        /// <summary>
+        /// 通过手机号获取会员列表
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [HttpGet("getphone")]
+        public async Task<IActionResult> Getphone(string phone)
+        {
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
+            if (string.IsNullOrEmpty(phone))
+                return Error("请输入号码");
+         
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Phone", ConditionalType = ConditionalType.Like, FieldValue = phone }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Mobile", ConditionalType = ConditionalType.Like, FieldValue = phone }),
+                    }
+                });
+            #endregion
+
+            var list = await _cus_vip_infoRepository.GetListALL (conModels, "F_CreateOn desc");
+            return Success ("获取成功", list);
+
+        }
+
         /// <summary>
         /// 号码解密
         /// </summary>
@@ -251,7 +469,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             };
             return Content(obj.ToJson());
         }
-
         /// <summary>
         /// 添加会员
         /// </summary>
@@ -291,16 +508,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 point_Agent.agent = user;
                 var phone = _point_agentrepository.Add(point_Agent);
             }
+            model.F_RecommenderID = input.F_RecommenderID;
             model.F_Recommender = input.recommender;
-            if (!string .IsNullOrEmpty (input.recommendertel))
+            if (!string.IsNullOrEmpty(input.recommendertel))
             {
                 if (!valtel(input.recommendertel))
                     return Error("手机号必须为11位数字");
                 model.F_RecommenderTel = input.recommendertel;
             }
-
-
-           
             model.F_Sex = input.sex;
             model.F_Label = input.label;
             model.F_Note = input.note;
@@ -311,47 +526,26 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Age = input.age;
             if (!string .IsNullOrEmpty (input .mobile ))
             {
-                if (!valtel(input.mobile))
-                    return Error("手机号必须为11位数字");
-                model.F_Mobile = input.mobile;
-                var _point = await _point_agentrepository.GetListALL(x => x.caller == input.mobile);
-                if (_point == null && _point.Count() <= 0)
+                string[] mobile1 = input.mobile.TrimEnd(',').Split(',');
+                foreach (var it in mobile1)
                 {
-                    point_agent point_Agent = new point_agent();
-                    point_Agent.caller = input.mobile;
-                    point_Agent.agent = user;
-                    var phone = _point_agentrepository.Add(point_Agent);
-                }
-            }
-            if (!string.IsNullOrEmpty(input.mobile1))
-            {
-                if (!valtel(input.mobile1))
-                    return Error("手机号必须为11位数字");
-                model.F_Mobile1 = input.mobile1;
-                var _point = await _point_agentrepository.GetListALL(x => x.caller == input.mobile1);
-                if (_point == null && _point.Count() <= 0)
-                {
-                    point_agent point_Agent = new point_agent();
-                    point_Agent.caller = input.mobile1;
-                    point_Agent.agent = user;
-                    var phone = _point_agentrepository.Add(point_Agent);
-                }
-            }
-            if (!string.IsNullOrEmpty(input.mobile2))
-            {
-                if (!valtel(input.mobile2))
-                    return Error("手机号必须为11位数字");
-                model.F_Mobile2 = input.mobile2;
-                var _point = await _point_agentrepository.GetListALL(x => x.caller == input.mobile2);
-                if (_point == null && _point.Count() <= 0)
-                {
-                    point_agent point_Agent = new point_agent();
-                    point_Agent.caller = input.mobile2;
-                    point_Agent.agent = user;
-                    var phone = _point_agentrepository.Add(point_Agent);
+                    if (!valtel(it))
+                        return Error("手机号必须为11位数字");
+                  
+                    var _point = await _point_agentrepository.GetListALL(x => x.caller == it);
+                    if (_point == null && _point.Count() <= 0)
+                    {
+                        point_agent point_Agent = new point_agent();
+                        point_Agent.caller = it;
+                        point_Agent.agent = user;
+                        var phone = _point_agentrepository.Add(point_Agent);
+                    }
                 }
+                model.F_Mobile = input.mobile.TrimEnd(',');
             }
             
+           
+            
             model.F_Province = input.province;
             model.F_Area = input.area;
             model.F_Town = input.town;
@@ -359,8 +553,17 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Province1 = input.province1;
             model.F_Area1 = input.area1;
             model.F_Town1 = input.town1;
-            model.F_Postcode1 = input.postcode1;
             model.F_City1 = input.city1;
+            model.F_Address1 = input.address1;
+
+
+            model.F_Province2 = input.province2;
+            model.F_Area2 = input.area2;
+            model.F_Town2 = input.town2;
+            model.F_City2= input.city2;
+            model.F_Address2 = input.address2;
+
+            model.F_Postcode1 = input.postcode1;
             model.F_ShoeSize = input.shoesize;
             model.F_Score = input.score;
             model.F_Money = input.money;
@@ -379,7 +582,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     model.F_GiftYear = DateTime.Now.Year.ToString();
                 }
             }
-            var call = await busCallRecordsRepository.GetListALL(x => x.CallState == 1 || (x.Caller == input.phone || x.Caller == input.mobile  || x.Caller == input.mobile1 || x.Caller == input.mobile2) || (x.Callee == input.phone || x.Callee == input.mobile || x.Callee == input.mobile1 || x.Callee == input.mobile2));
+            var call = await busCallRecordsRepository.GetListALL(x => x.CallState == 1 || x.Caller == input.phone);
             if (call!=null && call.Count >0)
             {
                 model.F_Firstcalltime = call[0].BeginTime;
@@ -388,7 +591,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
            
            
                
-            if (await _cus_vip_infoRepository.GetCount(x => x.F_Mobile == model.F_Mobile && x.F_Name == input.name) > 0)
+            if (await _cus_vip_infoRepository.GetCount(x => x.F_Mobile == model.F_Mobile && x.F_Name == input.name&&x.F_State ==1) > 0)
             {
                 return Error("添加失败，存在相同会员信息");
             }
@@ -402,7 +605,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 return Error("添加失败");
             }
         }
-
         /// <summary>
         /// 修改会员信息
         /// </summary>
@@ -444,6 +646,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 point_Agent.agent = user;
                 var phone = _point_agentrepository.Add(point_Agent);
             }
+            model.F_RecommenderID = input.F_RecommenderID;
             model.F_Recommender = input.recommender;
             if (!string.IsNullOrEmpty(input.recommendertel))
             {
@@ -464,45 +667,24 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Age = input.age;
             if (!string.IsNullOrEmpty(input.mobile))
             {
-                if (!valtel(input.mobile))
-                    return Error("手机号必须为11位数字");
-                model.F_Mobile = input.mobile;
-                var _point = await _point_agentrepository.GetListALL(x => x.caller == input.mobile);
-                if (_point == null && _point.Count() <= 0)
+                string[] mobile1 = input.mobile.TrimEnd(',').Split(',');
+                foreach (var it in mobile1)
                 {
-                    point_agent point_Agent = new point_agent();
-                    point_Agent.caller = input.mobile;
-                    point_Agent.agent = user;
-                    var phone = _point_agentrepository.Add(point_Agent);
-                }
-            }
-            if (!string.IsNullOrEmpty(input.mobile1))
-            {
-                if (!valtel(input.mobile1))
-                    return Error("手机号必须为11位数字");
-                model.F_Mobile1 = input.mobile1; var _point = await _point_agentrepository.GetListALL(x => x.caller == input.mobile1);
-                if (_point == null && _point.Count() <= 0)
-                {
-                    point_agent point_Agent = new point_agent();
-                    point_Agent.caller = input.mobile1;
-                    point_Agent.agent = user;
-                    var phone = _point_agentrepository.Add(point_Agent);
-                }
-            }
-            if (!string.IsNullOrEmpty(input.mobile2))
-            { 
-                if (!valtel(input.mobile2))
-                    return Error("手机号必须为11位数字");
-                model.F_Mobile2 = input.mobile2;
-                model.F_Mobile1 = input.mobile1; var _point = await _point_agentrepository.GetListALL(x => x.caller == input.mobile2);
-                if (_point == null && _point.Count() <= 0)
-                {
-                    point_agent point_Agent = new point_agent();
-                    point_Agent.caller = input.mobile2;
-                    point_Agent.agent = user;
-                    var phone = _point_agentrepository.Add(point_Agent);
+                    if (!valtel(it))
+                        return Error("手机号必须为11位数字");
+
+                    var _point = await _point_agentrepository.GetListALL(x => x.caller == it);
+                    if (_point == null && _point.Count() <= 0)
+                    {
+                        point_agent point_Agent = new point_agent();
+                        point_Agent.caller = it;
+                        point_Agent.agent = user;
+                        var phone = _point_agentrepository.Add(point_Agent);
+                    }
                 }
+                model.F_Mobile = input.mobile.TrimEnd(',');
             }
+
             model.F_Province = input.province;
             model.F_Area = input.area;
             model.F_Town = input.town;
@@ -516,6 +698,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Score = input.score;
             model.F_Money = input.money;
             model.F_TotalScore = input.totalscore;
+            model.F_Province2 = input.province2;
+            model.F_Area2 = input.area2;
+            model.F_Town2 = input.town2;
+            model.F_City2 = input.city2;
+            model.F_Address2 = input.address2;
             //model.F_Saleperson = input.saleperson;
             //model.F_Contact = input.contact;
             model.F_Type = input.type;
@@ -531,7 +718,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     }
                 }
             }
-            var call = await busCallRecordsRepository.GetListALL(x => x.CallState == 1 || (x.Caller == input.phone || x.Caller == input.mobile || x.Caller == input.mobile1 || x.Caller == input.mobile2) || (x.Callee == input.phone || x.Callee == input.mobile || x.Callee == input.mobile1 || x.Callee == input.mobile2));
+            var call = await busCallRecordsRepository.GetListALL(x => x.CallState == 1 || x.Caller == input.phone);
             if (call != null && call.Count > 0)
             {
                 model.F_Firstcalltime = call[0].BeginTime;
@@ -543,7 +730,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 return Success("修改成功");
             return Error("修改失败");
         }
-
         /// <summary>
         /// 删除会员信息 by ids
         /// </summary>
@@ -574,6 +760,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             else
                 return Error("请选择要删除的记录");
         }
+        
         /// <summary>
         /// 判断号码必须为十一位数字
         /// </summary>

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs

@@ -525,8 +525,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             return Error("请输入打款人");
                         if (string.IsNullOrEmpty(input.F_PayType))
                             return Error("请选择付款方式");
-                        if (string.IsNullOrEmpty(input.OrderMoney.F_RemarkKF))
-                            input.OrderMoney.F_RemarkKF = "";
+                      //  if (string.IsNullOrEmpty(input.OrderMoney.F_RemarkKF))
+                          //  input.OrderMoney.F_RemarkKF = "";
                         if (string.IsNullOrEmpty(input.OrderMoney.F_RemarkXS))
                             input.OrderMoney.F_RemarkXS = "";
                         if (input.OrderMoney.F_PayTime == null)
@@ -639,6 +639,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
                         if (modelProduct == null)
                             return Error("商品不存在:" + m.F_ProductId);
+                       if (modelProduct.F_OnSaleEnd<DateTime .Now &&UserLogin.RoleCode != "SH")
+                        {
+                            return Error ("商品已下架:" + m.F_ProductId);
+                        }
                         T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                         modelDetail.F_ProductName = modelProduct.F_ProductName;
                         modelDetail.F_ProductId = modelProduct.F_ProductId;
@@ -702,7 +706,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
                 modelOrder.F_TotlePrice += input.F_ExpressFee;//订单总额（包括快递费）
-
+                modelOrder.F_RecommenderTel = input.F_RecommenderTel;
                 modelOrder.F_PayState = 0;
 
                 if (input .F_State ==1)
@@ -795,7 +799,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <returns></returns>
         [HttpPost("getPrice")]
         public async Task<IActionResult> GetPrice(List<OrderDetailInput> OrderDetailList
-            , List<UseActInput> UseActList,int F_ExpressFee=0)
+            , List<UseActInput> UseActList, decimal F_ExpressFee =0)
         {
             decimal totle = 0.00M;
             decimal ActivityMoney = 0.00M;
@@ -838,6 +842,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
                     if (modelProduct == null)
                         return Error("商品不存在:" + m.F_ProductId);
+                    if (modelProduct.F_OnSaleEnd < DateTime.Now && UserLogin.RoleCode != "SH")
+                    {
+                        return Error("商品已下架:" + m.F_ProductId);
+                    }
                     T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                     //参加活动特价
                     if (UseActivity4.Contains("," + modelProduct.F_ProductId + ","))
@@ -850,6 +858,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         modelDetail.F_DealPrice = 0.00M;
                         modelDetail.F_Remark = "生日赠品-活动：";
                     }
+                    modelDetail.F_Count = m.F_Count;
                     modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
                     totle += modelDetail.F_TotlePrice;
                     n++;
@@ -912,8 +921,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         foreach (var it in detaillist)
                         {
                             T_Bus_Product t_Bus_Product = await bus_productRepository.GetSingle(x => x.F_ProductId == it.F_ProductId);
-                          
-                            if (t_Bus_Product!=null )
+                        if (t_Bus_Product.F_OnSaleEnd < DateTime.Now && UserLogin.RoleCode != "SH")
+                        {
+                            return Error("商品已下架:" + t_Bus_Product.F_ProductId);
+                        }
+                        if (t_Bus_Product!=null )
                             {
                                 List<EBossStock> listStock = await busOrderFunctionController.GetStock(it.F_ProductId, "山西仓");
                                 List<EBossStock> listStock1 = await busOrderFunctionController.GetStock(it.F_ProductId, "新乡仓");
@@ -1030,11 +1042,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     Expression<Func<T_Bus_OrderMoney, bool>> eq = a => a.F_OrderId == it;
                     T_Bus_OrderMoney modelOrderMoeny =  busOrderMoneyRepository.GetListALL(eq, o => o.F_AddTime, OrderByType.Asc).Result .FirstOrDefault ();
                     T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == modelOrderMoeny.F_OrderId);
-                    modelOrderMoeny.F_CheckUserId = UserLogin.UserId.ObjToInt();
-                    modelOrderMoeny.F_CheckUserName = UserLogin.UserName;
-                  //  modelOrderMoeny.F_Money = modelOrderMoeny.F_Money;
                     modelOrderMoeny.F_State = state;
-                //    modelOrderMoeny.F_RemarkKF = it.F_RemarkKF;
                     if (modelOrderMoeny.F_State == 1)
                     {
                         if (modelOrder.F_PayState == 1 || modelOrder.F_PayState == 3)
@@ -1074,6 +1082,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                                 T_Bus_Product t_Bus_Product = await bus_productRepository.GetSingle(x => x.F_ProductId == iv.F_ProductId);
                                 if (t_Bus_Product != null)
                                 {
+                                    if (t_Bus_Product.F_OnSaleEnd < DateTime.Now && UserLogin.RoleCode != "SH")
+                                    {
+                                        return Error("商品已下架:" + t_Bus_Product.F_ProductId);
+                                    }
                                     t_Bus_Product.F_UseNumber -= iv.F_Count;
                                     Productlist.Add(t_Bus_Product);
                                 }
@@ -1971,6 +1983,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
                 if (modelProduct != null)
                 {
+                    if (modelProduct.F_OnSaleEnd < DateTime.Now && UserLogin.RoleCode != "SH")
+                    {
+                        return Error("商品已下架:" + modelProduct.F_ProductId);
+                    }
                     //是否有活动标签
                     if (modelProduct.F_Tag.IndexOf(".") > -1)
                     {
@@ -2134,9 +2150,17 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelreturn.UseActList = actlist;
 
             }
-
-
-            return Success("成功", modelreturn);
+            else
+                return Error("订单不存在");
+            Expression<Func<T_Bus_Orderlogs , bool>> eq = a => a.F_WoID == orderid;
+            var ItemList = await busOrderlogsRepository.GetListALL(eq, o => o.F_CreateTime , OrderByType.Asc);
+           
+            var obj = new
+            {
+                modelreturn,
+                ItemList
+            };
+            return Content(obj.ToJson());
 
 
         }
@@ -2313,61 +2337,74 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 string[] orderid = orderids.Split(',');
                 string msg = "";
                 #endregion
+                List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
                 List<T_Bus_Order> orders = new List<T_Bus_Order>();
                 foreach (var it in orderid)
                 {
-                    T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it && new int[] { 1, 3, 4, 7 }.Contains(q.F_State));
+                    T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
+                    T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it && new int[] { 3, 4, 7 }.Contains(q.F_State));
                     if (modelOrder == null)
                     {
                        msg +="订单"+ modelOrder .F_Id + "已审核";
+                        continue;
                     }
                     else
                     {
-                        List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == modelOrder.F_Id, o => o.F_Sort, OrderByType.Asc);
-                        List<T_Bus_Product> Productlist = new List<T_Bus_Product>();
-                        if (detaillist != null && detaillist.Count > 0)
+                        if (modelOrder.F_State ==1)
                         {
-                            foreach (var iv in detaillist)
+                            List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == modelOrder.F_Id, o => o.F_Sort, OrderByType.Asc);
+                            List<T_Bus_Product> Productlist = new List<T_Bus_Product>();
+                            if (detaillist != null && detaillist.Count > 0)
                             {
-                                T_Bus_Product t_Bus_Product = await bus_productRepository.GetSingle(x => x.F_ProductId == iv.F_ProductId);
-                                if (t_Bus_Product != null)
+                                foreach (var iv in detaillist)
                                 {
-                                    t_Bus_Product.F_UseNumber -= iv.F_Count;
-                                    Productlist.Add(t_Bus_Product);
+                                    T_Bus_Product t_Bus_Product = await bus_productRepository.GetSingle(x => x.F_ProductId == iv.F_ProductId);
+                                    if (t_Bus_Product != null)
+                                    {
+                                        t_Bus_Product.F_UseNumber -= iv.F_Count;
+                                        Productlist.Add(t_Bus_Product);
+                                    }
+                                    else
+                                    {
+                                        msg += "订单" + modelOrder.F_Id + "退回失败,商品不存在.";
+                                        continue;
+                                    }
                                 }
+                                if (Productlist != null && Productlist.Count > 0)
+                                {
+                                    if (!await bus_productRepository.UpdateList(Productlist))
+                                    {
+                                        msg += "订单" + modelOrder.F_Id + "退回失败";
+                                        continue;
+                                    }
+                                 }
                                 else
                                 {
-                                    msg += "订单" + modelOrder.F_Id + "提交失败,商品不存在.";
+                                    msg += "订单" + modelOrder.F_Id + "退回失败,请选择商品";
+                                    continue;
+
                                 }
                             }
                         }
-                        if (msg == "")
-                        {
-                            if (Productlist != null && Productlist.Count > 0)
-                            {
-                                if (!await bus_productRepository.UpdateList(Productlist))
-                                    msg += "订单" + modelOrder.F_Id + "提交失败";
-                                else
-                                    modelOrder.F_State = state;
-                            }
-                            else
-                                msg += "订单" + modelOrder.F_Id + "提交失败,请选择商品";
-                        }
-                      
+                        modelOrder.F_State = state;
+                        t_Bus_Orderlogs.F_WoID = modelOrder.F_Id;
+                        t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                        t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                        t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "撤回订单";
+                        t_Bus_Orderlogs.F_WoState = modelOrder.F_State;
+                        logs.Add(t_Bus_Orderlogs);
                         orders.Add(modelOrder);
                     }
                   
                 }
-
-
             //    string strStock = await busOrderFunctionController.ChangeStockOne(modelOrder, 0, null);
              //   if (strStock != "1")
                  //   return Error(strStock);
              //   modelOrder.F_State = 0;
            //     modelOrder.F_Score = 0.00M;
-
                 if (msg =="")
                 {
+                    await busOrderlogsRepository.AddAndUpdateList(logs);
                     if (await bus_OrderRepository.UpdateList(orders))
                         return Success("订单成功审核！");
                 }

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderInput.cs

@@ -72,6 +72,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private int _f_isExpress = -1;
         private int _f_ispayment = -1;
         private string _f_membernotes;
+        private string _f_recommendertel = "";
 
         /// <summary>
         /// 客服是否选择快递 1已分配 0未分配
@@ -559,6 +560,16 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             get { return _f_membernotes; }
 
         }
+        /// <summary>
+        /// 推荐人手机号
+        /// </summary>
+        public string F_RecommenderTel
+        {
+            set { _f_recommendertel = value; }
+            get { return _f_recommendertel; }
+
+        }
+        
         public OrderMoneyInput OrderMoney { get; set; }
         #endregion Model
 

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

@@ -100,5 +100,20 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         public string city1 { get; set; } = "";
         public string belong { get; set; } = "";
         public string belongName { get; set; } = "";
-    }
+        /// <summary>
+        /// 省
+        /// </summary>				
+        public string province2 { get; set; } = "";
+        /// <summary>
+        /// 县、区
+        /// </summary>				
+        public string area2 { get; set; } = "";
+        public string city2 { get; set; } = "";
+        /// <summary>
+        /// 乡镇
+        /// </summary>				
+        public string town2 { get; set; } = "";
+        public string address2 { get; set; } = "";
+        public int F_RecommenderID { get; set; }
+}
 }