售后，客服操作

代码/System.IRepositories/Bus/IBus_ChatLogRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.Model.Bus;
+using System.Text;
+
+namespace System.IRepositories.Bus
+{
+    
+    public interface IBus_ChatLogRepository : IRepository<T_Bus_ChatLog>
+    {
+    }
+}

代码/System.IRepositories/Bus/IBus_HeadlessPartsRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.Model.Bus;
+using System.Text;
+
+namespace System.IRepositories.Bus
+{
+  
+    public interface IBus_HeadlessPartsRepository : IRepository<T_Bus_HeadlessParts>
+    {
+    }
+}

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

@@ -43,10 +43,37 @@ namespace System.Model
 		private string _f_customer = "";
 		private string _f_customerphone = "";
 		private int _f_vipid = 0;
-		/// <summary>
-		/// 售后编号
-		/// </summary>
-		public string F_Id
+        private string _f_kgremarks = "";
+        private string _f_reason = "";
+        private string _f_aspiration = "";
+        /// <summary>
+        /// 处理原因
+        /// </summary>
+        public string F_Reason
+        {
+            set { _f_reason = value; }
+            get { return _f_reason; }
+        }
+        /// <summary>
+        /// 客户意愿
+        /// </summary>
+        public string F_Aspiration
+        {
+            set { _f_aspiration = value; }
+            get { return _f_aspiration; }
+        }
+        /// <summary>
+        /// 仓库备注
+        /// </summary>
+        public string F_KGRemarks
+        {
+            set { _f_kgremarks = value; }
+            get { return _f_kgremarks; }
+        }
+        /// <summary>
+        /// 售后编号
+        /// </summary>
+        public string F_Id
 		{
 			set { _f_id = value; }
 			get { return _f_id; }

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

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Model.Bus
+{
+    [Serializable]
+    public partial class T_Bus_ChatLog
+    {
+        public T_Bus_ChatLog()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_woid;
+        private string _f_content;
+        private string _f_adduser;
+        private string _f_addusername;
+        private DateTime? _f_addtime;
+        private int? _f_isso;
+        private int? _f_isdelete;
+        private string _f_updateuser;
+        private string _f_updateusername;
+        private DateTime? _f_updatetime;
+        /// <summary>
+        /// auto_increment
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string  F_WoID
+        {
+            set { _f_woid = value; }
+            get { return _f_woid; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Content
+        {
+            set { _f_content = value; }
+            get { return _f_content; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_AddUser
+        {
+            set { _f_adduser = value; }
+            get { return _f_adduser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_AddUserName
+        {
+            set { _f_addusername = value; }
+            get { return _f_addusername; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_AddTime
+        {
+            set { _f_addtime = value; }
+            get { return _f_addtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_IsSo
+        {
+            set { _f_isso = value; }
+            get { return _f_isso; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_IsDelete
+        {
+            set { _f_isdelete = value; }
+            get { return _f_isdelete; }
+        }
+        public string F_UpdateUser
+        {
+            set { _f_updateuser = value; }
+            get { return _f_updateuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_UpdateUserName
+        {
+            set { _f_updateusername = value; }
+            get { return _f_updateusername; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_UpdateTime
+        {
+            set { _f_updatetime = value; }
+            get { return _f_updatetime; }
+        }
+        #endregion Model
+
+    }
+}

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

@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Model.Bus
+{
+    [Serializable]
+    public partial class T_Bus_HeadlessParts
+    {
+        public T_Bus_HeadlessParts()
+        { }
+        #region Model
+        private int _f_id;
+        private DateTime? _f_warehousingtime;
+        private string _f_customername;
+        private string _f_mobile;
+        private string _f_oddnumbers;
+        private string _f_express;
+        private string _f_returndetails;
+        private string _f_situation;
+        private string _f_customerremarks;
+        private string _f_remarks;
+        private DateTime? _f_creattime;
+        private string _f_creatuser;
+        private int? _f_state;
+        private DateTime? _f_updatetime;
+        private string _f_updateuser;
+        private DateTime? _f_confirmtime;
+        private string _f_confirmuser;
+        private string _f_confirmtel;
+        /// <summary>
+        /// auto_increment
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_WarehousingTime
+        {
+            set { _f_warehousingtime = value; }
+            get { return _f_warehousingtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CustomerName
+        {
+            set { _f_customername = value; }
+            get { return _f_customername; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Mobile
+        {
+            set { _f_mobile = value; }
+            get { return _f_mobile; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_OddNumbers
+        {
+            set { _f_oddnumbers = value; }
+            get { return _f_oddnumbers; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Express
+        {
+            set { _f_express = value; }
+            get { return _f_express; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ReturnDetails
+        {
+            set { _f_returndetails = value; }
+            get { return _f_returndetails; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Situation
+        {
+            set { _f_situation = value; }
+            get { return _f_situation; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CustomerRemarks
+        {
+            set { _f_customerremarks = value; }
+            get { return _f_customerremarks; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Remarks
+        {
+            set { _f_remarks = value; }
+            get { return _f_remarks; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_CreatTime
+        {
+            set { _f_creattime = value; }
+            get { return _f_creattime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CreatUser
+        {
+            set { _f_creatuser = value; }
+            get { return _f_creatuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_State
+        {
+            set { _f_state = value; }
+            get { return _f_state; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_UpdateTime
+        {
+            set { _f_updatetime = value; }
+            get { return _f_updatetime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_UpdateUser
+        {
+            set { _f_updateuser = value; }
+            get { return _f_updateuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_ConfirmTime
+        {
+            set { _f_confirmtime = value; }
+            get { return _f_confirmtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ConfirmUser
+        {
+            set { _f_confirmuser = value; }
+            get { return _f_confirmuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ConfirmTel
+        {
+            set { _f_confirmtel = value; }
+            get { return _f_confirmtel; }
+        }
+        #endregion Model
+
+    }
+}

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

@@ -579,6 +579,7 @@ namespace System.Model
             get { return _f_membernotes; }
 
         }
+     
         #endregion Model
 
     }

代码/System.Repositories/Bus/Bus_ChatLogRepository.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.IRepositories.Bus;
+using System.Model.Bus;
+using System.Text;
+
+namespace System.Repositories.Bus
+{
+    
+    public class Bus_ChatLogRepository : BaseRepository<T_Bus_ChatLog>, IBus_ChatLogRepository
+    {
+    }
+}

代码/System.Repositories/Bus/Bus_HeadlessPartsRepository.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.IRepositories;
+using System.IRepositories.Bus;
+using System.Model.Bus;
+using System.Text;
+
+namespace System.Repositories.Bus
+{
+  
+    public class Bus_HeadlessPartsRepository : BaseRepository<T_Bus_HeadlessParts>, IBus_HeadlessPartsRepository
+    {
+    }
+}

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallFunctionController.cs

@@ -37,10 +37,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         private readonly ISys_AutoDialRepository sys_autodialrepository;
         private readonly ISys_SystemConfigRepository busSystemConfigRepository;
         private readonly ICus_VipInfoRepository _cus_vip_infoRepository;//客户
-       
+        private readonly IBus_AfterSaleRepository busAfterSaleRepository;
         public CallFunctionController(ISys_SystemConfigRepository _busSystemConfigRepository,ICDRRepository _busCdrRepository,ICall_CallRecordsRepository _busCallRecordsRepository,IConfiguration _configuration, ISys_MobileDataRepository _busMobileDataRepository, ICus_VipInfoRepository cus_vip_infoRepository,
             ICall_CallOutboundRepository _CallOutboundRecordsRepository, Iauto_cdrRepository _auto_cdrRepository
-            , ItaskRepository _taskRepository, ISys_AutoDialRepository _sys_autodialrepository
+            , ItaskRepository _taskRepository, ISys_AutoDialRepository _sys_autodialrepository, IBus_AfterSaleRepository _busAfterSaleRepository
            )
         {
             busSystemConfigRepository = _busSystemConfigRepository;
@@ -53,7 +53,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             auto_cdrRepository = _auto_cdrRepository;
             taskRepository = _taskRepository;
             sys_autodialrepository = _sys_autodialrepository;
-           
+            busAfterSaleRepository = _busAfterSaleRepository;
         }
        
         /// <summary>
@@ -385,7 +385,44 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             }
             return $"同步情况  成功/总数 = {n1}/{totle}";
         }
+        /// <summary>
+        /// 同步仓库
+        /// </summary>
+        /// <returns></returns>
+        [NonAction]
+        internal async Task<string> AfterSale()
+        {
+            List<T_Bus_AfterSale > modellist = await busAfterSaleRepository.GetListALL(q => q.F_CheckStateSH == 0&& q.F_State ==0);
+            int totle = 0;
+            int n1 = 0;
+            if (modellist != null && modellist.Count > 0)
+            {
+                DateTime t1 = DateTime.Now;
+                List<T_Bus_AfterSale> afterSales = new List<T_Bus_AfterSale>();
+               foreach (var it in modellist)
+                {   
+                    try
+                    {
+                        if ((int)DateTimeConvert.DateDiff(DateInterval.Day, (DateTime)it.F_CheckTimeSH, DateTime.Now) > 60)
+                        {
+                            it.F_CheckStateKG = 3;
+                            it.F_KGRemarks = "超过60天退回";
+                            it.F_CheckTimeKG = DateTime.Now;
+                            afterSales.Add(it);
+                            n1++;
+                        }
+                    }
+                    catch
+                    {
 
+                    }
+                    totle++;
+                }
+                await busAfterSaleRepository.AddAndUpdateList(afterSales);
+            }
+            return $"同步情况  成功/总数 = {n1}/{totle}";
+        }
+        
         /// <summary>
         /// 同步外呼状态
         /// </summary>

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

@@ -486,7 +486,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 { modelAfterSale.F_DetailList = input.F_DetailList; }
                 if (!string.IsNullOrEmpty(input.F_OldDetailList))
                 { modelAfterSale.F_OldDetailList = input.F_OldDetailList; }
-
+                modelAfterSale.F_Reason = input.F_Reason;
+                modelAfterSale.F_Aspiration = input.F_Aspiration;
                 modelAfterSale.F_AddTime = DateTime.Now;
                 modelAfterSale.F_CheckTimeSH = DateTime.Now;
                 modelAfterSale.F_CheckStateSH = input.F_CheckStateSH;
@@ -495,7 +496,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
                 modelAfterSale.F_CheckUserXS = modelOrder.F_AddUser;
 
-
+               
                 modelAfterSale.F_Type = input.F_Type;
                 modelAfterSale.F_Money = input.F_Money;
 
@@ -806,7 +807,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelAfterSale.F_CheckStateSH = input.F_CheckStateSH;
                 modelAfterSale.F_CheckUserSH = UserLogin.UserId.ObjToInt();
                 modelAfterSale.F_CheckUserNameSH = UserLogin.UserName;
-
+                modelAfterSale.F_Reason = input.F_Reason;
+                modelAfterSale.F_Aspiration = input.F_Aspiration;
                 modelAfterSale.F_CheckUserXS = modelOrder.F_AddUser;
 
                 modelAfterSale.F_Type = input.F_Type;
@@ -1006,13 +1008,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("getaftersalebypagesh")]
-        public async Task<IActionResult> GetAfterSaleByPageSH(AfterSaleInput input)
+        public async Task<IActionResult> GetAfterSaleByPageSH(AfterSaleInput input,string user="")
         {
 
             #region  拼接条件
 
-            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckUserSH == UserLogin.UserId.ObjToInt()&&a.F_State>-1;
-
+            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_State>-1;
+           
 
             //if (input.F_CheckStateXS > -2)
             //{
@@ -1022,6 +1024,27 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 eq = eq.And(a => a.F_CheckStateSH == input.F_CheckStateSH);
             }
+            if (UserLogin.RoleCode == "XS")
+            {
+                eq = eq.And(a => a.F_CheckUserXS == UserLogin.UserId.ObjToInt());
+            }
+            if (input.F_CheckStateKG>0)
+            {
+                if (input.F_CheckStateKG==1)
+                    eq = eq.And(a => a.F_CheckStateKG ==1);
+                else
+                    eq = eq.And(a => a.F_CheckStateKG != 1);
+
+
+            }
+            if (user=="")
+            {
+                eq = eq.And(a => a.F_CheckUserSH == UserLogin.UserId.ObjToInt());
+            }
+            else
+            {
+                eq = eq.And(a => a.F_CheckUserNameSH  == user);
+            }
             if (input.F_State > -2)
             {
                 eq = eq.And(a => a.F_State == input.F_State);
@@ -1147,6 +1170,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_ADFrom", ConditionalType = ConditionalType.Equal, FieldValue = input.F_ADFrom });
             }
+           
             if (!string.IsNullOrEmpty(input.F_Type))
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Type });
@@ -1420,11 +1444,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     return Error("不能重复审核提交");
                 }
                 modelAfterSale.F_CheckStateKG = input.F_CheckStateKG;
-
+                modelAfterSale.F_KGRemarks = input.F_KGRemarks;
                 modelAfterSale.F_CheckTimeKG = DateTime.Now;
                 modelAfterSale.F_CheckUserKG = UserLogin.UserId.ObjToInt();
                 modelAfterSale.F_CheckUserNameKG = UserLogin.UserName;
                 modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
+                modeOrder.F_ExpressFee = input.F_ExpressFee;
                 List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
 
                 //1收到货（根据状态自动创建订单）2货物不符3未收到货

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

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.IRepositories.Bus;
+using System.Linq;
+using System.Model.Bus;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+
+namespace TVShoppingCallCenter_ZLJ.Controllers.Order
+{
+  
+    [Produces("application/json")]
+    [Route("api/[controller]")]
+    public class ChatLogController : BaseController
+    {
+        private readonly IBus_ChatLogRepository bus_ChatLogRepository;
+        public ChatLogController(IBus_ChatLogRepository _bus_ChatLogRepository
+         )
+        {
+            bus_ChatLogRepository = _bus_ChatLogRepository;
+        }
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("add")]
+        public async Task<IActionResult> AddAsync(T_Bus_ChatLog input)
+        {
+            if (string.IsNullOrEmpty(input.F_Content ))
+                return Error("请输入备注内容");
+            if (string.IsNullOrEmpty(input.F_WoID))
+                return Error("请选择工单");
+            input.F_AddTime = DateTime.Now;
+            input.F_AddUser = UserLogin.UserId;
+            input.F_AddUserName = UserLogin.UserName;
+            input.F_IsDelete = 0;
+            if (await bus_ChatLogRepository.Add(input) > 0)
+            {
+                return Success("添加成功");
+            }
+            return Error("添加失败");
+        }
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("update")]
+        public async Task<IActionResult> updateAsync(T_Bus_ChatLog input)
+        {
+            if (string.IsNullOrEmpty(input.F_Content))
+                return Error("请输入备注内容");
+            if (string.IsNullOrEmpty(input.F_WoID))
+                  return Error("请选择工单");
+            if (input.F_ID <= 0)
+                return Error("参数错误");
+            var model = await bus_ChatLogRepository.GetSingle(x => x.F_ID == input.F_ID);
+            if (model == null)
+                return Error("参数错误");
+            input.F_UpdateTime  = DateTime.Now;
+            input.F_UpdateUser  = UserLogin.UserId;
+            input.F_UpdateUserName  = UserLogin.UserName;
+            input.F_IsDelete = model .F_IsDelete ;
+            input.F_AddTime = model.F_AddTime;
+            input.F_AddUser = model.F_AddUser;
+            input.F_AddUserName = model.F_AddUserName;
+            if (await bus_ChatLogRepository.Update(model))
+            {
+                return Success("修改成功");
+            }
+            return Error("修改失败");
+        }
+        /// <summary>
+        /// 删除无头件
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpPost("delete")]
+        public async Task<IActionResult> Remove(string orderids)
+        {
+            List<T_Bus_ChatLog> modellist = new List<T_Bus_ChatLog>();
+            var res = 0;
+            string[] ids = orderids.Split(',');
+            if (ids != null && ids.Length > 0)
+            {
+                try
+                {
+                    foreach (var item in ids)
+                    {
+                        var model = await bus_ChatLogRepository.GetSingle(x => x.F_ID == int.Parse(item));
+                        model.F_IsDelete  =1;
+                        modellist.Add(model);
+                    }
+                }
+                catch
+                {
+                    return Error("删除失败");
+                }
+                if (modellist != null && modellist.Count > 0)
+                {
+                    if (await bus_ChatLogRepository.UpdateListToColumns(modellist, s => new { s.F_IsDelete  }))
+                    {
+                        return Success("成功");
+                    }
+                }
+                else
+                {
+                    return Success("内容为空");
+                }
+
+            }
+            return Error("删除失败");
+
+        }
+    }
+}

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

@@ -0,0 +1,297 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.Common.Helpers;
+using System.IRepositories;
+using System.IRepositories.Bus;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Model;
+using System.Model.Bus;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using TVShoppingCallCenter_ZLJ.Models.Inputs.Order;
+
+namespace TVShoppingCallCenter_ZLJ.Controllers.Order
+{
+   
+    [Produces("application/json")]
+    [Route("api/[controller]")]
+    public class HeadlessPartsController : BaseController
+    {
+        private readonly IBus_HeadlessPartsRepository bus_HeadlessPartsRepository;
+        private readonly IBus_ProductRepository _productRepository;
+        public HeadlessPartsController(IBus_HeadlessPartsRepository _bus_HeadlessPartsRepository
+        , IBus_ProductRepository productRepository)
+        {
+            bus_HeadlessPartsRepository = _bus_HeadlessPartsRepository;
+            _productRepository = productRepository;
+        }
+        /// <summary>
+        /// 添加无头件
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("add")]
+        public async Task<IActionResult> AddAsync(HeadlessPartsInput input)
+        {
+            if (string.IsNullOrEmpty(input.F_Mobile ))
+                return Error("请输入订购电话");
+            T_Bus_HeadlessParts model = new T_Bus_HeadlessParts();
+            model.F_Mobile = input.F_Mobile;
+            model.F_WarehousingTime = input.F_WarehousingTime;
+            model.F_CustomerName = input.F_CustomerName;
+            model.F_OddNumbers = input.F_OddNumbers;
+            model.F_Express = input.F_Express;
+            model.F_ReturnDetails = input.F_ReturnDetails;
+            model.F_Situation = input.F_Situation;
+            model.F_CustomerRemarks = input.F_CustomerRemarks;
+            model.F_Remarks = input.F_Remarks;
+            model.F_CreatTime = DateTime .Now ;
+            model .F_CreatUser = UserLogin.UserCode ;
+            model.F_State  = 0;
+            if (await bus_HeadlessPartsRepository.Add (model)>0)
+            {
+                return Success("添加成功" );
+            }
+            return Error("添加失败");
+        }
+        /// <summary>
+        /// 修改无头件
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("update")]
+        public async Task<IActionResult> updateAsync(HeadlessPartsInput input)
+        {
+            if (string.IsNullOrEmpty(input.F_Mobile))
+                return Error("请输入订购电话");
+            if (input.F_ID <= 0)
+                return Error("参数错误");
+            var model = await bus_HeadlessPartsRepository.GetSingle(x => x.F_ID == input.F_ID);
+            if (model==null )
+                return Error("参数错误");
+            model.F_Mobile = input.F_Mobile;
+            model.F_WarehousingTime = input.F_WarehousingTime;
+            model.F_CustomerName = input.F_CustomerName;
+            model.F_OddNumbers = input.F_OddNumbers;
+            model.F_Express = input.F_Express;
+            model.F_ReturnDetails = input.F_ReturnDetails;
+            model.F_Situation = input.F_Situation;
+            model.F_CustomerRemarks = input.F_CustomerRemarks;
+            model.F_Remarks = input.F_Remarks;
+            model.F_UpdateTime = DateTime.Now;
+            model .F_UpdateUser = UserLogin.UserCode;
+            model.F_CreatTime = model.F_CreatTime;
+            model.F_CreatUser = model.F_CreatUser;
+            model.F_ConfirmTel = model.F_ConfirmTel;
+            model.F_ConfirmTime   = model.F_ConfirmTime;
+            model.F_ConfirmUser  = model.F_ConfirmUser;
+            model.F_State = model.F_State ;
+            if (await bus_HeadlessPartsRepository.Update (model))
+            {
+                return Success("修改成功");
+            }
+            return Error("修改失败");
+        }
+        /// <summary>
+        /// 确认无头件
+        /// </summary>
+        /// <param name="id">id</param>
+        /// <returns></returns>
+        [HttpPost("operation")]
+        public async Task<IActionResult> GetOperationAsync(int id, string tel)
+        {
+            if (id <= 0)
+                return Error("参数错误");
+
+            var model = await bus_HeadlessPartsRepository.GetSingle(x => x.F_ID  == id);
+            if (model == null)
+            {
+                return Error("获取失败");
+            }
+            model.F_ConfirmTel = tel;
+            model.F_ConfirmTime = DateTime.Now;
+            model .F_ConfirmUser = model.F_ConfirmUser;
+            model.F_State = 1;
+            var obj = await bus_HeadlessPartsRepository.Update(model);
+            if (obj)
+                return Success("操作成功");
+            else
+                return Error("操作失败");
+        }
+        /// <summary>
+        /// 删除无头件
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpPost("delete")]
+        public async Task<IActionResult> Remove(string orderids)
+        {
+            List<T_Bus_HeadlessParts> modellist = new List<T_Bus_HeadlessParts>();
+            var res = 0;
+            string[] ids = orderids.Split(',');
+            if (ids != null && ids.Length > 0)
+            {
+                try
+                {
+                    foreach (var item in ids)
+                    {
+                        var model = await bus_HeadlessPartsRepository.GetSingle(x => x.F_ID == int.Parse(item));
+                        model.F_State = -1;
+                        modellist.Add(model);
+                    }
+                }
+                catch
+                {
+                    return Error("删除失败");
+                }
+                if (modellist != null && modellist.Count > 0)
+                {
+                    if (await bus_HeadlessPartsRepository.UpdateListToColumns(modellist, s => new { s.F_State }))
+                    {
+                        return Success("成功");
+                    }
+                }
+                else
+                {
+                    return Success("内容为空");
+                }
+
+            }
+            return Error("删除失败");
+                
+        }
+
+
+
+        /// <summary>
+        /// 根据分页获取列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getbypage")]
+        public async Task<IActionResult> GetByPage(DateTime SearchEndTime,DateTime SearchStartTime, DateTime StartWarehousingTime, DateTime EndWarehousingTime,string  Key,string produt,int state=-1,
+            int pageindex=1,int pagesize=10)
+        {
+            #region  拼接条件
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
+            if (state>-1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = state+"" });
+            }
+            if (SearchEndTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_CreatTime", ConditionalType = ConditionalType.LessThan, FieldValue = SearchEndTime.ToString("yyyy-MM-dd 23:59:59") });
+            }
+            if (SearchStartTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_CreatTime", ConditionalType = ConditionalType.GreaterThan, FieldValue =SearchStartTime.ToString("yyyy-MM-dd 00:00:01") });
+            }
+            if (StartWarehousingTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_WarehousingTime", ConditionalType = ConditionalType.LessThan, FieldValue = SearchEndTime.ToString("yyyy-MM-dd 23:59:59") });
+            }
+            if (EndWarehousingTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_WarehousingTime", ConditionalType = ConditionalType.GreaterThan, FieldValue = SearchStartTime.ToString("yyyy-MM-dd 00:00:01") });
+            }
+            if (!string .IsNullOrEmpty (produt))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_ReturnDetails", ConditionalType = ConditionalType.Like , FieldValue = produt });
+            }
+            if (!string .IsNullOrEmpty (Key))
+            {
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_CustomerName", ConditionalType = ConditionalType.Like , FieldValue = Key}),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_Mobile", ConditionalType = ConditionalType.Like , FieldValue = Key}),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_OddNumbers", ConditionalType = ConditionalType.Like , FieldValue = Key}),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_Express", ConditionalType = ConditionalType.Like , FieldValue = Key}),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_Situation", ConditionalType = ConditionalType.Like , FieldValue = Key}),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_CustomerRemarks", ConditionalType = ConditionalType.Like , FieldValue = Key})
+                     }
+                });
+            }
+            #endregion
+            RefAsync<int> recordCount = 0;
+            PageData<T_Bus_HeadlessParts > list = await bus_HeadlessPartsRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, " F_CreatTime ASC");
+            PageData<HeadlessPartsInput> returnobj = new PageData<HeadlessPartsInput>() { Totals = list.Totals };
+            List<HeadlessPartsInput> returnlist = new List<HeadlessPartsInput>();
+            foreach (T_Bus_HeadlessParts t in list.Rows)
+            {
+                HeadlessPartsInput m = new HeadlessPartsInput();
+                ModelConvertHelper<HeadlessPartsInput, T_Bus_HeadlessParts>.ModeToModel(m, t);
+                if (!string.IsNullOrEmpty(t.F_ReturnDetails ))
+                {
+                    string[] F_DetailList = t.F_ReturnDetails .Split("|");
+                    
+                    foreach (string a1 in F_DetailList)
+                    {
+                        string[] F_Detail = a1.Split(",");
+                        string productid = F_Detail[0];
+                        string count = F_Detail[1];
+                        var modelProduct = await _productRepository .GetSingle(q => q.F_ProductId == productid);
+                        if (modelProduct != null)
+                        {
+                            if (!string .IsNullOrEmpty ( m.Produt))
+                                m.Produt += modelProduct.F_ProductName;
+                            else
+                                m.Produt +=","+ modelProduct.F_ProductName;
+                        }
+                    }
+                }
+                returnlist.Add(m);
+            }
+            return Success("成功", returnlist);
+
+        }
+
+        /// <summary>
+        /// 获取无头件详情
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getshdetail")]
+        public async Task<IActionResult> GetSHDetail(int id)
+        {
+            if (id<=0)
+            {
+                return Error("请选择无头件");
+            }
+
+            T_Bus_HeadlessParts model = await bus_HeadlessPartsRepository.GetSingle(a => a.F_ID  == id  && a.F_State > -1);
+            if (model != null)
+            {
+                if (!string.IsNullOrEmpty(model.F_ReturnDetails ))
+                {
+                    string[] F_DetailList = model.F_ReturnDetails.Split("|");
+                    model.F_ReturnDetails = "";
+                    foreach (string a1 in F_DetailList)
+                    {
+                        string[] F_Detail = a1.Split(",");
+                        string productid = F_Detail[0];
+                        string count = F_Detail[1];
+                        var modelProduct = await _productRepository .GetSingle(q => q.F_ProductId == productid);
+                        if (modelProduct != null)
+                        {
+                            model.F_ReturnDetails = $"{model.F_ReturnDetails}|{productid},{count},{modelProduct.F_ProductName}";
+                        }
+                        else
+                        {
+                            model.F_ReturnDetails = $"{model.F_ReturnDetails}|{productid},{count},空货";
+                        }
+                    }
+                }
+              
+            }
+            return Success("成功", model);
+
+        }
+    }
+}

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

@@ -297,10 +297,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 return Error("请输入订单号");
             if (!(state == 4 || state == 5 || state == 6))
                 return Error("操作类型不正确");
-
             #endregion
-           
-
             T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && new[] { 3, 4, 5 }.Contains(q.F_State));
             if (modelOrder == null)
             {
@@ -326,10 +323,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelOrder.F_SendUser = UserLogin.UserId.ObjToInt();
                 modelOrder.F_SendUserName = UserLogin.UserName;
             }
-
             modelOrder.F_State = state;
-
-
             if (await bus_OrderRepository.Update(modelOrder))
                 return Success("订单成功审核！");
             return Error("订单审核失败,请汇报技术支持！");

代码/TVShoppingCallCenter_ZLJ/Controllers/hangfire/HangfireController.cs

@@ -209,7 +209,18 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.hangfire
             str = await busCallFunctionController.SyncAutodial();
             return Success(str);
         }
-        
+        /// <summary>
+        /// 同步仓库未操作
+        /// </summary>
+        /// <returns></returns>
+        [NonAction]
+        public async Task<IActionResult> AfterSale()
+        {
+            string str = "";
+            //
+            str = await busCallFunctionController.AfterSale();
+            return Success(str);
+        }
         #region 月12循环 
 
         /// <summary>

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

@@ -180,7 +180,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 			get { return _f_money; }
 		}
 		/// <summary>
-		/// 售后状态-1无效0未完成1已完成  主要涉及财务退款（新订单生成）操作
+		/// 售后状态-1无效0未完成1已完成  主要涉及财务退款（新订单生成）操作2仓库待审核
 		/// </summary>
 		public int F_State
 		{
@@ -307,8 +307,13 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 			set { _f_vipid = value; }
 			get { return _f_vipid; }
 		}
-		#endregion Model
+        public string F_KGRemarks { get; set; }
+        public decimal    F_ExpressFee { get; set; }
+        public string F_Reason { get; set; }
+        public string F_Aspiration { get; set; }
+      
+        #endregion Model
 
-	}
+    }
 }
 

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

@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs.Order
+{
+    public class HeadlessPartsInput: BaseInput
+    {
+        private int _f_id;
+        private DateTime? _f_warehousingtime;
+        private string _f_customername;
+        private string _f_mobile;
+        private string _f_oddnumbers;
+        private string _f_express;
+        private string _f_returndetails;
+        private string _f_situation;
+        private string _f_customerremarks;
+        private string _f_remarks;
+        private DateTime? _f_creattime;
+        private string _f_creatuser;
+        private int? _f_state;
+        private DateTime? _f_updatetime;
+        private string _f_updateuser;
+        private DateTime? _f_confirmtime;
+        private string _f_confirmuser;
+        private string _f_confirmtel;
+        /// <summary>
+        /// auto_increment
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_WarehousingTime
+        {
+            set { _f_warehousingtime = value; }
+            get { return _f_warehousingtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CustomerName
+        {
+            set { _f_customername = value; }
+            get { return _f_customername; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Mobile
+        {
+            set { _f_mobile = value; }
+            get { return _f_mobile; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_OddNumbers
+        {
+            set { _f_oddnumbers = value; }
+            get { return _f_oddnumbers; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Express
+        {
+            set { _f_express = value; }
+            get { return _f_express; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ReturnDetails
+        {
+            set { _f_returndetails = value; }
+            get { return _f_returndetails; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Situation
+        {
+            set { _f_situation = value; }
+            get { return _f_situation; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CustomerRemarks
+        {
+            set { _f_customerremarks = value; }
+            get { return _f_customerremarks; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Remarks
+        {
+            set { _f_remarks = value; }
+            get { return _f_remarks; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_CreatTime
+        {
+            set { _f_creattime = value; }
+            get { return _f_creattime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CreatUser
+        {
+            set { _f_creatuser = value; }
+            get { return _f_creatuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_State
+        {
+            set { _f_state = value; }
+            get { return _f_state; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_UpdateTime
+        {
+            set { _f_updatetime = value; }
+            get { return _f_updatetime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_UpdateUser
+        {
+            set { _f_updateuser = value; }
+            get { return _f_updateuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_ConfirmTime
+        {
+            set { _f_confirmtime = value; }
+            get { return _f_confirmtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ConfirmUser
+        {
+            set { _f_confirmuser = value; }
+            get { return _f_confirmuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ConfirmTel
+        {
+            set { _f_confirmtel = value; }
+            get { return _f_confirmtel; }
+        }
+        public string Produt { get; set; }
+    }
+}

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -156,7 +156,8 @@ namespace TVShoppingCallCenter_ZLJ
             services.AddTransient<ICDRRepository, CDRRepository>(); 
             services.AddTransient<ISysUser_GradeRepository, SysUser_GradeRepository>();
             services.AddTransient<ISysUser_TeamGradeRepository, SysUser_TeamGradeRepository>();
-
+           
+            
             services.AddHangfire(x => x.UseStorage(new MySqlStorage(BaseContext.DB_ConnectionString, new MySqlStorageOptions
             {
                 TransactionIsolationLevel = IsolationLevel.ReadCommitted,
@@ -216,6 +217,8 @@ namespace TVShoppingCallCenter_ZLJ
             services.AddTransient<ISys_BottomNumberRepository, Sys_BottomNumberRepository>();
             services.AddTransient<ICus_MembershipRepository, Cus_MembershipRepository>();
             services.AddTransient<IBus_OrderlogsRepository, Bus_OrderlogsRepository>();
+            services.AddTransient<IBus_HeadlessPartsRepository, Bus_HeadlessPartsRepository>();
+            services.AddTransient<IBus_ChatLogRepository, Bus_ChatLogRepository>();
             #endregion
 
 
@@ -271,6 +274,7 @@ namespace TVShoppingCallCenter_ZLJ
             RecurringJob.AddOrUpdate<HangfireController>(a => a.MinutelyRecurring(), Cron.Minutely, TimeZoneInfo.Local, "minutely");
             RecurringJob.AddOrUpdate<HangfireController>(a => a.MinutelyOutbound(), Cron.Minutely, TimeZoneInfo.Local, "outbound");
             RecurringJob.AddOrUpdate<HangfireController>(a => a.AutodialOutbound(), Cron.Minutely, TimeZoneInfo.Local, "autodial");
+            RecurringJob.AddOrUpdate<HangfireController>(a => a.AutodialOutbound(), Cron.Monthly , TimeZoneInfo.Local, "autodial");
             //秒 分 时 日   *每
             RecurringJob.AddOrUpdate<HangfireController>(a => a.Month12Recurring(), "0 0 0 12 * ?", TimeZoneInfo.Local, "month12");
             #region steeltoe