更换名称

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

@@ -25,7 +25,7 @@ using TVShoppingCallCenter_ZLJ.Models.Inputs;
 namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 {
     [Route("api/order")]
-    public class KGOrderController : BaseController
+    public class KFOrderController : BaseController
     {
         private readonly IBus_OrderDetailRepository bus_OrderDetailRepository;
         private readonly IBus_OrderRepository bus_OrderRepository;
@@ -36,7 +36,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         private readonly ICus_ScoreSetRepository cus_score_setRepository;
         private readonly IConfiguration config;
         private readonly OrderFunctionController busOrderFunctionController;
-        public KGOrderController(OrderFunctionController _OrderFunctionController, ICus_ScoreSetRepository _cus_score_setRepository, IBus_StockLogRepository _bus_StockLogRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, ISys_MarketingRepository _bus_MarketingRepository, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IConfiguration _configuration)
+        public KFOrderController(OrderFunctionController _OrderFunctionController, ICus_ScoreSetRepository _cus_score_setRepository, IBus_StockLogRepository _bus_StockLogRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, ISys_MarketingRepository _bus_MarketingRepository, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IConfiguration _configuration)
         {
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
@@ -47,40 +47,144 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             cus_score_setRepository = _cus_score_setRepository;
             config = _configuration;
             busOrderFunctionController = _OrderFunctionController;
-        }
+        } 
+
+
+        
+
+
+        #region 客服操作
+
+
+        /// <summary>
+        /// 订单二审 审完 走发货
+        /// </summary>
+        /// <param name="orderid">订单号</param>
+        /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4KG退回 5已分拣 6已发货</param>
+        /// <param name="remark">客服备注</param>
+        /// <returns></returns>
+        [HttpPost("/api/order/checkorderbykf")]
+        public async Task<IActionResult> CheckOrderKF(string orderid, int state, string remark)
+        {
+            try
+            {
+                //状态变化  积分变化  处理时间人变化  库存变化  备注
+                T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
+                #region 验证参数 必填项  
+
+                if (string.IsNullOrEmpty(orderid))
+                    return Error("请输入订单号");
+                if (state <= 0)
+                    return Error("请选择操作类型");
+
+                #endregion
 
 
+                T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && q.F_State == 1);
+
+                if (modelOrder == null)
+                {
+                    return Error("订单已审核");
+                }
+                modelOrder.F_CheckTime = DateTime.Now;
+                modelOrder.F_CheckUser = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
+                modelOrder.F_CheckUserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
+                if(!string.IsNullOrEmpty(remark))
+                    modelOrder.F_CheckRemark = remark;
+                if (state == 2)
+                {
+                    string strStock = await busOrderFunctionController.ChangeStockOne(modelOrder, 2, null);
+                    modelOrder.F_State = 2;
+                    modelOrder.F_Score = 0.00M;
+                }
+                else if (state == 3)
+                {
+                    #region 判断积分
+                    bool blScore = false;
+                    if (modelOrder.F_UseScore > 0)
+                    {
+                        //退回积分  查询批次号核算积分是否已经解冻
+                        modelvip = await cus_vip_infoRepository.GetSingle(q => q.F_ID == modelOrder.F_VipId);
+                        modelvip.F_Score = modelvip.F_Score + modelOrder.F_UseScore;
+                        if (await cus_vip_infoRepository.Update(modelvip))
+                        {
+                            //log 或者解冻积分
+                            blScore = true;
+                        }
+                    }
+                    else
+                    {
+                        blScore = true;
+                    }
+                    if (!blScore)
+                    {
+                        return Error("积分处理失败");
+                    }
+                    #endregion
+                    //库存不做处理
+                    modelOrder.F_State = 3;
+                }
+                if (await bus_OrderRepository.Update(modelOrder))
+                    return Success("订单成功审核！");
+                return Error("订单审核失败,请汇报技术支持！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+
+
+        }
 
-        #region  库管操作  退回  分拣  发货
 
         /// <summary>
         /// 获取订单分页列表
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost("getorderlistbykgpage")]
-        public async Task<IActionResult> GetOrderListByKGPage(OrderInput input)
+        [HttpPost("/api/order/getorderlistbykfpage")]
+        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input)
         {
 
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
 
 
-            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "3" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
 
+            //状态
+            if (input.F_State > -1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
+            }
             //根据角色展示列表
             if (UserLogin.RoleCode == "ZX")
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
-            else if (UserLogin.RoleCode == "KF" && input.F_State != 1)
+            else if (UserLogin.RoleCode == "KF")
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "1" })
+                     }
+                });
+               // conModels.Add(new ConditionalModel() { FieldName = "", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
-            else if (UserLogin.RoleCode == "KG" && input.F_State != 3)
+            else if (UserLogin.RoleCode == "KG")
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
-                //OR  conModels.Add(new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                //conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "3" })
+                     }
+                });
             }
             if (!string.IsNullOrEmpty(input.F_ADFrom))
             {
@@ -179,73 +283,121 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
             returnobj.Rows = returnlist;
 
-
             return Success("成功", returnobj);
 
 
         }
 
-
-
         /// <summary>
-        /// 订单二审 审完 走发货
+        /// 修改订单 
         /// </summary>
-        /// <param name="orderid">订单号</param>
-        /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4无货 5已分拣 6已发货</param>
-        /// <param name="remark">客服备注</param>
+        /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost("checkorderbykg")]
-        public async Task<IActionResult> CheckOrderKG(string orderid, int state, string remark)
+        [HttpPost("/api/order/editorderkf")]
+        public async Task<IActionResult> EditOrderKF([FromBody]OrderInput input)
         {
-            //状态变化  积分变化  处理时间人变化  库存变化  备注
             T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
             #region 验证参数 必填项  
 
-            if (string.IsNullOrEmpty(orderid))
-                return Error("请输入订单号");
-            if (!(state == 4 || state == 5 || state == 6))
-                return Error("操作类型不正确");
-
+            if (string.IsNullOrEmpty(input.F_ADFrom))
+                return Error("请输入选择广告来源");
+            if (string.IsNullOrEmpty(input.F_Type))
+                return Error("请输入选择订单类型");
+            if (string.IsNullOrEmpty(input.F_Id))
+                return Error("请输入订单编号");
+            if (string.IsNullOrEmpty(input.F_Customer))
+                return Error("请输入客户姓名");
+            if (string.IsNullOrEmpty(input.F_CustomerPhone))
+                return Error("请输入客户电话");
             #endregion
 
 
-            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && new[] { 3, 4, 5 }.Contains(q.F_State));
+            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_Id);
             if (modelOrder == null)
             {
-                return Error("订单已审核");
+                return Error("此订单号不存在");
             }
-
-            if (modelOrder.F_State == 3 || modelOrder.F_State == 4)
+            //保存 审退回 仓退回
+            if (!(new int[] { 1, 3 }.Contains(modelOrder.F_State)))
             {
-                modelOrder.F_StockTime = DateTime.Now;
-                modelOrder.F_StockUser = UserLogin.UserId.ObjToInt();
-                modelOrder.F_StockUserName = UserLogin.UserName;
-                modelOrder.F_CheckRemark = modelOrder.F_CheckRemark + remark;
+                return Error("已提交订单不允许修改，先撤回订单");
             }
+            #region 数据绑定
+            //必填
+            modelOrder.F_ADFrom = input.F_ADFrom;
+            modelOrder.F_Type = input.F_Type;
+            modelOrder.F_Id = input.F_Id;
+
+
+            if (input.F_RecommendId > 0)
+            { modelOrder.F_RecommendId = input.F_RecommendId; }
+            if (input.F_CustomerType > 0)
+            { modelOrder.F_CustomerType = input.F_CustomerType; }
+            if (!string.IsNullOrEmpty(input.F_CustomerTel))
+            { modelOrder.F_CustomerTel = input.F_CustomerTel; }
+            //选填 快递属性
+            if (!string.IsNullOrEmpty(input.F_TrackingNo))
+            { modelOrder.F_TrackingNo = input.F_TrackingNo; }
+            if (!string.IsNullOrEmpty(input.F_Addressee))
+            { modelOrder.F_Addressee = input.F_Addressee; }
+            if (!string.IsNullOrEmpty(input.F_AddPhone))
+            { modelOrder.F_AddPhone = input.F_AddPhone; }
 
-            if (state == 6)
-            {
-                modelOrder.F_SendTime = DateTime.Now;
-                modelOrder.F_SendUser = UserLogin.UserId.ObjToInt();
-                modelOrder.F_SendUserName = UserLogin.UserName;
-            }
+            if (!string.IsNullOrEmpty(input.F_AddProvince))
+            { modelOrder.F_AddProvince = input.F_AddProvince; }
+            if (!string.IsNullOrEmpty(input.F_AddCity))
+            { modelOrder.F_AddCity = input.F_AddCity; }
+            if (!string.IsNullOrEmpty(input.F_AddArea))
+            { modelOrder.F_AddArea = input.F_AddArea; }
+            if (!string.IsNullOrEmpty(input.F_AddTown))
+            { modelOrder.F_AddTown = input.F_AddTown; }
+
+            if (!string.IsNullOrEmpty(input.F_AddDes))
+            { modelOrder.F_AddDes = input.F_AddDes; }
+            if (!string.IsNullOrEmpty(input.F_Address))
+            { modelOrder.F_Address = input.F_Address; }
+            if (!string.IsNullOrEmpty(input.F_PostalCode))
+            { modelOrder.F_PostalCode = input.F_PostalCode; }
+            if (!string.IsNullOrEmpty(input.F_Express))
+            { modelOrder.F_Express = input.F_Express; }
+            if (!string.IsNullOrEmpty(input.F_Remark))
+            { modelOrder.F_Remark = input.F_Remark; }
+            if (!string.IsNullOrEmpty(input.F_PayType))
+            { modelOrder.F_PayType = input.F_PayType; }
 
-            modelOrder.F_State = state;
+            if (input.F_VipId > 0)
+            { modelOrder.F_VipId = input.F_VipId; }
 
+            //选填 关联属性
+            
 
-            if (await bus_OrderRepository.Update(modelOrder))
-                return Success("订单成功审核！");
-            return Error("订单审核失败,请汇报技术支持！");
 
+            modelOrder.F_ExpressFee = input.F_ExpressFee;
+            modelOrder.F_State = input.F_State;
+            modelOrder.F_Status = 0;
 
-        }
 
+            //必须属性 系统生成
+            modelOrder.F_CheckTime = DateTime.Now;
+            modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
+            modelOrder.F_CheckUserName = UserLogin.UserName;
 
+            #endregion
 
+            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - modelOrder.F_ActivityMoney + modelOrder.F_ExpressFee + modelOrder.F_MergeMoney;
 
-        #endregion
+            if (await bus_OrderRepository.Update(modelOrder))
+            {
+                return Success("成功");
+            }
+
+            return Error("订单添加失败,请重试！");
 
 
+        }
+
+
+        #endregion
 
 
 

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

@@ -25,7 +25,7 @@ using TVShoppingCallCenter_ZLJ.Models.Inputs;
 namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 {
     [Route("api/order")]
-    public class KFOrderController : BaseController
+    public class KGOrderController : BaseController
     {
         private readonly IBus_OrderDetailRepository bus_OrderDetailRepository;
         private readonly IBus_OrderRepository bus_OrderRepository;
@@ -36,7 +36,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         private readonly ICus_ScoreSetRepository cus_score_setRepository;
         private readonly IConfiguration config;
         private readonly OrderFunctionController busOrderFunctionController;
-        public KFOrderController(OrderFunctionController _OrderFunctionController, ICus_ScoreSetRepository _cus_score_setRepository, IBus_StockLogRepository _bus_StockLogRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, ISys_MarketingRepository _bus_MarketingRepository, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IConfiguration _configuration)
+        public KGOrderController(OrderFunctionController _OrderFunctionController, ICus_ScoreSetRepository _cus_score_setRepository, IBus_StockLogRepository _bus_StockLogRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, ISys_MarketingRepository _bus_MarketingRepository, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IConfiguration _configuration)
         {
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
@@ -47,144 +47,40 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             cus_score_setRepository = _cus_score_setRepository;
             config = _configuration;
             busOrderFunctionController = _OrderFunctionController;
-        } 
-
-
-        
-
-
-        #region 客服操作
-
-
-        /// <summary>
-        /// 订单二审 审完 走发货
-        /// </summary>
-        /// <param name="orderid">订单号</param>
-        /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4KG退回 5已分拣 6已发货</param>
-        /// <param name="remark">客服备注</param>
-        /// <returns></returns>
-        [HttpPost("checkorderbykf")]
-        public async Task<IActionResult> CheckOrderKF(string orderid, int state, string remark)
-        {
-            try
-            {
-                //状态变化  积分变化  处理时间人变化  库存变化  备注
-                T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
-                #region 验证参数 必填项  
-
-                if (string.IsNullOrEmpty(orderid))
-                    return Error("请输入订单号");
-                if (state <= 0)
-                    return Error("请选择操作类型");
-
-                #endregion
-
-
-                T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && q.F_State == 1);
-
-                if (modelOrder == null)
-                {
-                    return Error("订单已审核");
-                }
-                modelOrder.F_CheckTime = DateTime.Now;
-                modelOrder.F_CheckUser = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
-                modelOrder.F_CheckUserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
-                if(!string.IsNullOrEmpty(remark))
-                    modelOrder.F_CheckRemark = remark;
-                if (state == 2)
-                {
-                    string strStock = await busOrderFunctionController.ChangeStockOne(modelOrder, 2, null);
-                    modelOrder.F_State = 2;
-                    modelOrder.F_Score = 0.00M;
-                }
-                else if (state == 3)
-                {
-                    #region 判断积分
-                    bool blScore = false;
-                    if (modelOrder.F_UseScore > 0)
-                    {
-                        //退回积分  查询批次号核算积分是否已经解冻
-                        modelvip = await cus_vip_infoRepository.GetSingle(q => q.F_ID == modelOrder.F_VipId);
-                        modelvip.F_Score = modelvip.F_Score + modelOrder.F_UseScore;
-                        if (await cus_vip_infoRepository.Update(modelvip))
-                        {
-                            //log 或者解冻积分
-                            blScore = true;
-                        }
-                    }
-                    else
-                    {
-                        blScore = true;
-                    }
-                    if (!blScore)
-                    {
-                        return Error("积分处理失败");
-                    }
-                    #endregion
-                    //库存不做处理
-                    modelOrder.F_State = 3;
-                }
-                if (await bus_OrderRepository.Update(modelOrder))
-                    return Success("订单成功审核！");
-                return Error("订单审核失败,请汇报技术支持！");
-            }
-            catch (Exception ex)
-            { return Error(ex.Message); }
+        }
 
 
-        }
 
+        #region  库管操作  退回  分拣  发货
 
         /// <summary>
         /// 获取订单分页列表
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost("getorderlistbykfpage")]
-        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input)
+        [HttpPost("/api/order/getorderlistbykgpage")]
+        public async Task<IActionResult> GetOrderListByKGPage(OrderInput input)
         {
 
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
 
 
-            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "3" });
 
-            //状态
-            if (input.F_State > -1)
-            {
-                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
-            }
             //根据角色展示列表
             if (UserLogin.RoleCode == "ZX")
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
-            else if (UserLogin.RoleCode == "KF")
+            else if (UserLogin.RoleCode == "KF" && input.F_State != 1)
             {
-                conModels.Add(new ConditionalCollections()
-                {
-                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
-                    {
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "1" })
-                     }
-                });
-               // conModels.Add(new ConditionalModel() { FieldName = "", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                conModels.Add(new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
-            else if (UserLogin.RoleCode == "KG")
+            else if (UserLogin.RoleCode == "KG" && input.F_State != 3)
             {
-                //conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
-                
-                conModels.Add(new ConditionalCollections()
-                {
-                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
-                    {
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "3" })
-                     }
-                });
+                conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                //OR  conModels.Add(new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
             if (!string.IsNullOrEmpty(input.F_ADFrom))
             {
@@ -283,121 +179,73 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
             returnobj.Rows = returnlist;
 
+
             return Success("成功", returnobj);
 
 
         }
 
+
+
         /// <summary>
-        /// 修改订单 
+        /// 订单二审 审完 走发货
         /// </summary>
-        /// <param name="input"></param>
+        /// <param name="orderid">订单号</param>
+        /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4无货 5已分拣 6已发货</param>
+        /// <param name="remark">客服备注</param>
         /// <returns></returns>
-        [HttpPost("editorderkf")]
-        public async Task<IActionResult> EditOrderKF([FromBody]OrderInput input)
+        [HttpPost("/api/order/checkorderbykg")]
+        public async Task<IActionResult> CheckOrderKG(string orderid, int state, string remark)
         {
+            //状态变化  积分变化  处理时间人变化  库存变化  备注
             T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
             #region 验证参数 必填项  
 
-            if (string.IsNullOrEmpty(input.F_ADFrom))
-                return Error("请输入选择广告来源");
-            if (string.IsNullOrEmpty(input.F_Type))
-                return Error("请输入选择订单类型");
-            if (string.IsNullOrEmpty(input.F_Id))
-                return Error("请输入订单编号");
-            if (string.IsNullOrEmpty(input.F_Customer))
-                return Error("请输入客户姓名");
-            if (string.IsNullOrEmpty(input.F_CustomerPhone))
-                return Error("请输入客户电话");
+            if (string.IsNullOrEmpty(orderid))
+                return Error("请输入订单号");
+            if (!(state == 4 || state == 5 || state == 6))
+                return Error("操作类型不正确");
+
             #endregion
 
 
-            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_Id);
+            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && new[] { 3, 4, 5 }.Contains(q.F_State));
             if (modelOrder == null)
             {
-                return Error("此订单号不存在");
+                return Error("订单已审核");
             }
-            //保存 审退回 仓退回
-            if (!(new int[] { 1, 3 }.Contains(modelOrder.F_State)))
+
+            if (modelOrder.F_State == 3 || modelOrder.F_State == 4)
             {
-                return Error("已提交订单不允许修改，先撤回订单");
+                modelOrder.F_StockTime = DateTime.Now;
+                modelOrder.F_StockUser = UserLogin.UserId.ObjToInt();
+                modelOrder.F_StockUserName = UserLogin.UserName;
+                modelOrder.F_CheckRemark = modelOrder.F_CheckRemark + remark;
             }
-            #region 数据绑定
-            //必填
-            modelOrder.F_ADFrom = input.F_ADFrom;
-            modelOrder.F_Type = input.F_Type;
-            modelOrder.F_Id = input.F_Id;
-
-
-            if (input.F_RecommendId > 0)
-            { modelOrder.F_RecommendId = input.F_RecommendId; }
-            if (input.F_CustomerType > 0)
-            { modelOrder.F_CustomerType = input.F_CustomerType; }
-            if (!string.IsNullOrEmpty(input.F_CustomerTel))
-            { modelOrder.F_CustomerTel = input.F_CustomerTel; }
-            //选填 快递属性
-            if (!string.IsNullOrEmpty(input.F_TrackingNo))
-            { modelOrder.F_TrackingNo = input.F_TrackingNo; }
-            if (!string.IsNullOrEmpty(input.F_Addressee))
-            { modelOrder.F_Addressee = input.F_Addressee; }
-            if (!string.IsNullOrEmpty(input.F_AddPhone))
-            { modelOrder.F_AddPhone = input.F_AddPhone; }
 
-            if (!string.IsNullOrEmpty(input.F_AddProvince))
-            { modelOrder.F_AddProvince = input.F_AddProvince; }
-            if (!string.IsNullOrEmpty(input.F_AddCity))
-            { modelOrder.F_AddCity = input.F_AddCity; }
-            if (!string.IsNullOrEmpty(input.F_AddArea))
-            { modelOrder.F_AddArea = input.F_AddArea; }
-            if (!string.IsNullOrEmpty(input.F_AddTown))
-            { modelOrder.F_AddTown = input.F_AddTown; }
-
-            if (!string.IsNullOrEmpty(input.F_AddDes))
-            { modelOrder.F_AddDes = input.F_AddDes; }
-            if (!string.IsNullOrEmpty(input.F_Address))
-            { modelOrder.F_Address = input.F_Address; }
-            if (!string.IsNullOrEmpty(input.F_PostalCode))
-            { modelOrder.F_PostalCode = input.F_PostalCode; }
-            if (!string.IsNullOrEmpty(input.F_Express))
-            { modelOrder.F_Express = input.F_Express; }
-            if (!string.IsNullOrEmpty(input.F_Remark))
-            { modelOrder.F_Remark = input.F_Remark; }
-            if (!string.IsNullOrEmpty(input.F_PayType))
-            { modelOrder.F_PayType = input.F_PayType; }
-
-            if (input.F_VipId > 0)
-            { modelOrder.F_VipId = input.F_VipId; }
-
-            //选填 关联属性
-            
+            if (state == 6)
+            {
+                modelOrder.F_SendTime = DateTime.Now;
+                modelOrder.F_SendUser = UserLogin.UserId.ObjToInt();
+                modelOrder.F_SendUserName = UserLogin.UserName;
+            }
 
+            modelOrder.F_State = state;
 
-            modelOrder.F_ExpressFee = input.F_ExpressFee;
-            modelOrder.F_State = input.F_State;
-            modelOrder.F_Status = 0;
 
+            if (await bus_OrderRepository.Update(modelOrder))
+                return Success("订单成功审核！");
+            return Error("订单审核失败,请汇报技术支持！");
 
-            //必须属性 系统生成
-            modelOrder.F_CheckTime = DateTime.Now;
-            modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
-            modelOrder.F_CheckUserName = UserLogin.UserName;
 
-            #endregion
-
-            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - modelOrder.F_ActivityMoney + modelOrder.F_ExpressFee + modelOrder.F_MergeMoney;
+        }
 
-            if (await bus_OrderRepository.Update(modelOrder))
-            {
-                return Success("成功");
-            }
 
-            return Error("订单添加失败,请重试！");
 
 
-        }
+        #endregion
 
 
-        #endregion