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

代码/System.Model/T_Bus_AfterSale.cs

 			get { return _f_state; }
 		}
 		/// <summary>
-		/// 0未审核
+		/// 0未审核 1收到货（根据状态自动创建订单）2货物不符3未收到货
 		/// </summary>
 		public int F_CheckStateKG
 		{

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

         }
 
         /// <summary>
-        /// 销售删除
+        /// 售后删除
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
                 }
                 string[] idlist = ids.Split(',');
 
-                if (await busAfterSaleRepository.Delete(q => idlist.Contains(q.F_Id) && new[] { 0, 2 }.Contains(q.F_CheckStateXS)))
+                if (await busAfterSaleRepository.Delete(q => idlist.Contains(q.F_Id) && new[] { 0, 2 }.Contains(q.F_CheckStateSH)))
                 {
-                    return Success("删除成功/已审核通过不能删除");
+                    return Success("删除成功");
                 }
-                return Error("删除失败,请重试！");
+                return Error("删除失败,请重试！已审核通过不能删除");
             }
             catch (Exception ex)
             { return Error(ex.Message); }
 
             #region  拼接条件
 
-            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckUserXS == UserLogin.UserId.ObjToInt();
+            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckUserSH == UserLogin.UserId.ObjToInt();
 
 
-            if (input.F_CheckStateXS > -1)
-            {
-                eq = eq.And(a => a.F_CheckStateXS == input.F_CheckStateXS);
-            }
-            if (input.F_CheckStateSH > -1)
+            //if (input.F_CheckStateXS > -2)
+            //{
+            //    eq = eq.And(a => a.F_CheckStateXS == input.F_CheckStateXS);
+            //}
+            if (input.F_CheckStateSH > -2)
             {
                 eq = eq.And(a => a.F_CheckStateSH == input.F_CheckStateSH);
             }
-            if (input.F_Type > -1)
+            if (input.F_Type > 0)
             {
                 eq = eq.And(a => a.F_Type == input.F_Type);
             }
             {
                 eq = eq.And(a => a.F_Id == input.F_Id);
             }
-            if (input.F_State >= -1)
+            if (input.F_State > -2)
             {
                 eq = eq.And(a => a.F_State == input.F_State);
             }
 
         #endregion
 
+        #region 仓库操作
+
+       
+
+        /// <summary>
+        /// 更新状态
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("updatestatekg")]
+        public async Task<IActionResult> UpdateState(AfterSaleInput input)
+        {
+            try
+            {
+                #region 验证参数 必填项  
+
+                if (string.IsNullOrEmpty(input.F_Id))
+                    return Error("请选择售后单");
+
+                #endregion
+
+
+                T_Bus_Order modeOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.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)
+                {
+                    //1收到货（根据状态自动创建订单）2货物不符3未收到货
+                    return Error("不能重复审核提交");
+                }
+                modelAfterSale.F_CheckTimeKG = DateTime.Now;
+                modelAfterSale.F_CheckStateKG = input.F_State;
+                modelAfterSale.F_CheckUserKG = UserLogin.UserId.ObjToInt();
+                modelAfterSale.F_CheckUserNameKG = UserLogin.UserName;
+
+                modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
+
+                modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_Type = input.F_Type;
+                modelAfterSale.F_Money = input.F_Money;
+
+                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;
+
+
+                if (modelAfterSale.F_Type == 4)
+                {
+                    if (modelAfterSale.F_CheckStateSH == 1)
+                    {
+                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
+                        string addResult = await AddOrder(modelAfterSale, modeOrder);
+                        if (addResult != "1")
+                        {
+                            return Error("订单无法创建:" + addResult);
+                        }
+                    }
+                }
+                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                {
+                    if (input.F_CheckStateSH == 0)
+                        return Success("售后已保存");
+                    else if (input.F_CheckStateSH == 1)
+                    { return Success("售后已提交"); }
+                }
+                return Error("申请失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+
+
+        }
+
+
+
+        /// <summary>
+        /// 根据分页获取列表(库管)
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getaftersalebypagekg")]
+        public async Task<IActionResult> GetAfterSaleByPageKG(AfterSaleInput input)
+        {
+
+            #region  拼接条件
+
+            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckStateSH == 1;
+
+
+            if (input.F_CheckStateKG > -2)
+            {
+                if (input.F_CheckStateKG > 0)
+                {
+                    eq = eq.And(a => a.F_CheckUserKG == UserLogin.UserId.ObjToInt());
+                }
+                eq = eq.And(a => a.F_CheckStateKG == input.F_CheckStateKG);
+            }
+            if (input.F_Type > 0)
+            {
+                eq = eq.And(a => a.F_Type == input.F_Type);
+            }
+            if (!string.IsNullOrEmpty(input.F_Id))
+            {
+                eq = eq.And(a => a.F_Id == input.F_Id);
+            }
+            if (input.F_State > -2)
+            {
+                eq = eq.And(a => a.F_State == input.F_State);
+            }
+
+            #endregion
+            RefAsync<int> count = 0;
+            PageData<T_Bus_AfterSale> list = await busAfterSaleRepository.GetListByPage(eq, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count }, " F_AddTime DESC");
+
+            return Success("成功", list);
+
+        }
+
+        #endregion
+        #region 方法
         /// <summary>
         /// 仓库确认后创建订单  对发货直接创建订单
         /// </summary>
             { return ex.Message; }
         }
 
-
+        #endregion
 
 
     }

代码/TVShoppingCallCenter_ZLJ/Startup.cs

             services.AddTransient<IBus_OrderDetailRepository, Bus_OrderDetailRepository>();
             services.AddTransient<IBus_StockLogRepository, Bus_StockLogRepository>();
             services.AddTransient<IBus_OrderMergeRepository, Bus_OrderMergeRepository>();
-            
+            services.AddTransient<IBus_AfterSaleRepository, IBus_AfterSaleRepository>();
 
             services.AddTransient<ICus_VipInfoRepository, Cus_VipInfoRepository>();
             services.AddTransient<ICus_VipLabelInfoRepository, Cus_VipLabelInfoRepository>();