更新售后仓库操作 仓库列表

代码/System.Model/T_Bus_AfterSale.cs

@@ -21,7 +21,8 @@ namespace System.Model
 		private int _f_checkstatesh = 0;
 		private DateTime? _f_checktimesh;
 		private int _f_checkusersh = 0;
-		private string _f_checkusernamesh = "";
+		private string _f_checkusernamesh = "";		
+		private string _f_olddetaillist = "";
 		private string _f_detaillist = "";
 		private string _f_trackingno = "";
 		private string _f_trackdes = "";
@@ -140,6 +141,15 @@ namespace System.Model
 			get { return _f_detaillist; }
 		}
 		/// <summary>
+		/// 退回产品列表
+		/// </summary>
+		public string F_OldDetailList
+		{
+			set { _f_olddetaillist = value; }
+			get { return _f_olddetaillist; }
+		}
+		
+		/// <summary>
 		/// 运单号
 		/// </summary>
 		public string F_TrackingNo

代码/System.Model/T_Bus_OrderDetail.cs

@@ -27,7 +27,7 @@ namespace System.Model
 		private int _f_state=0;
 
 		/// <summary>
-		/// 0正常1售后
+		/// 0正常1售后中 2售后完成
 		/// </summary>
 		public int F_State
 		{

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

@@ -314,6 +314,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
 
                 modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_OldDetailList = input.F_OldDetailList;
                 modelAfterSale.F_Type = input.F_Type;
                 modelAfterSale.F_Money = input.F_Money;
 
@@ -326,6 +327,28 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 if (!string.IsNullOrEmpty(input.F_Remark))
                     modelAfterSale.F_Remark = " 售后：" + input.F_Remark;
 
+                List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
+
+                //更新售后流程的退货商品
+                if (string.IsNullOrEmpty(modelAfterSale.F_OldDetailList))
+                {
+                    #region 退回商品展示
+
+                    foreach (string product in modelAfterSale.F_OldDetailList.Split('|'))
+                    {
+                        string productid = product.Split(',')[0];
+
+                        T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
+                        if (modelDetail.F_State >= 1)
+                        {
+                            return Error("此商品已参加售后:" + modelDetail.F_ProductName);
+                        }
+                        modelDetail.F_State = 1;
+                        modelOldDetailList.Add(modelDetail);
+                    }
+
+                    #endregion
+                }
 
                 if (input.F_Type == 4)
                 {
@@ -339,6 +362,19 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         }
                     }
                 }
+                else if (input.F_Type == 2 || input.F_Type == 3)
+                {
+
+                }
+                else if (input.F_Type == 1)
+                {
+
+                }
+                if (modelOldDetailList != null && modelOldDetailList.Count > 0)
+                {
+                    //批量更新状态 为售后中
+                    await bus_OrderDetailRepository.UpdateList(modelOldDetailList);
+                }
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
                 {
                     if (input.F_CheckStateSH == 0)
@@ -385,7 +421,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     //物流状态0 未发出 1物流运送中2签收3改代收4拒收
                     return Error("订单状态不符合售后");
                 }
-                T_Bus_AfterSale modelAfterSale =await busAfterSaleRepository.GetSingle(q=>q.F_Id==input.F_Id);
+                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
                 if (modelAfterSale.F_CheckStateSH == 1)
                 {
                     return Error("不能重复审核提交");
@@ -511,8 +547,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
         #region 仓库操作
 
-       
-
         /// <summary>
         /// 更新状态
         /// </summary>
@@ -530,47 +564,58 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
                 #endregion
 
+                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
 
-                T_Bus_Order modeOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_OrderId);
+                T_Bus_Order modeOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == modelAfterSale.F_OrderId);
                 if (modeOrder == null)
                 {
                     return Error("订单不存在");
                 }
-                else if (modeOrder.F_Status == -1)
-                {
-                    //物流状态0 未发出 1物流运送中2签收3改代收4拒收
-                    return Error("订单状态不符合售后");
-                }
-                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
-                if (modelAfterSale.F_CheckStateKG == 1|| modelAfterSale.F_CheckStateKG == 2)
+
+                if (modelAfterSale.F_CheckStateKG == 1 || modelAfterSale.F_CheckStateKG == 2)
                 {
                     //1收到货（根据状态自动创建订单）2货物不符3未收到货
                     return Error("不能重复审核提交");
                 }
-                modelAfterSale.F_CheckTimeKG = DateTime.Now;
                 modelAfterSale.F_CheckStateKG = input.F_State;
+
+                modelAfterSale.F_CheckTimeKG = DateTime.Now;
                 modelAfterSale.F_CheckUserKG = UserLogin.UserId.ObjToInt();
                 modelAfterSale.F_CheckUserNameKG = UserLogin.UserName;
-
                 modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
+                List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
 
-                modelAfterSale.F_DetailList = input.F_DetailList;
-                modelAfterSale.F_Type = input.F_Type;
-                modelAfterSale.F_Money = input.F_Money;
+                //1收到货（根据状态自动创建订单）2货物不符3未收到货
+                if (modelAfterSale.F_CheckStateKG == 1)
+                {
+                    #region 更新用户快递商品
+                    if (string.IsNullOrEmpty(modelAfterSale.F_OldDetailList))
+                    {
+                        foreach (string product in modelAfterSale.F_DetailList.Split('|'))
+                        {
+                            string productid = product.Split(',')[0];
+
+                            T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
+                            if (modelDetail.F_State == 2)
+                            {
+                                return Error("此商品已参加过售后:" + modelDetail.F_ProductName);
+                            }
+                            modelDetail.F_State = 2;
+                            modelOldDetailList.Add(modelDetail);
+                        }
+                    }
+                    #endregion
+                    if (modelAfterSale.F_Type == 4)
+                    {
 
-                modelAfterSale.F_OrderId = input.F_OrderId;
-                modelAfterSale.F_AboutOrderId = "";
-                modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
-
-                modelAfterSale.F_TrackingNo = input.F_TrackingNo;
-                modelAfterSale.F_TrackDes = input.F_TrackDes;
-                if (!string.IsNullOrEmpty(input.F_Remark))
-                    modelAfterSale.F_Remark = " 售后：" + input.F_Remark;
+                        modelAfterSale.F_State = 1;
 
+                    }
+                    else if (modelAfterSale.F_Type == 2 || modelAfterSale.F_Type == 3)
+                    {
 
-                if (modelAfterSale.F_Type == 4)
-                {
-                    if (modelAfterSale.F_CheckStateSH == 1)
+                    }
+                    else if (modelAfterSale.F_Type == 1)
                     {
                         modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
                         string addResult = await AddOrder(modelAfterSale, modeOrder);
@@ -578,8 +623,45 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         {
                             return Error("订单无法创建:" + addResult);
                         }
+                        modelAfterSale.F_State = 1;
                     }
                 }
+                else if (modelAfterSale.F_CheckStateKG == 2)
+                {
+                    //时间长自动作废
+                    //如果没有对发货  货物不符则标记为无效
+                    #region 更新用户快递商品
+                    if (modelAfterSale.F_Type != 1)
+                    {
+                        if (string.IsNullOrEmpty(modelAfterSale.F_OldDetailList))
+                        {
+                            foreach (string product in modelAfterSale.F_DetailList.Split('|'))
+                            {
+                                string productid = product.Split(',')[0];
+
+                                T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
+                                if (modelDetail.F_State == 2)
+                                {
+                                    return Error("此商品已参加过售后:" + modelDetail.F_ProductName);
+                                }
+                                modelDetail.F_State = 0;
+                                modelOldDetailList.Add(modelDetail);
+                            }
+                        }
+                    }
+                    #endregion
+                }
+                else if (modelAfterSale.F_CheckStateKG == 3)
+                {     //时间长自动作废
+                    //如果没有对发货  未收到货则标记为无效
+                }
+
+                if (modelOldDetailList != null && modelOldDetailList.Count > 0)
+                {
+                    //批量更新状态 为已售后
+                    await bus_OrderDetailRepository.UpdateList(modelOldDetailList);
+                }
+
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
                 {
                     if (input.F_CheckStateSH == 0)
@@ -780,6 +862,103 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             { return ex.Message; }
         }
 
+
+        /// <summary>
+        /// 获取未售后的订单详情
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getorderdetail")]
+        public async Task<IActionResult> GetOrderDetail(string orderid)
+        {
+            if (string.IsNullOrEmpty(orderid))
+                return Error("请输入订单号");
+            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid);
+            OrderInput modelreturn = new OrderInput();
+            if (modelOrder != null)
+            {
+                modelreturn.F_ADFrom = modelOrder.F_ADFrom;
+                modelreturn.F_Type = modelOrder.F_Type;
+                modelreturn.F_Id = modelOrder.F_Id;
+
+                modelreturn.F_Customer = modelOrder.F_Customer;
+                modelreturn.F_CustomerPhone = modelOrder.F_CustomerPhone;
+                //选填 快递属性
+                modelreturn.F_TrackingNo = modelOrder.F_TrackingNo;
+                modelreturn.F_Addressee = modelOrder.F_Addressee;
+                modelreturn.F_AddPhone = modelOrder.F_AddPhone;
+                modelreturn.F_AddProvince = modelOrder.F_AddProvince;
+                modelreturn.F_AddCity = modelOrder.F_AddCity;
+                modelreturn.F_AddArea = modelOrder.F_AddArea;
+                modelreturn.F_AddTown = modelOrder.F_AddTown;
+                modelreturn.F_AddDes = modelOrder.F_AddDes;
+                modelreturn.F_Address = modelOrder.F_Address;
+                modelreturn.F_PostalCode = modelOrder.F_PostalCode;
+                modelreturn.F_Express = modelOrder.F_Express;
+
+                modelreturn.F_PayType = modelOrder.F_PayType;
+                modelreturn.F_PayState = modelOrder.F_PayState;
+                modelreturn.F_Stock = modelOrder.F_Stock;
+                modelreturn.F_Remark = modelOrder.F_Remark;
+
+                modelreturn.F_RealPrice = modelOrder.F_RealPrice;
+
+                //选填 关联属性
+                modelreturn.F_VipId = modelOrder.F_VipId;
+                modelreturn.F_UseScore = modelOrder.F_UseScore;
+                modelreturn.F_Score = modelOrder.F_Score;
+
+                modelreturn.F_State = modelOrder.F_State;
+                modelreturn.F_Status = modelOrder.F_Status;
+
+
+                //必须属性 系统生成
+                modelreturn.F_AddTime = modelOrder.F_AddTime;
+                modelreturn.F_AddUser = modelOrder.F_AddUser;
+                modelreturn.F_AddUserName = modelOrder.F_AddUserName;
+
+
+                modelreturn.F_TotlePrice = modelOrder.F_TotlePrice;
+                modelreturn.F_ShouldPrice = modelOrder.F_ShouldPrice;
+                modelreturn.F_ActivityMoney = modelOrder.F_ActivityMoney;
+                modelreturn.F_UseActivity = modelOrder.F_UseActivity;
+
+                List<OrderDetailInput> modeldetailreturn = new List<OrderDetailInput>();
+                List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == modelOrder.F_Id, o => o.F_Sort, OrderByType.Asc);
+                if (detaillist != null)
+                {
+                    foreach (T_Bus_OrderDetail m in detaillist)
+                    {
+                        OrderDetailInput model = new OrderDetailInput();
+                        model.F_ProductName = m.F_ProductName;
+                        model.F_ProductId = m.F_ProductId;
+                        model.F_Id = m.F_Id;
+                        model.F_OrderId = m.F_OrderId;
+                        model.F_Count = m.F_Count;
+                        model.F_Price = m.F_Price;
+
+                        model.F_DealPrice = m.F_DealPrice;
+                        model.F_Sort = m.F_Sort;
+                        model.F_AddTime = m.F_AddTime;
+                        model.F_Remark = m.F_Remark;
+                        model.F_AddUser = m.F_AddUser;
+                        model.F_AddUserName = m.F_ProductName;
+                        model.F_TotlePrice = m.F_TotlePrice;
+                        model.F_Activity = m.F_Activity;
+                        modeldetailreturn.Add(model);
+                    }
+                }
+                modelreturn.OrderDetailList = modeldetailreturn;
+
+                modelreturn.UseActList = null;
+
+            }
+
+
+            return Success("成功", modelreturn);
+
+
+        }
         #endregion
 
 

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

@@ -23,6 +23,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		private int _f_checkusersh = 0;
 		private string _f_checkusernamesh = "";
 		private string _f_detaillist = "";
+		private string _f_olddetaillist = "";
 		private string _f_trackingno = "";
 		private string _f_trackdes = "";
 		private string _f_ourtrackingno = "";
@@ -35,6 +36,16 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		private string _f_checkusernamekg = "";
 		private string _f_remark = "";
 		private string _f_aboutorderid = "";
+
+
+		/// <summary>
+		/// 退回产品列表
+		/// </summary>
+		public string F_OldDetailList
+		{
+			set { _f_olddetaillist = value; }
+			get { return _f_olddetaillist; }
+		}
 		/// <summary>
 		/// 售后编号
 		/// </summary>
@@ -188,7 +199,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 			get { return _f_state; }
 		}
 		/// <summary>
-		/// 0未审核
+		/// 0未审核1收到货（根据状态自动创建订单）2货物不符3未收到货
 		/// </summary>
 		public int F_CheckStateKG
 		{