修复bug，暴露错误提示

代码/System.Common/Filter/ExceptionFilter.cs

@@ -46,10 +46,13 @@ namespace System.Common
             {
                 param = "参数获取失败";
             }
+            string strError = "IP：" + ip.ToString() + "|||UserInfo：" + userinfo + "|||ContentType：" + request.ContentType + "|||Params：" + param 
+                + "|||Error："+ context.Exception.ToString() + "|||/r/n<br>\\r\\n" + context.Exception.StackTrace;
+            log.Error(strError);
 
-            log.Error("IP：" + ip.ToString() + "|||UserInfo：" + userinfo + "|||ContentType：" + request.ContentType + "|||Params：" + param + "|||Error：" + context.Exception.ToString());
+            //context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = "系统异常，请稍后重试" }.ToJson() };
+            context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = strError }.ToJson() };
 
-            context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = "系统异常，请稍后重试" }.ToJson() };
             base.OnException(context);
         }
     }

代码/System.Model/T_Bus_AfterSale.cs

@@ -108,7 +108,7 @@ namespace System.Model
 			get { return _f_checkusernamexs; }
 		}
 		/// <summary>
-		/// 售后审核状态 0未审核1审核通过2审核不通过
+		/// 售后审核状态 0保存 1提交（审核通过）2审核不通过（没有使用）
 		/// </summary>
 		public int F_CheckStateSH
 		{

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

@@ -274,7 +274,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         #region 售后操作
 
         /// <summary>
-        /// 销售申请售后
+        /// 添加售后
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -316,11 +316,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
                 if (input.F_CheckStateSH == 2)
                 {
-                    //从0开始，相当于添加
+                    //从0开始，相当于添加  目前不会出现
                 }
                 else
                 {
-                    if (string.IsNullOrEmpty(input.F_OldDetailList))
+                    if (!string.IsNullOrEmpty(input.F_OldDetailList))
                     {
 
                         foreach (string product in input.F_OldDetailList.Split('|'))
@@ -393,9 +393,27 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 if (!string.IsNullOrEmpty(input.F_Remark))
                     modelAfterSale.F_Remark = " 售后：" + input.F_Remark;
 
- 
+                if (new int[] { 1, 2, 3, 4 }.Contains(input.F_Type))
+                {
+                    //客户需要发货  
+                    if (modelOldDetailList == null || modelOldDetailList.Count == 0)
+                    {
+                        //但是客户没发货
+                        return Error("请选择客户退回商品");
+                    }
+                }
+                if (new int[] { 1,5, 4 }.Contains(input.F_Type))
+                {
+                    //我们需要发货  
+                    if (string.IsNullOrEmpty(modelAfterSale.F_DetailList))
+                    {
+                        //但是我们没发
+                        return Error("请选择新/补发商品");
+                    }
+
+                }
+
 
-                
                 if (input.F_Type == 4)
                 {
                     if (input.F_CheckStateSH == 1)
@@ -416,11 +434,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {
 
                 }
-                if (modelOldDetailList != null && modelOldDetailList.Count > 0)
+
+                if (modelOldDetailList != null && modelOldDetailList.Count > 0&& new int[] { 1, 2, 3, 4 }.Contains(input.F_Type))
                 {
-                    //批量更新状态 为售后中
-                    await bus_OrderDetailRepository.UpdateList(modelOldDetailList);
+                    //批量更新售后的数量状态
+                    await bus_OrderDetailRepository.UpdateListToColumns(modelOldDetailList,s=> new{ s.F_State});
                 }
+                 
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
                 {
 
@@ -432,7 +452,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 return Error("申请失败,请重试！");
             }
             catch (Exception ex)
-            { return Error(ex.Message + "===<br />" + ex.StackTrace); }
+            { return Error(ex.Message + "===/r/n <br /> \\r\\n " + ex.StackTrace); }
 
         }
 
@@ -526,7 +546,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     { }
                     else
                     {                       
-                        if (string.IsNullOrEmpty(input.F_OldDetailList))
+                        if (!string.IsNullOrEmpty(input.F_OldDetailList))
                         {
 
                             foreach (string product in input.F_OldDetailList.Split('|'))
@@ -567,7 +587,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     }
                     else
                     {
-                        if (string.IsNullOrEmpty(input.F_OldDetailList))
+                        if (!string.IsNullOrEmpty(input.F_OldDetailList))
                         {
 
                             foreach (string product in input.F_OldDetailList.Split('|'))
@@ -612,7 +632,25 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelAfterSale.F_Money = input.F_Money;
 
                 modelAfterSale.F_OrderId = input.F_OrderId;
+                if (new int[] { 1, 2, 3, 4 }.Contains(input.F_Type))
+                {
+                    //客户需要发货  
+                    if (modelOldDetailList == null || modelOldDetailList.Count == 0)
+                    {
+                        //但是客户没发货
+                        return Error("请选择客户退回商品");
+                    }
+                }
+                if (new int[] { 1, 5, 4 }.Contains(input.F_Type))
+                {
+                    //我们需要发货  
+                    if (string.IsNullOrEmpty(modelAfterSale.F_DetailList))
+                    {
+                        //但是我们没发
+                        return Error("请选择新/补发商品");
+                    }
 
+                }
 
                 if (modelAfterSale.F_Type == 4)
                 {
@@ -626,7 +664,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         }
                     }
                 }
-                if (modelOldDetailList != null && modelOldDetailList.Count > 0)
+                if (modelOldDetailList != null && modelOldDetailList.Count > 0 && new int[] { 1, 2, 3, 4 }.Contains(input.F_Type))
                 {
                     //批量更新状态 数量
                     await bus_OrderDetailRepository.UpdateListToColumns(modelOldDetailList, s => new { s.F_State });
@@ -661,11 +699,51 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     return Error("参数缺失：" + ids);
                 }
                 string[] idlist = ids.Split(',');
+                //TODO 删除售后 暂时还未还原之前状态 暂时不能删除
 
-                if (await busAfterSaleRepository.Update(s=>new T_Bus_AfterSale { F_State=-1 },q => idlist.Contains(q.F_Id)&&q.F_CheckStateSH!=1))
+                foreach (string id in idlist)
                 {
-                    return Success("删除成功");
+
+               T_Bus_AfterSale modelAfterSale   =  await busAfterSaleRepository.GetSingle(q => q.F_Id == id);
+                    if (modelAfterSale.F_CheckStateSH > 1)
+                    {
+                        return Error("此售后的状态不允许删除:" + modelAfterSale.F_Id);
+                    }
+                    if (new int[] { 1, 2, 3, 4 }.Contains(modelAfterSale.F_Type))
+                    {
+                        if (!string.IsNullOrEmpty(modelAfterSale.F_OldDetailList))
+                        {
+                            List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
+                            foreach (string product in modelAfterSale.F_OldDetailList.Split('|'))
+                            {
+                                string productid = product.Split(',')[0];
+                                int count = product.Split(',')[1].ObjToInt();
+                                T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modelAfterSale.F_OrderId && q.F_ProductId == productid);
+
+                                if (count > modelDetail.F_State)
+                                {
+                                    modelDetail.F_State = 0;
+                                }
+                                else {
+                                    modelDetail.F_State = modelDetail.F_State - count;
+                                }
+
+                                modelOldDetailList.Add(modelDetail);
+                            }
+                            if(await bus_OrderDetailRepository.UpdateListToColumns(modelOldDetailList,s=>new { s.F_State}))
+                            {
+                                return Error("更新售后商品数量失败，请手工操作："+ modelAfterSale.F_Id);
+                            }
+                        }
+                    }
+
+                    if (await busAfterSaleRepository.Update(s => new T_Bus_AfterSale { F_State = -1 }, q => q.F_Id == id && q.F_CheckStateSH != 1))
+                    {
+                        return Success("删除成功");
+                    }
                 }
+
+
                 return Error("删除失败,请重试！");
             }
             catch (Exception ex)
@@ -698,10 +776,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 eq = eq.And(a => a.F_State == input.F_State);
             }
-            if (input.F_State == -2)
-            {
-                eq = eq.And(a => a.F_State >= 0);
-            }
             if (input.F_Type > 0)
             {
                 eq = eq.And(a => a.F_Type == input.F_Type);

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

@@ -145,6 +145,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
                 if (state == 3)
                 {
+                    if (string.IsNullOrEmpty(modelOrder.F_Stock))
+                    {
+                        return Error("出货仓不能为空");
+                    }
                     if (string.IsNullOrEmpty(modelOrder.F_Express))
                     {
                         return Error("快递不能为空");
@@ -412,13 +416,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 return Error("此订单号不存在");
             }
             //保存 审退回 仓退回
-            if (!(new int[] { 1, 3 }.Contains(modelOrder.F_State)))
+            if (!(new int[] { 1, 3 ,4}.Contains(modelOrder.F_State)))
             {
-                return Error("已提交订单不允许修改，先撤回订单");
+                return Error("此状态订单不允许修改，先撤回订单");
             }
-            #region 数据绑定
-            //必填
-            modelOrder.F_ADFrom = input.F_ADFrom;
+
+                #region 数据绑定
+                //必填
+                modelOrder.F_ADFrom = input.F_ADFrom;
             modelOrder.F_Type = input.F_Type;
             modelOrder.F_Id = input.F_Id;
 
@@ -475,6 +480,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
             modelOrder.F_CheckUserName = UserLogin.UserName;
 
+            if (string.IsNullOrEmpty(modelOrder.F_Express))
+            {
+                return Error("快递不能为空");
+            }
+            if (string.IsNullOrEmpty(modelOrder.F_AddPhone))
+            {
+                return Error("收件人电话不能为空");
+            }
+            if (string.IsNullOrEmpty(modelOrder.F_AddTown))
+            {
+                return Error("收件人地址不能为空");
+            }
+            if (string.IsNullOrEmpty(modelOrder.F_Address))
+            {
+                return Error("收件人详细地址不能为空");
+            }
             #endregion
 
             modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - modelOrder.F_ActivityMoney + modelOrder.F_ExpressFee + modelOrder.F_MergeMoney;

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

@@ -77,6 +77,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
                 else
                 {
+                    if (string.IsNullOrEmpty(input.F_Gift))
+                        input.F_Gift = "";
                     if (input.F_Money <= 0)
                         return Error("请数据金额");
                 }
@@ -86,16 +88,17 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 #region 验证逻辑
                 foreach (string orderid in orderlist)
                 {
+                    //合并状态 -1无效 0暂存 1提交  2不予通过  3通过 
                     int exist = await busOrderMergeRepository.GetCount(q => q.F_OrderList.Contains(orderid) && new int[] { 0, 1, 3 }.Contains(q.F_State));
                     if (exist > 0)
                     {
-                        return Error("此单号参与合并中:" + orderid);
+                        return Error("此单号已参与合并中:" + orderid);
                     }
                     //订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4无货 5已分拣 6已发货
                     exist = await bus_OrderRepository.GetCount(q => q.F_Id == orderid && new int[] { 1, 3, 4 }.Contains(q.F_State));
                     if (exist == 0)
                     {
-                        return Error("此单号状态无效:" + orderid);
+                        return Error("提交订单后发货前才可合并，此单号状态无效:" + orderid);
                     }
 
                 }
@@ -254,7 +257,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 eq = eq.And(a => a.F_Id == input.F_Id);
             }
-            if (input.F_State >= 0)
+            if (input.F_State >-2)
             {
                 eq = eq.And(a => a.F_State == input.F_State);
             }

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

@@ -108,7 +108,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 			get { return _f_checkusernamexs; }
 		}
 		/// <summary>
-		/// 售后审核状态 0未审核1审核通过2审核不通过
+		/// 售后审核状态 0保存 1提交
 		/// </summary>
 		public int F_CheckStateSH
 		{