客服订单交易列表

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

@@ -221,7 +221,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("/api/order/getorderlistbykfpage")]
-        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input)
+        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input,int PayState=0)
         {
 
             List<IConditionalModel> conModels = new List<IConditionalModel>();
@@ -320,21 +320,29 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
             if (input.F_PayState > -1)
             {
-                if (input.F_PayState == 1 || input.F_PayState == 3)
+                if (PayState>0)
                 {
-                    conModels.Add(new ConditionalCollections()
+                    conModels.Add(new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayState.ToString() });
+                }
+                else
+                {
+                    if (input.F_PayState == 1 || input.F_PayState == 3)
                     {
-                        ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                        conModels.Add(new ConditionalCollections()
+                        {
+                            ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
                     {
                         new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue = "1" }),
                         new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue ="3" })
                      }
-                    });
-                }
-                else
-                {
-                    conModels.Add(new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayState.ToString() });
+                        });
+                    }
+                    else
+                    {
+                        conModels.Add(new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayState.ToString() });
+                    }
                 }
+              
             }
             if (input.SearchEndTime != null)
             {