售后交易 状态更新

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

@@ -631,7 +631,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     //批量更新状态 数量
                     await bus_OrderDetailRepository.UpdateListToColumns(modelOldDetailList, s => new { s.F_State });
                 }
-                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                if (await busAfterSaleRepository.Update(modelAfterSale))
                 {
                     if (input.F_CheckStateSH == 0)
                         return Success("售后已保存");
@@ -662,7 +662,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
                 string[] idlist = ids.Split(',');
 
-                if (await busAfterSaleRepository.Update(s=>new T_Bus_AfterSale { F_State=-1 },q => idlist.Contains(q.F_Id)))
+                if (await busAfterSaleRepository.Update(s=>new T_Bus_AfterSale { F_State=-1 },q => idlist.Contains(q.F_Id)&&q.F_CheckStateSH!=1))
                 {
                     return Success("删除成功");
                 }
@@ -694,18 +694,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 eq = eq.And(a => a.F_CheckStateSH == input.F_CheckStateSH);
             }
-            if (input.F_Type > 0)
+            if (input.F_State > -2)
             {
-                eq = eq.And(a => a.F_Type == input.F_Type);
+                eq = eq.And(a => a.F_State == input.F_State);
             }
-            if (!string.IsNullOrEmpty(input.F_Id))
+            if (input.F_State == -2)
             {
-                eq = eq.And(a => a.F_Id == input.F_Id);
+                eq = eq.And(a => a.F_State >= 0);
             }
-            if (input.F_State > -2)
+            if (input.F_Type > 0)
             {
-                eq = eq.And(a => a.F_State == input.F_State);
+                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 (!string.IsNullOrEmpty(input.F_ReturnType))
             {
                 eq = eq.And(a => a.F_ReturnType == input.F_ReturnType);
@@ -1072,7 +1076,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     await bus_OrderDetailRepository.UpdateList(modelOldDetailList);
                 }
 
-                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                if (await busAfterSaleRepository.Update(modelAfterSale))
                 {
                     if (input.F_CheckStateSH == 0)
                         return Success("售后已保存");